From patchwork Mon Mar 22 17:02:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 406508 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D60B9C433E1 for ; Mon, 22 Mar 2021 17:04:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A26D7619AE for ; Mon, 22 Mar 2021 17:04:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230363AbhCVRD6 (ORCPT ); Mon, 22 Mar 2021 13:03:58 -0400 Received: from mail-ej1-f53.google.com ([209.85.218.53]:41648 "EHLO mail-ej1-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230252AbhCVRDg (ORCPT ); Mon, 22 Mar 2021 13:03:36 -0400 Received: by mail-ej1-f53.google.com with SMTP id u5so22497421ejn.8; Mon, 22 Mar 2021 10:03:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NBKBwFnLR6KheF+0+jTnrdx81GBF+PEZpOcMgLUdP0I=; b=Nn3DEO+5ZRwC+sqPxUomMSosil8ZsSmFHDRoqTrAiFH1HnerpjAPBpGno3Jca3q54O nE8ck5VOBK6/ju3uXhyfs5YKDeYJn77obcTvRhlxl/C+zmnnuDMMVIDNMn5GsXYXS6vz K2sw7LXt7omkmvRud/MKcN95Rq9E1qMDNK89krRpMPjnYkN+FfqExtckloZ4fKbXOW2x DqwU3jLajuk7RETZ/j1ofk9EiD4akR/vWxxY2Qd7or3FE+JmVPo3lDmyJOFSkJOe8UIl IAzQBjQHTD1S2LKorsRxkRf3uNZa7EeJqrcDgyUJQ654jcyZsiIEaBF9tDgzjyUZa+eO ++OA== X-Gm-Message-State: AOAM531aulqwuSvmkP6aNuVrRqE+vL8WyYTc+vWBmuV/imP9fvrXtTVq u7nTLZJq1ileq77ATF1pXL3DWdORLic= X-Google-Smtp-Source: ABdhPJxo+yUH2CwgMEXl0a2sW3KnFzSao8u0O9DQjdubFqBceXmjj96KFnMky7iRrTGUE+al/ab7mQ== X-Received: by 2002:a17:906:23e9:: with SMTP id j9mr799383ejg.78.1616432615404; Mon, 22 Mar 2021 10:03:35 -0700 (PDT) Received: from msft-t490s.teknoraver.net (net-2-34-63-208.cust.vodafonedsl.it. [2.34.63.208]) by smtp.gmail.com with ESMTPSA id h22sm9891589eji.80.2021.03.22.10.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 10:03:35 -0700 (PDT) From: Matteo Croce To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jonathan Lemon , "David S. Miller" , Ilias Apalodimas , Jesper Dangaard Brouer , Lorenzo Bianconi , Saeed Mahameed , David Ahern , Saeed Mahameed , Andrew Lunn Subject: [PATCH net-next 1/6] xdp: reduce size of struct xdp_mem_info Date: Mon, 22 Mar 2021 18:02:56 +0100 Message-Id: <20210322170301.26017-2-mcroce@linux.microsoft.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210322170301.26017-1-mcroce@linux.microsoft.com> References: <20210322170301.26017-1-mcroce@linux.microsoft.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jesper Dangaard Brouer It is possible to compress/reduce the size of struct xdp_mem_info. This change reduce struct xdp_mem_info from 8 bytes to 4 bytes. The member xdp_mem_info.id can be reduced to u16, as the mem_id_ht rhashtable in net/core/xdp.c is already limited by MEM_ID_MAX=0xFFFE which can safely fit in u16. The member xdp_mem_info.type could be reduced more than u16, as it stores the enum xdp_mem_type, but due to alignment it is only reduced to u16. Signed-off-by: Jesper Dangaard Brouer --- include/net/xdp.h | 4 ++-- net/core/xdp.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/net/xdp.h b/include/net/xdp.h index a5bc214a49d9..c35864d59113 100644 --- a/include/net/xdp.h +++ b/include/net/xdp.h @@ -48,8 +48,8 @@ enum xdp_mem_type { #define XDP_XMIT_FLAGS_MASK XDP_XMIT_FLUSH struct xdp_mem_info { - u32 type; /* enum xdp_mem_type, but known size type */ - u32 id; + u16 type; /* enum xdp_mem_type, but known size type */ + u16 id; }; struct page_pool; diff --git a/net/core/xdp.c b/net/core/xdp.c index 05354976c1fc..3dd47ed83778 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -35,11 +35,11 @@ static struct rhashtable *mem_id_ht; static u32 xdp_mem_id_hashfn(const void *data, u32 len, u32 seed) { - const u32 *k = data; - const u32 key = *k; + const u16 *k = data; + const u16 key = *k; BUILD_BUG_ON(sizeof_field(struct xdp_mem_allocator, mem.id) - != sizeof(u32)); + != sizeof(u16)); /* Use cyclic increasing ID as direct hash key */ return key; @@ -49,7 +49,7 @@ static int xdp_mem_id_cmp(struct rhashtable_compare_arg *arg, const void *ptr) { const struct xdp_mem_allocator *xa = ptr; - u32 mem_id = *(u32 *)arg->key; + u16 mem_id = *(u16 *)arg->key; return xa->mem.id != mem_id; } From patchwork Mon Mar 22 17:02:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 407492 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CA5FC433E9 for ; Mon, 22 Mar 2021 17:04:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 15097619BF for ; Mon, 22 Mar 2021 17:04:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231851AbhCVREB (ORCPT ); Mon, 22 Mar 2021 13:04:01 -0400 Received: from mail-ej1-f44.google.com ([209.85.218.44]:40595 "EHLO mail-ej1-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231633AbhCVRDp (ORCPT ); Mon, 22 Mar 2021 13:03:45 -0400 Received: by mail-ej1-f44.google.com with SMTP id u9so22490759ejj.7; Mon, 22 Mar 2021 10:03:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+BsUOGlJPlozZqQd4/Ev8lzvqr0OkEcaNTSgyVqY+KY=; b=HnDDrvnZK0os8sOjW68lUvmaztT6S/qQeaZueI6rQy0PkxOnAWFua5oa3yWSE5TOcr pGezPjGvmfvgY3EMHDAi5LOXO1rKbOstCasfh0l7bf7TyiUiCxx57F01Tn72RGnecPMj NhbSwQ5/zXMlueoT2vqJcUe8jL/5b3vM6wVR0jDuD5mRYt61XAtRtb5jsc+pp6alnXSt er5KDBvoe+GPDV8xUo7ELO3R7iUl/vFFeqBRp8VOz/Fj9DUH0wENDcvPoYo7KMkml1YA 3XP5kJykUHVJXsGKnkoC77QPsiD0w0bSwTHgMB5U/tIgnQji/6ArKcaIfSs2AL4fQFfh MwDg== X-Gm-Message-State: AOAM531J1Wi60IvhKb6h1Uo9goOp58njgSv5WeD9A4VsH28n+akoFCkd mQePtzB+ihV+G+5TmYtYFTHU351D5Tc= X-Google-Smtp-Source: ABdhPJzrAUPAH3yCEiDU5Ga19EEwvTHbgl7CZZbhzgNhdwxhGmG4jmkDs2fX4CGx1gwNw6TiiCKBLA== X-Received: by 2002:a17:906:f6ce:: with SMTP id jo14mr811444ejb.476.1616432624245; Mon, 22 Mar 2021 10:03:44 -0700 (PDT) Received: from msft-t490s.teknoraver.net (net-2-34-63-208.cust.vodafonedsl.it. [2.34.63.208]) by smtp.gmail.com with ESMTPSA id h22sm9891589eji.80.2021.03.22.10.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 10:03:43 -0700 (PDT) From: Matteo Croce To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jonathan Lemon , "David S. Miller" , Ilias Apalodimas , Jesper Dangaard Brouer , Lorenzo Bianconi , Saeed Mahameed , David Ahern , Saeed Mahameed , Andrew Lunn Subject: [PATCH net-next 2/6] mm: add a signature in struct page Date: Mon, 22 Mar 2021 18:02:57 +0100 Message-Id: <20210322170301.26017-3-mcroce@linux.microsoft.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210322170301.26017-1-mcroce@linux.microsoft.com> References: <20210322170301.26017-1-mcroce@linux.microsoft.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Matteo Croce This is needed by the page_pool to avoid recycling a page not allocated via page_pool. Signed-off-by: Matteo Croce --- include/linux/mm_types.h | 1 + include/net/page_pool.h | 2 ++ net/core/page_pool.c | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 0974ad501a47..67caade433e4 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -100,6 +100,7 @@ struct page { * 32-bit architectures. */ dma_addr_t dma_addr; + unsigned long signature; }; struct { /* slab, slob and slub */ union { diff --git a/include/net/page_pool.h b/include/net/page_pool.h index b5b195305346..b30405e84b5e 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -63,6 +63,8 @@ */ #define PP_ALLOC_CACHE_SIZE 128 #define PP_ALLOC_CACHE_REFILL 64 +#define PP_SIGNATURE 0x20210303 + struct pp_alloc_cache { u32 count; void *cache[PP_ALLOC_CACHE_SIZE]; diff --git a/net/core/page_pool.c b/net/core/page_pool.c index ad8b0707af04..2ae9b554ef98 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -232,6 +232,8 @@ static struct page *__page_pool_alloc_pages_slow(struct page_pool *pool, page_pool_dma_sync_for_device(pool, page, pool->p.max_len); skip_dma_map: + page->signature = PP_SIGNATURE; + /* Track how many pages are held 'in-flight' */ pool->pages_state_hold_cnt++; @@ -302,6 +304,8 @@ void page_pool_release_page(struct page_pool *pool, struct page *page) DMA_ATTR_SKIP_CPU_SYNC); page->dma_addr = 0; skip_dma_unmap: + page->signature = 0; + /* This may be the last page returned, releasing the pool, so * it is not safe to reference pool afterwards. */ From patchwork Mon Mar 22 17:02:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 406175 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp3736247jai; Mon, 22 Mar 2021 10:05:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDhYNAzvrZSnpFjr19K7FOH+jKq0IFKDl1pQrUMGp5zjnE55DEam0+7Kze/fl+7A6NoOEf X-Received: by 2002:a17:906:354a:: with SMTP id s10mr783276eja.21.1616432700703; Mon, 22 Mar 2021 10:05:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616432700; cv=none; d=google.com; s=arc-20160816; b=ZMy5ppISTlDz84M2l9G5StooUqhoUzyXLxurJ59am268IUI6STr3h++xZ+IEhXh99u jxOWQlq43Q0+FTUBPM4EYxmp74hdiyQ8CVpaOyT+Jq+HV9DFRliW4tZWd1gh+nO72equ cgUUriVpvhOSpiV7kNRtZAkiKPGvASldW59p+2DNI3CrB+dHnRtw92L4V81AkZlhm0qK eE2oNjudITObTtpsMc1OoAxgpYHKndbwsXU92FcMXrjOSMaFaDqnnDcyRz55pRi/CeJu pyuPRwT9HtUfVRgiK0qo2KMrWzJyD3q217eyHzVSbcHTn+KmbV6bvTDrgbnYjTnzHHMz bhXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=jdgNn6wGQVPWa83h8L7hpha0BMyYWY/WMzObKAw2/sA=; b=u6j9j83TEOGogulUCwgirPWDF0vRawyxUowePCnME1fGmPl3Jxd8vOYzNQHgnccV4z +sPfQ8HeyQkkOlz7vrLkrR1QfninnTkjEzYUh0IVkyzn7aaDp06UjgFmKl4z/0gqXMNo eb0r7/CFybZCSQ7D3bYhHCGL39jMp6Di+qkTDF1zDr+Hso4H6pJPWa2iTZ52nQ0cZCxF n4Q5b/sHcvm12318zgO0BSgc+Gj5DaxDbvx4BVe5123+Cxjl6AzT54ByhaVw6qql1YJ0 xJnONr/A1omGWsriLbiS7KrFynHdjoAXB5yT5YOekBoS8rWSlLkhZ/4dC2lGE8A4KJYC JeLA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e1si11247064edr.103.2021.03.22.10.05.00; Mon, 22 Mar 2021 10:05:00 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232016AbhCVRE2 (ORCPT + 8 others); Mon, 22 Mar 2021 13:04:28 -0400 Received: from mail-ej1-f49.google.com ([209.85.218.49]:40639 "EHLO mail-ej1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230051AbhCVRDz (ORCPT ); Mon, 22 Mar 2021 13:03:55 -0400 Received: by mail-ej1-f49.google.com with SMTP id u9so22491654ejj.7; Mon, 22 Mar 2021 10:03:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jdgNn6wGQVPWa83h8L7hpha0BMyYWY/WMzObKAw2/sA=; b=gCOm680nSnb8yTuoBmDm3wrqJY7LzA20ubfuyOBMByeWgQWxbbbSIlg1OhuYCIiYwT 8tSpCpyL0MGFhOM0UC2qoLpqEEcCKGyAGWIurVep7VIAyRifOVaqTQaYcWWDxpKZjXe2 46OZt+61t4JCVoU1b0DXxbabRS5LUbsGL5djJwlStWUQohp3OJngjOpo21Db2eAlLj0t DzXR3uh6Fsw6prW0Xyqm1uU+LdN3sj6tiJJ981/y7wMaallEKxkb7krbK1U7d6D9Sxx7 9GOvv4jlcmJVQqS1F9n1jQNaDIy/bqTytNq0hVpwZr1gAPSqp0x5l83NJ+fWX4Xl6CgL 4G+g== X-Gm-Message-State: AOAM532OL+WNiPTYGOYyrgq7FXjgJHkwicMb9lbjsVFs4Sshb80Gcpp5 QYpAVg7ClFcvyO3jF7D4P6Ugd+QPi+Q= X-Received: by 2002:a17:906:4d18:: with SMTP id r24mr733128eju.493.1616432634042; Mon, 22 Mar 2021 10:03:54 -0700 (PDT) Received: from msft-t490s.teknoraver.net (net-2-34-63-208.cust.vodafonedsl.it. [2.34.63.208]) by smtp.gmail.com with ESMTPSA id h22sm9891589eji.80.2021.03.22.10.03.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 10:03:53 -0700 (PDT) From: Matteo Croce To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jonathan Lemon , "David S. Miller" , Ilias Apalodimas , Jesper Dangaard Brouer , Lorenzo Bianconi , Saeed Mahameed , David Ahern , Saeed Mahameed , Andrew Lunn Subject: [PATCH net-next 3/6] page_pool: DMA handling and allow to recycles frames via SKB Date: Mon, 22 Mar 2021 18:02:58 +0100 Message-Id: <20210322170301.26017-4-mcroce@linux.microsoft.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210322170301.26017-1-mcroce@linux.microsoft.com> References: <20210322170301.26017-1-mcroce@linux.microsoft.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ilias Apalodimas During skb_release_data() intercept the packet and if it's a buffer coming from our page_pool API recycle it back to the pool for further usage. To achieve that we introduce a bit in struct sk_buff (pp_recycle:1) and store the xdp_mem_info in page->private. The SKB bit is needed since page->private is used by skb_copy_ubufs, so we can't rely solely on page->private to trigger recycling. The driver has to take care of the sync operations on it's own during the buffer recycling since the buffer is never unmapped. In order to enable recycling the driver must call skb_mark_for_recycle() to store the information we need for recycling in page->private and enabling the recycling bit Storing the information in page->private allows us to recycle both SKBs and their fragments Signed-off-by: Ilias Apalodimas Signed-off-by: Jesper Dangaard Brouer Signed-off-by: Matteo Croce --- include/linux/skbuff.h | 33 +++++++++++++++++++++++++++---- include/net/page_pool.h | 13 +++++++++++++ include/net/xdp.h | 1 + net/core/page_pool.c | 43 +++++++++++++++++++++++++++++++++++++++++ net/core/skbuff.c | 20 +++++++++++++++++-- net/core/xdp.c | 6 ++++++ 6 files changed, 110 insertions(+), 6 deletions(-) -- 2.30.2 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index ecc029674ae4..3e09a070136f 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -40,6 +40,9 @@ #if IS_ENABLED(CONFIG_NF_CONNTRACK) #include #endif +#if IS_BUILTIN(CONFIG_PAGE_POOL) +#include +#endif /* The interface for checksum offload between the stack and networking drivers * is as follows... @@ -247,6 +250,7 @@ struct napi_struct; struct bpf_prog; union bpf_attr; struct skb_ext; +struct xdp_mem_info; #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) struct nf_bridge_info { @@ -666,6 +670,8 @@ typedef unsigned char *sk_buff_data_t; * @head_frag: skb was allocated from page fragments, * not allocated by kmalloc() or vmalloc(). * @pfmemalloc: skbuff was allocated from PFMEMALLOC reserves + * @pp_recycle: mark the packet for recycling instead of freeing (implies + * page_pool support on driver) * @active_extensions: active extensions (skb_ext_id types) * @ndisc_nodetype: router type (from link layer) * @ooo_okay: allow the mapping of a socket to a queue to be changed @@ -790,10 +796,12 @@ struct sk_buff { fclone:2, peeked:1, head_frag:1, - pfmemalloc:1; + pfmemalloc:1, + pp_recycle:1; /* page_pool recycle indicator */ #ifdef CONFIG_SKB_EXTENSIONS __u8 active_extensions; #endif + /* fields enclosed in headers_start/headers_end are copied * using a single memcpy() in __copy_skb_header() */ @@ -3080,12 +3088,20 @@ static inline void skb_frag_ref(struct sk_buff *skb, int f) /** * __skb_frag_unref - release a reference on a paged fragment. * @frag: the paged fragment + * @recycle: recycle the page if allocated via page_pool * * Releases a reference on the paged fragment @frag. + * or recycles the page via the page_pool API */ -static inline void __skb_frag_unref(skb_frag_t *frag) +static inline void __skb_frag_unref(skb_frag_t *frag, bool recycle) { - put_page(skb_frag_page(frag)); + struct page *page = skb_frag_page(frag); + +#if IS_BUILTIN(CONFIG_PAGE_POOL) + if (recycle && page_pool_return_skb_page(page_address(page))) + return; +#endif + put_page(page); } /** @@ -3097,7 +3113,7 @@ static inline void __skb_frag_unref(skb_frag_t *frag) */ static inline void skb_frag_unref(struct sk_buff *skb, int f) { - __skb_frag_unref(&skb_shinfo(skb)->frags[f]); + __skb_frag_unref(&skb_shinfo(skb)->frags[f], skb->pp_recycle); } /** @@ -4695,5 +4711,14 @@ static inline u64 skb_get_kcov_handle(struct sk_buff *skb) #endif } +#if IS_BUILTIN(CONFIG_PAGE_POOL) +static inline void skb_mark_for_recycle(struct sk_buff *skb, struct page *page, + struct xdp_mem_info *mem) +{ + skb->pp_recycle = 1; + page_pool_store_mem_info(page, mem); +} +#endif + #endif /* __KERNEL__ */ #endif /* _LINUX_SKBUFF_H */ diff --git a/include/net/page_pool.h b/include/net/page_pool.h index b30405e84b5e..75fffc15788b 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -65,6 +65,8 @@ #define PP_ALLOC_CACHE_REFILL 64 #define PP_SIGNATURE 0x20210303 +struct xdp_mem_info; + struct pp_alloc_cache { u32 count; void *cache[PP_ALLOC_CACHE_SIZE]; @@ -148,6 +150,8 @@ inline enum dma_data_direction page_pool_get_dma_dir(struct page_pool *pool) return pool->p.dma_dir; } +bool page_pool_return_skb_page(void *data); + struct page_pool *page_pool_create(const struct page_pool_params *params); #ifdef CONFIG_PAGE_POOL @@ -243,4 +247,13 @@ static inline void page_pool_ring_unlock(struct page_pool *pool) spin_unlock_bh(&pool->ring.producer_lock); } +/* Store mem_info on struct page and use it while recycling skb frags */ +static inline +void page_pool_store_mem_info(struct page *page, struct xdp_mem_info *mem) +{ + u32 *xmi = (u32 *)mem; + + set_page_private(page, *xmi); +} + #endif /* _NET_PAGE_POOL_H */ diff --git a/include/net/xdp.h b/include/net/xdp.h index c35864d59113..5d7316f1f195 100644 --- a/include/net/xdp.h +++ b/include/net/xdp.h @@ -235,6 +235,7 @@ void xdp_return_buff(struct xdp_buff *xdp); void xdp_flush_frame_bulk(struct xdp_frame_bulk *bq); void xdp_return_frame_bulk(struct xdp_frame *xdpf, struct xdp_frame_bulk *bq); +void xdp_return_skb_frame(void *data, struct xdp_mem_info *mem); /* When sending xdp_frame into the network stack, then there is no * return point callback, which is needed to release e.g. DMA-mapping diff --git a/net/core/page_pool.c b/net/core/page_pool.c index 2ae9b554ef98..43bfd2e3d8df 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -17,12 +18,19 @@ #include #include #include /* for __put_page() */ +#include #include #define DEFER_TIME (msecs_to_jiffies(1000)) #define DEFER_WARN_INTERVAL (60 * HZ) +/* Used to store/retrieve hi/lo bytes from xdp_mem_info to page->private */ +union page_pool_xmi { + u32 raw; + struct xdp_mem_info mem_info; +}; + static int page_pool_init(struct page_pool *pool, const struct page_pool_params *params) { @@ -587,3 +595,38 @@ void page_pool_update_nid(struct page_pool *pool, int new_nid) } } EXPORT_SYMBOL(page_pool_update_nid); + +bool page_pool_return_skb_page(void *data) +{ + struct xdp_mem_info mem_info; + union page_pool_xmi info; + struct page *page; + + page = virt_to_head_page(data); + if (unlikely(page->signature != PP_SIGNATURE)) + return false; + + info.raw = page_private(page); + mem_info = info.mem_info; + + /* If a buffer is marked for recycle and does not belong to + * MEM_TYPE_PAGE_POOL, the buffers will be eventually freed from the + * network stack and kfree_skb, but the DMA region will *not* be + * correctly unmapped. WARN here for the recycling misusage + */ + if (unlikely(mem_info.type != MEM_TYPE_PAGE_POOL)) { + WARN_ONCE(true, "Tried to recycle non MEM_TYPE_PAGE_POOL"); + return false; + } + + /* Driver set this to memory recycling info. Reset it on recycle + * This will *not* work for NIC using a split-page memory model. + * The page will be returned to the pool here regardless of the + * 'flipped' fragment being in use or not + */ + set_page_private(page, 0); + xdp_return_skb_frame(data, &mem_info); + + return true; +} +EXPORT_SYMBOL(page_pool_return_skb_page); diff --git a/net/core/skbuff.c b/net/core/skbuff.c index e8320b5d651a..7f5c02085438 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -69,6 +69,9 @@ #include #include #include +#if IS_BUILTIN(CONFIG_PAGE_POOL) +#include +#endif #include #include @@ -644,6 +647,11 @@ static void skb_free_head(struct sk_buff *skb) { unsigned char *head = skb->head; +#if IS_BUILTIN(CONFIG_PAGE_POOL) + if (skb->pp_recycle && page_pool_return_skb_page(head)) + return; +#endif + if (skb->head_frag) skb_free_frag(head); else @@ -663,7 +671,7 @@ static void skb_release_data(struct sk_buff *skb) skb_zcopy_clear(skb, true); for (i = 0; i < shinfo->nr_frags; i++) - __skb_frag_unref(&shinfo->frags[i]); + __skb_frag_unref(&shinfo->frags[i], skb->pp_recycle); if (shinfo->frag_list) kfree_skb_list(shinfo->frag_list); @@ -1045,6 +1053,7 @@ static struct sk_buff *__skb_clone(struct sk_buff *n, struct sk_buff *skb) n->nohdr = 0; n->peeked = 0; C(pfmemalloc); + C(pp_recycle); n->destructor = NULL; C(tail); C(end); @@ -3453,7 +3462,7 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen) fragto = &skb_shinfo(tgt)->frags[merge]; skb_frag_size_add(fragto, skb_frag_size(fragfrom)); - __skb_frag_unref(fragfrom); + __skb_frag_unref(fragfrom, skb->pp_recycle); } /* Reposition in the original skb */ @@ -5234,6 +5243,13 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, if (skb_cloned(to)) return false; + /* We can't coalesce skb that are allocated from slab and page_pool + * The recycle mark is on the skb, so that might end up trying to + * recycle slab allocated skb->head + */ + if (to->pp_recycle != from->pp_recycle) + return false; + if (len <= skb_tailroom(to)) { if (len) BUG_ON(skb_copy_bits(from, 0, skb_put(to, len), len)); diff --git a/net/core/xdp.c b/net/core/xdp.c index 3dd47ed83778..d89b827e54a9 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -372,6 +372,12 @@ static void __xdp_return(void *data, struct xdp_mem_info *mem, bool napi_direct, } } +void xdp_return_skb_frame(void *data, struct xdp_mem_info *mem) +{ + __xdp_return(data, mem, false, NULL); +} +EXPORT_SYMBOL_GPL(xdp_return_skb_frame); + void xdp_return_frame(struct xdp_frame *xdpf) { __xdp_return(xdpf->data, &xdpf->mem, false, NULL); From patchwork Mon Mar 22 17:02:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 406176 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp3736261jai; Mon, 22 Mar 2021 10:05:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTSOYsUuYf4C2TYk4V5wTw89OvEwMQ0Wb2Drle21MPPQ44ygM/15SoecwdCcNQQQHL2k8Q X-Received: by 2002:a17:906:aada:: with SMTP id kt26mr763448ejb.137.1616432701595; Mon, 22 Mar 2021 10:05:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616432701; cv=none; d=google.com; s=arc-20160816; b=DxZfdOjC0943x3b11gAn1bUMIKPVXhmXDzFB5voRZappo9LPDwk7UNTmUz+PyXky/v geWxajFHsfrTpR0exItmkqiCj8PZxKEoDwOzcxLcaVjPwwMYHBWYXY3y1Hjxe/oWeZni /wxD6c+FOKrZMs3Jkzs3n5KTAcVX1Ja/0LIsZD2zKgtIcW+yPLMU4A7zM0tYVBAP/fim /XpF/CqDbgD7iPiFT50BGGvoAauLvk4EkN1ViUndRWPQYfJ9oAHWLPD2h96WD2epsMlO 7cxP/lj6uVkuSiyQ4UFJy3/IrWDdh0eNMJ1HB7claTJQcdbIQmZzhZ1cpvOQ1ydoy05f Pngg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=mbX+25IhtGxUxG75ZUNY2+6T7jBsgS7En6v4O7pc9lg=; b=VobmFQgp2BFdkj0exMrZF35RET8q2Dp6VqDJFWwyNCt8O7tvAwhTB03RKjCJ7hVi/w QPrxbfvztW92JwB0rK1Y6tMpAAITel/YnjdRKoooYpT6BGr08VVjF72lWNGT5QtNlrXq RliK9wQqtVfHNpTJkdr45iuMzO1oDD6+q3+1VvYPVyBGIkxLg9PXw6NWad2jUEOOIy1I Z/x+0SLoWKrZ8+5VshzExNRlmU/57prgikLDBzdThvHxAILaSEOmKzF1Oh2zvfPuU2uA XsJZWIH7R8ws3qfn0UEwzQLboLrPqt0cSmd7XiwNNjq4vRzYepM/7JYIqX9rfY5OVNxT xmZg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e1si11247064edr.103.2021.03.22.10.05.01; Mon, 22 Mar 2021 10:05:01 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231689AbhCVREc (ORCPT + 8 others); Mon, 22 Mar 2021 13:04:32 -0400 Received: from mail-ej1-f50.google.com ([209.85.218.50]:40704 "EHLO mail-ej1-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231664AbhCVREN (ORCPT ); Mon, 22 Mar 2021 13:04:13 -0400 Received: by mail-ej1-f50.google.com with SMTP id u9so22493180ejj.7; Mon, 22 Mar 2021 10:04:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mbX+25IhtGxUxG75ZUNY2+6T7jBsgS7En6v4O7pc9lg=; b=Kgc5EtGIsxAH9YA8qnZ7LZZ5q9gfka6DUdUgFtmsOWpBqRmnea0gUVMzzate2ospzb NBKG22jFqgJPl827C5ZSTQj+IOORoz35t/abVUx1bL0j6xk/4rSUv1XrKN1sgqdSCM0j I6ZQ07yDdIXowvIsVkzXQAVcUDMfajAl9jD3BoNAs/tkhnJrZRiaNQLt7y2OmDhjrGNa loPwOpcbV4XZPxiNTLSt0Z3PapocIPuJyAdnpTWp0qmmbXowW4HOEKFkHkKPlr6z5tvq HomNoXzGzzk0qFAehxJUM0qITU/d7ZAQLsGBUWHtM6uZjvv6wza7eNAwFwuklbuiToZ1 y8Zg== X-Gm-Message-State: AOAM531TMNJKpHe/gsc0/zRrLwkMb1ZJiBUyWHddmlis8/henXgFctAW i1rHYgsEZM4Wmqon7v2mGG36TvvEqZk= X-Received: by 2002:a17:906:4a50:: with SMTP id a16mr821098ejv.256.1616432651829; Mon, 22 Mar 2021 10:04:11 -0700 (PDT) Received: from msft-t490s.teknoraver.net (net-2-34-63-208.cust.vodafonedsl.it. [2.34.63.208]) by smtp.gmail.com with ESMTPSA id h22sm9891589eji.80.2021.03.22.10.04.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 10:04:11 -0700 (PDT) From: Matteo Croce To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jonathan Lemon , "David S. Miller" , Ilias Apalodimas , Jesper Dangaard Brouer , Lorenzo Bianconi , Saeed Mahameed , David Ahern , Saeed Mahameed , Andrew Lunn Subject: [PATCH net-next 4/6] net: change users of __skb_frag_unref() and add an extra argument Date: Mon, 22 Mar 2021 18:02:59 +0100 Message-Id: <20210322170301.26017-5-mcroce@linux.microsoft.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210322170301.26017-1-mcroce@linux.microsoft.com> References: <20210322170301.26017-1-mcroce@linux.microsoft.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ilias Apalodimas On a previous patch we added an extra argument on __skb_frag_unref() to handle recycling. Update the current users of the function with that. Signed-off-by: Ilias Apalodimas Signed-off-by: Matteo Croce --- drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 2 +- drivers/net/ethernet/marvell/sky2.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- net/tls/tls_device.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c index 169e10c91378..cbcff5518965 100644 --- a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c +++ b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c @@ -2125,7 +2125,7 @@ static int chcr_ktls_xmit(struct sk_buff *skb, struct net_device *dev) /* clear the frag ref count which increased locally before */ for (i = 0; i < record->num_frags; i++) { /* clear the frag ref count */ - __skb_frag_unref(&record->frags[i]); + __skb_frag_unref(&record->frags[i], false); } /* if any failure, come out from the loop. */ if (ret) { diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 2a752fb6b758..1cc646fb4fe4 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -2501,7 +2501,7 @@ static void skb_put_frags(struct sk_buff *skb, unsigned int hdr_space, if (length == 0) { /* don't need this page */ - __skb_frag_unref(frag); + __skb_frag_unref(frag, false); --skb_shinfo(skb)->nr_frags; } else { size = min(length, (unsigned) PAGE_SIZE); diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index e35e4d7ef4d1..cea62b8f554c 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -526,7 +526,7 @@ static int mlx4_en_complete_rx_desc(struct mlx4_en_priv *priv, fail: while (nr > 0) { nr--; - __skb_frag_unref(skb_shinfo(skb)->frags + nr); + __skb_frag_unref(skb_shinfo(skb)->frags + nr, false); } return 0; } diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index d9cd229aa111..2a32a547e51a 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -127,7 +127,7 @@ static void destroy_record(struct tls_record_info *record) int i; for (i = 0; i < record->num_frags; i++) - __skb_frag_unref(&record->frags[i]); + __skb_frag_unref(&record->frags[i], false); kfree(record); } From patchwork Mon Mar 22 17:03:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 407491 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7104BC433E2 for ; Mon, 22 Mar 2021 17:05:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3FB96619A0 for ; Mon, 22 Mar 2021 17:05:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231664AbhCVREd (ORCPT ); Mon, 22 Mar 2021 13:04:33 -0400 Received: from mail-ej1-f50.google.com ([209.85.218.50]:45026 "EHLO mail-ej1-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231435AbhCVRE0 (ORCPT ); Mon, 22 Mar 2021 13:04:26 -0400 Received: by mail-ej1-f50.google.com with SMTP id e14so4284203ejz.11; Mon, 22 Mar 2021 10:04:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q4hJwVCk3+ZTPKzqvOlhAKuNUBRHjDMrz11EpiH6d2Q=; b=iOxJWrYeuxfMdroIwyPWyLYPSniXH1Mr3LJ5n9yPRQ34mHI3zjAXM31UN1DkvaE5KQ lrOCCoxPZlEp+iiTVedpFhCgL6APTjmC8lojr4DFgjxNtXKyF8vUeQE8ZXbUpXQAv291 dtQyFR5c+55R6dHpeBqBozltHByagiD9SfcCn7BD3UxoTjthcwNNSxEeNVIHdSrwz2Fh omADOJH9nqYUpAb6ZXCoIVL6yETSRmi4F1BluIjW6P56toS7MnllI8M683FnSnM8S2Dy H2Q9ZgJOvmhziCgirjNFJMZfytyCvbul7fk3gVVUNM/YWmcRI51dnnxS7EKMWrLabVYI OoMA== X-Gm-Message-State: AOAM530z/efvlnQI81eVeVEk1OA3IizhjCoxrQn+wjdNyuoe9uDKJpmI dRsjf0TdU0U3PSC/uy5iOod/CaXcbRU= X-Google-Smtp-Source: ABdhPJyKt9rFvfA1h22M92BqSGbJM062tCpyfjUwYNkAwntkJpQTDeRzbPyMGENaSYJFRYpNTU/FqA== X-Received: by 2002:a17:907:2062:: with SMTP id qp2mr755287ejb.397.1616432662421; Mon, 22 Mar 2021 10:04:22 -0700 (PDT) Received: from msft-t490s.teknoraver.net (net-2-34-63-208.cust.vodafonedsl.it. [2.34.63.208]) by smtp.gmail.com with ESMTPSA id h22sm9891589eji.80.2021.03.22.10.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 10:04:22 -0700 (PDT) From: Matteo Croce To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jonathan Lemon , "David S. Miller" , Ilias Apalodimas , Jesper Dangaard Brouer , Lorenzo Bianconi , Saeed Mahameed , David Ahern , Saeed Mahameed , Andrew Lunn Subject: [PATCH net-next 5/6] mvpp2: recycle buffers Date: Mon, 22 Mar 2021 18:03:00 +0100 Message-Id: <20210322170301.26017-6-mcroce@linux.microsoft.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210322170301.26017-1-mcroce@linux.microsoft.com> References: <20210322170301.26017-1-mcroce@linux.microsoft.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Matteo Croce Use the new recycling API for page_pool. In a drop rate test, the packet rate is more than doubled, from 962 Kpps to 2047 Kpps. perf top on a stock system shows: Overhead Shared Object Symbol 30.67% [kernel] [k] page_pool_release_page 8.37% [kernel] [k] get_page_from_freelist 7.34% [kernel] [k] free_unref_page 6.47% [mvpp2] [k] mvpp2_rx 4.69% [kernel] [k] eth_type_trans 4.55% [kernel] [k] __netif_receive_skb_core 4.40% [kernel] [k] build_skb 4.29% [kernel] [k] kmem_cache_free 4.00% [kernel] [k] kmem_cache_alloc 3.81% [kernel] [k] dev_gro_receive With packet rate stable at 962 Kpps: tx: 0 bps 0 pps rx: 477.4 Mbps 962.6 Kpps tx: 0 bps 0 pps rx: 477.6 Mbps 962.8 Kpps tx: 0 bps 0 pps rx: 477.6 Mbps 962.9 Kpps tx: 0 bps 0 pps rx: 477.2 Mbps 962.1 Kpps tx: 0 bps 0 pps rx: 477.5 Mbps 962.7 Kpps And this is the same output with recycling enabled: Overhead Shared Object Symbol 12.75% [mvpp2] [k] mvpp2_rx 9.56% [kernel] [k] __netif_receive_skb_core 9.29% [kernel] [k] build_skb 9.27% [kernel] [k] eth_type_trans 8.39% [kernel] [k] kmem_cache_alloc 7.85% [kernel] [k] kmem_cache_free 7.36% [kernel] [k] page_pool_put_page 6.45% [kernel] [k] dev_gro_receive 4.72% [kernel] [k] __xdp_return 3.06% [kernel] [k] page_pool_refill_alloc_cache With packet rate above 2000 Kpps: tx: 0 bps 0 pps rx: 1015 Mbps 2046 Kpps tx: 0 bps 0 pps rx: 1015 Mbps 2047 Kpps tx: 0 bps 0 pps rx: 1015 Mbps 2047 Kpps tx: 0 bps 0 pps rx: 1015 Mbps 2047 Kpps tx: 0 bps 0 pps rx: 1015 Mbps 2047 Kpps The major performance increase is explained by the fact that the most CPU consuming functions (page_pool_release_page, get_page_from_freelist and free_unref_page) are no longer called on a per packet basis. The test was done by sending to the macchiatobin 64 byte ethernet frames with an invalid ethertype, so the packets are dropped early in the RX path. Signed-off-by: Matteo Croce --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 1767c60056c5..8f03bbc763bc 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -3848,6 +3848,7 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi, struct mvpp2_pcpu_stats ps = {}; enum dma_data_direction dma_dir; struct bpf_prog *xdp_prog; + struct xdp_rxq_info *rxqi; struct xdp_buff xdp; int rx_received; int rx_done = 0; @@ -3913,15 +3914,15 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi, else frag_size = bm_pool->frag_size; - if (xdp_prog) { - struct xdp_rxq_info *xdp_rxq; + if (bm_pool->pkt_size == MVPP2_BM_SHORT_PKT_SIZE) + rxqi = &rxq->xdp_rxq_short; + else + rxqi = &rxq->xdp_rxq_long; - if (bm_pool->pkt_size == MVPP2_BM_SHORT_PKT_SIZE) - xdp_rxq = &rxq->xdp_rxq_short; - else - xdp_rxq = &rxq->xdp_rxq_long; + if (xdp_prog) { + xdp.rxq = rxqi; - xdp_init_buff(&xdp, PAGE_SIZE, xdp_rxq); + xdp_init_buff(&xdp, PAGE_SIZE, rxqi); xdp_prepare_buff(&xdp, data, MVPP2_MH_SIZE + MVPP2_SKB_HEADROOM, rx_bytes, false); @@ -3965,7 +3966,7 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi, } if (pp) - page_pool_release_page(pp, virt_to_page(data)); + skb_mark_for_recycle(skb, virt_to_page(data), &rxqi->mem); else dma_unmap_single_attrs(dev->dev.parent, dma_addr, bm_pool->buf_size, DMA_FROM_DEVICE, From patchwork Mon Mar 22 17:03:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 407490 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71AB0C433DB for ; Mon, 22 Mar 2021 17:05:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 45303619A4 for ; Mon, 22 Mar 2021 17:05:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232024AbhCVRFB (ORCPT ); Mon, 22 Mar 2021 13:05:01 -0400 Received: from mail-ej1-f43.google.com ([209.85.218.43]:39429 "EHLO mail-ej1-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232036AbhCVREe (ORCPT ); Mon, 22 Mar 2021 13:04:34 -0400 Received: by mail-ej1-f43.google.com with SMTP id ce10so22483417ejb.6; Mon, 22 Mar 2021 10:04:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ihzH3n3aHmXKOtcPI8KDnr7LGDtclLmi/Ni6ekZYQ8Q=; b=RAQiCc6Iu0MyRhjmihJEEZYBD37Y0pptCTJIZRdJ9iEBg8sf0YpzocyiQVkLu14EQO 9HBa4ax7PyKRH4BrIbQXBIJx9kWWvHV9r7Irn5+53AA5rpPnMRkJqq6XdEtc790vUIXT shU1vGiMeCZRRu3cWwyW/cKPNWrHzOX/ttEfDzlnK4Jj8ZqO4UlUVHnQTWx78owKxiye SKLiHuYN2RmA9FYQUwKSsk4RV9U3s+c6mgE0yTYfx/mzIDi9L6m+bMIpbZ4Aav7w3RwI EdwaVcONh8MrSTBjiOvcMJV96s3CtA+zQLpzSN0rfeOuvZGU5jvho0U5g+y+dWS/WiJO 61DA== X-Gm-Message-State: AOAM531PIx8och63vuMgqRRISOgRvRLFHnbrfWy7c6fSeKy1aL/jCMhU HpQPNFyWK5YVxMoC5rCmJAVMrqnMVRc= X-Google-Smtp-Source: ABdhPJxG8i7OUEAd0loUyPeeBTqEPCwSXanQojoNFFaiLHW681sxXpFa0WXn3zRQV8XnnT/Cr7jfYA== X-Received: by 2002:a17:906:3f88:: with SMTP id b8mr854411ejj.36.1616432673283; Mon, 22 Mar 2021 10:04:33 -0700 (PDT) Received: from msft-t490s.teknoraver.net (net-2-34-63-208.cust.vodafonedsl.it. [2.34.63.208]) by smtp.gmail.com with ESMTPSA id h22sm9891589eji.80.2021.03.22.10.04.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 10:04:32 -0700 (PDT) From: Matteo Croce To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jonathan Lemon , "David S. Miller" , Ilias Apalodimas , Jesper Dangaard Brouer , Lorenzo Bianconi , Saeed Mahameed , David Ahern , Saeed Mahameed , Andrew Lunn Subject: [PATCH net-next 6/6] mvneta: recycle buffers Date: Mon, 22 Mar 2021 18:03:01 +0100 Message-Id: <20210322170301.26017-7-mcroce@linux.microsoft.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210322170301.26017-1-mcroce@linux.microsoft.com> References: <20210322170301.26017-1-mcroce@linux.microsoft.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Matteo Croce Use the new recycling API for page_pool. In a drop rate test, the packet rate increased di 10%, from 269 Kpps to 296 Kpps. perf top on a stock system shows: Overhead Shared Object Symbol 21.78% [kernel] [k] __pi___inval_dcache_area 21.66% [mvneta] [k] mvneta_rx_swbm 7.00% [kernel] [k] kmem_cache_alloc 6.05% [kernel] [k] eth_type_trans 4.44% [kernel] [k] kmem_cache_free.part.0 3.80% [kernel] [k] __netif_receive_skb_core 3.68% [kernel] [k] dev_gro_receive 3.65% [kernel] [k] get_page_from_freelist 3.43% [kernel] [k] page_pool_release_page 3.35% [kernel] [k] free_unref_page And this is the same output with recycling enabled: Overhead Shared Object Symbol 24.10% [kernel] [k] __pi___inval_dcache_area 23.02% [mvneta] [k] mvneta_rx_swbm 7.19% [kernel] [k] kmem_cache_alloc 6.50% [kernel] [k] eth_type_trans 4.93% [kernel] [k] __netif_receive_skb_core 4.77% [kernel] [k] kmem_cache_free.part.0 3.93% [kernel] [k] dev_gro_receive 3.03% [kernel] [k] build_skb 2.91% [kernel] [k] page_pool_put_page 2.85% [kernel] [k] __xdp_return The test was done with mausezahn on the TX side with 64 byte raw ethernet frames. Signed-off-by: Matteo Croce --- drivers/net/ethernet/marvell/mvneta.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index a635cf84608a..8b3250394703 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -2332,7 +2332,7 @@ mvneta_swbm_build_skb(struct mvneta_port *pp, struct mvneta_rx_queue *rxq, if (!skb) return ERR_PTR(-ENOMEM); - page_pool_release_page(rxq->page_pool, virt_to_page(xdp->data)); + skb_mark_for_recycle(skb, virt_to_page(xdp->data), &xdp->rxq->mem); skb_reserve(skb, xdp->data - xdp->data_hard_start); skb_put(skb, xdp->data_end - xdp->data); @@ -2344,7 +2344,7 @@ mvneta_swbm_build_skb(struct mvneta_port *pp, struct mvneta_rx_queue *rxq, skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, skb_frag_page(frag), skb_frag_off(frag), skb_frag_size(frag), PAGE_SIZE); - page_pool_release_page(rxq->page_pool, skb_frag_page(frag)); + skb_mark_for_recycle(skb, skb_frag_page(frag), &xdp->rxq->mem); } return skb;