From patchwork Thu Mar 11 19:42:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 399467 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 2A1A2C433DB for ; Thu, 11 Mar 2021 19:44:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E380364F7C for ; Thu, 11 Mar 2021 19:44:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230319AbhCKToT (ORCPT ); Thu, 11 Mar 2021 14:44:19 -0500 Received: from mail-ed1-f49.google.com ([209.85.208.49]:42856 "EHLO mail-ed1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229675AbhCKToI (ORCPT ); Thu, 11 Mar 2021 14:44:08 -0500 Received: by mail-ed1-f49.google.com with SMTP id u4so4591996edv.9; Thu, 11 Mar 2021 11:44:07 -0800 (PST) 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=YI2nNQyDrWXPwhx/kaHbgpDnh31My7dSLdT5Tz8fthI=; b=Z1mgg0OpTBHOfMotJf23/+mSMaU8pQhqrU8kqKUcyTVBIyg0EYunArIDffVxRDvFKZ SVeOUJBaJHx3EcudZvAdwoEZ5RksxEcx+1eOxRLElALX/wY79DlWW1xbkAPsNDm+Eu/G jx6eepuXzbK7YS35GP72osg6cYn+eUYJ7uqc6+v7SacppgWg6Z3sZ7ZSvYjuyK7Cdq+x /IZXF7zUumYJwRYqzIAMD3rSeEVwUOAZSlEwpD4QfKYZCMHWjQ8PhXCbQEpj6tlMWioq L8IX3QIYaTpRh6j4KUXAymeKSwSpMGIrWA4HvD9On+UQKb/3V4S+g1rbaM5r1Zh2i057 mILQ== X-Gm-Message-State: AOAM5333blznhFD+ukOZ6SYa+z7YbDtvqhkrMvSuYENQJao1CuPTURg/ qOTJXE8jcADL3GWAK3gFuSbhVWbLJk0= X-Google-Smtp-Source: ABdhPJzWBMI7r7rqttoaQfPVOIOWY/0x7OAnEZvmah72avQr12GLynyurPmBfVK5PmXMQeKT91W+fQ== X-Received: by 2002:a05:6402:1613:: with SMTP id f19mr10377447edv.222.1615491846680; Thu, 11 Mar 2021 11:44:06 -0800 (PST) Received: from msft-t490s.teknoraver.net (net-188-216-41-250.cust.vodafonedsl.it. [188.216.41.250]) by smtp.gmail.com with ESMTPSA id t16sm1875652edi.60.2021.03.11.11.44.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:44:06 -0800 (PST) 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 Subject: [RFC net-next 1/6] xdp: reduce size of struct xdp_mem_info Date: Thu, 11 Mar 2021 20:42:51 +0100 Message-Id: <20210311194256.53706-2-mcroce@linux.microsoft.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210311194256.53706-1-mcroce@linux.microsoft.com> References: <20210311194256.53706-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 Thu Mar 11 19:42:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 398168 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 2FA5CC433E0 for ; Thu, 11 Mar 2021 19:45:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E121264F7D for ; Thu, 11 Mar 2021 19:45:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230363AbhCKTox (ORCPT ); Thu, 11 Mar 2021 14:44:53 -0500 Received: from mail-ed1-f45.google.com ([209.85.208.45]:33392 "EHLO mail-ed1-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229468AbhCKTop (ORCPT ); Thu, 11 Mar 2021 14:44:45 -0500 Received: by mail-ed1-f45.google.com with SMTP id w18so4604585edc.0; Thu, 11 Mar 2021 11:44:44 -0800 (PST) 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=DWBxv9mwIlByZiQqIZk+iqgg+9i0Rl2rKMKfAz4j0UU=; b=GbP4HPaED+vL9CBa9J2ICuHwbcMsawLurHACP8tPu97/U+BDANOv35jVRbtXEiVGEq pr0Zz2T+iyVkkJc/TElgbjdBRfw79fsPecEhTp2vSkx71qDZ8HprTQ2ahE7zs55da8GE mgLH8FFkhBKAom3j+bpbvNPNm/qflL3SYksYh1cZoAENj/BaZPVpi+1eqSWHd5DmJxc7 O3AWjPwYq+2cl/wq2NEqQZjL48YVm86GIDcWN0HkbdJhrROqbc0VPhZKt/INNkB5bXGb TLLqasFPtO7XcvFUd0FNQjdbKKNIl0rQKdbrqxcjKS4WneleDtQ8Xn9dyfjXOG7ezcOL OFmA== X-Gm-Message-State: AOAM532WTz+sjly3oyx66jHXSUaB1SiOYFsrLS8kjAc6WabdATK6uch1 9MTxZl/fdb4kHQ7cddopzRTwkGBbTyE= X-Google-Smtp-Source: ABdhPJz/PbHJ5l5YDixdyLXgqrrRs7TRJoBF869Rz1VS0P1XiSdvg24p0p9d0HEH4APEjaIlsjvCzg== X-Received: by 2002:a05:6402:1c86:: with SMTP id cy6mr10025404edb.276.1615491884378; Thu, 11 Mar 2021 11:44:44 -0800 (PST) Received: from msft-t490s.teknoraver.net (net-188-216-41-250.cust.vodafonedsl.it. [188.216.41.250]) by smtp.gmail.com with ESMTPSA id t16sm1875652edi.60.2021.03.11.11.44.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:44:43 -0800 (PST) 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 Subject: [RFC net-next 2/6] mm: add a signature in struct page Date: Thu, 11 Mar 2021 20:42:52 +0100 Message-Id: <20210311194256.53706-3-mcroce@linux.microsoft.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210311194256.53706-1-mcroce@linux.microsoft.com> References: <20210311194256.53706-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 Thu Mar 11 19:42:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 397567 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp600385jai; Thu, 11 Mar 2021 11:45:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJygKlZSYmmh8HgqMqSd0PblySbWSXB8WQhfHKA5wuI2diyuYGPOoNneaj231Z0DB9N0Cb42 X-Received: by 2002:a17:906:a94b:: with SMTP id hh11mr4717699ejb.459.1615491958803; Thu, 11 Mar 2021 11:45:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615491958; cv=none; d=google.com; s=arc-20160816; b=ZLRJfTDUUtdnp5erssWow29Rf6BQdbKGLkxM+w7asEpkj9Ae1H1fosGXipLHrUAqGc TigmVS66Hc08UST9nU/Q3gT8g+kkjZ1RqAINW6ERxZ3ImmxXAT4Dn9zKhNjPh4s04+Mb rV6Rsil09NNJUAa+mXmnOilNa7B0zTR76SOXO0mhJpsUd8F18tmJMVuTCcblcbjmHZTM TbTAD7RuZBpmf4EZ9ocFCiwFXyAA+LOa+h5cIi1OF6jKpHaSq4UAKPhTW4WPzfF/ME0y BirGcjIKyA/Epzb8w28DmuweteEQy1iOyqU7EVRNIcdHSlzYtGl+Va3fxN1iXFcEZ4X+ Xu6w== 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=lOECMjQ+NXz6+NqTtXw4oahKQpI2LGbONGMU3BLYNjQ=; b=zdPO7nqGy2zsXVDHVq/5bioSWZvxBdpRHY3iRVhdKMDeZqEl+Y8dzwc3r46qUDiZ/V ss8HFZrgQqCjPwckEg93EfhEFQZKZWWQ8hkyNdMUerKZP81mNg99KmXgie+/+4aGL+Qs sZyBkpE8Mji58FTN/tIfIdNWE23PtQ/Xfw+wBZVbNTC8CDuywJdko/RrjIFh+t4g8Fc3 e8pYuBCXjc60oMsLWq7ALHiJyTm7HJE+SC983wsh2FVlwV/UuOerkz7goZFMSJL9coTt VWWLfWbvXZmt38jEnyOFKgcf7BBikaZHLjkpWW6OtZIBW+rf+7Tde2MKMrby9mLPZ9fg sF6Q== 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 i15si2271467edl.581.2021.03.11.11.45.58; Thu, 11 Mar 2021 11:45:58 -0800 (PST) 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 S230388AbhCKTpZ (ORCPT + 8 others); Thu, 11 Mar 2021 14:45:25 -0500 Received: from mail-ej1-f43.google.com ([209.85.218.43]:46783 "EHLO mail-ej1-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229809AbhCKToz (ORCPT ); Thu, 11 Mar 2021 14:44:55 -0500 Received: by mail-ej1-f43.google.com with SMTP id r17so48674978ejy.13; Thu, 11 Mar 2021 11:44:55 -0800 (PST) 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=lOECMjQ+NXz6+NqTtXw4oahKQpI2LGbONGMU3BLYNjQ=; b=RmT53yGVIhSsaPoUgLYcQ7WJiZQrZCnfVPyylXPhrFIwBWbU5LrZ6xdlFj1z8F5R6s q2pSUnxflGl5zzawwV0VEGtVBgc34p4m8jP6vmu/Aqz55SlrVPVfGOsnUrk0uoeSPQ9F PSwbFieBNzoeSoR/oq2DHLCk0lmN1qMlPf2qKVpi2cQY5ug3S109C0SlqsxlmBLMtxRY mD+p1eepVb8mQPMKluYKQ3PB1LntRVgA/eqVZGzJPYClgC/go8ku4gd74bsYMon32epz OK70X5xjqit6htARM5Qvy3A8XgbJ3kWF7FSHKPQZazlyJ7LKMXBN7lT3NAh/V9lVPzOJ b6IA== X-Gm-Message-State: AOAM5320EtpDyj8NRLPqhGMHBNQbRbwZd/CiF2noiGZ/iacSNlLW1+ZV FfgRgC0FyV/EeOP2jlyWh1Hz9U1kqc8= X-Received: by 2002:a17:906:229b:: with SMTP id p27mr4831988eja.287.1615491894230; Thu, 11 Mar 2021 11:44:54 -0800 (PST) Received: from msft-t490s.teknoraver.net (net-188-216-41-250.cust.vodafonedsl.it. [188.216.41.250]) by smtp.gmail.com with ESMTPSA id t16sm1875652edi.60.2021.03.11.11.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:44:53 -0800 (PST) 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 Subject: [RFC net-next 3/6] page_pool: DMA handling and frame recycling via SKBs Date: Thu, 11 Mar 2021 20:42:53 +0100 Message-Id: <20210311194256.53706-4-mcroce@linux.microsoft.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210311194256.53706-1-mcroce@linux.microsoft.com> References: <20210311194256.53706-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.29.2 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 0503c917d773..d7183fae00aa 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() */ @@ -3081,12 +3089,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); } /** @@ -3098,7 +3114,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); } /** @@ -4697,5 +4713,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..88a8e1a09b7c 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, 0); +} +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 Thu Mar 11 19:42:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 397566 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp600361jai; Thu, 11 Mar 2021 11:45:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzUD4A148GXx7HcKFoKjB5QlxdE2XoiSiLApcRZngndAM8k8kMzd9ke9+VYCI5sjTcWVPhV X-Received: by 2002:aa7:db4f:: with SMTP id n15mr10153057edt.12.1615491957009; Thu, 11 Mar 2021 11:45:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615491957; cv=none; d=google.com; s=arc-20160816; b=atNeXbjYMzCEvg6EvqRGGDAQ8GE6zpAZEbkfwTxqDrCZmKbV8oUmtUHwEq6sewIx3M z73M4Mqn1+YpkGGx3OB6YigliromCrQCSI0/dRk45xPmN2VSSamt3qhi2fCKoPwAYA9o /bQwgZCtX9XOPomQMAmyGcWynzOa0Qi0mfKwtzNOHhunyG/Ae0SJpSNDZkNuWjyrjf8w 0J0G2ExOvf4EvMMq1RPcuylEex+LUjy/pxYdILgJQ4H5jh3Or9zoXFMSx0dxjj6XLHN1 I1lnQ9eBr1H4beJkK7PYTXLINtK+AenJ5/rMXelGlvp/zO3yzlf+t70+WiNixM5v7t2S kfiA== 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=oMFS85E++MtJu6DPvW2faFFNVv0MWXjZS7ayxkiJF4k=; b=c/1UaL4LwYTayGSK50mUXqh24CbRi3kxQYSsp+BVjJtHY8xzjwIzfFJags8hsRqHxN pvfLyxep9vPgHksJ2tIs3zl1hbbQt6hmyISsw14CJZoAO3Uh6uXqOfrmBzNMiGuS4u1n PfSvrblRIYFe7FvVHpw2V+FL+rT+Rd0ELN1YnPkqWuiJsebpz0I6S0s2NOk0GDLYbY/g i+dbYOnNgKnpwLREWmPjdWHWDpRysUV4vk/wrgfvH0Vuzcr37jDo0iERe3Vmv6vJ8anz Tdqvf5JjIdN5RjwbGUIXDDSwiygmBGoWW86Zrjkuczr+pzpKxOls1+DPEYXjQSYmYpHU t3Qw== 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 i15si2271467edl.581.2021.03.11.11.45.56; Thu, 11 Mar 2021 11:45:57 -0800 (PST) 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 S230429AbhCKTp0 (ORCPT + 8 others); Thu, 11 Mar 2021 14:45:26 -0500 Received: from mail-ej1-f48.google.com ([209.85.218.48]:34560 "EHLO mail-ej1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230142AbhCKTpE (ORCPT ); Thu, 11 Mar 2021 14:45:04 -0500 Received: by mail-ej1-f48.google.com with SMTP id hs11so48729890ejc.1; Thu, 11 Mar 2021 11:45:03 -0800 (PST) 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=oMFS85E++MtJu6DPvW2faFFNVv0MWXjZS7ayxkiJF4k=; b=TXg8gvWOTvr4xHzVUJey7ngFehYDdDZvCOCQasoyIsigVlRtTlAVoU2euoIZc0j7Vu 4D/CPYIvJuw+MzjJ6AkESjGfZyMhH6gYi+AXyGMKsl0yZYQXQr0gO7NZkDM7EeAqFAJ+ WGJ+6liCqKJjsPYLXTemFdPJF12BxOII3UOf0uIGyg+zVRmL/MdEUXR2j4kb1vQf01RO yPeNr8zUj7Wvxt7SRp0Mg6AQ5XjmKI6ZsNChzltXwfVF7UFE369vfbOfCV5TcZFyWK3D o6D3qgaDqIbGYszHxqXDGq4kFkUSjFYlbUUWbGIfxOVxzntrEg+YgPzqDeGiLidkt/pK kP3A== X-Gm-Message-State: AOAM530q1LS93ypudaYSjdWegc3G0lbAQSU24/J84tNwLrmsHKUlVp7E sXDD6h7R4RfphpH9k7ORxf+IkxKDjxg= X-Received: by 2002:a17:906:d797:: with SMTP id pj23mr4725222ejb.367.1615491903026; Thu, 11 Mar 2021 11:45:03 -0800 (PST) Received: from msft-t490s.teknoraver.net (net-188-216-41-250.cust.vodafonedsl.it. [188.216.41.250]) by smtp.gmail.com with ESMTPSA id t16sm1875652edi.60.2021.03.11.11.45.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:45:02 -0800 (PST) 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 Subject: [RFC net-next 4/6] net: change users of __skb_frag_unref() and add an extra argument Date: Thu, 11 Mar 2021 20:42:54 +0100 Message-Id: <20210311194256.53706-5-mcroce@linux.microsoft.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210311194256.53706-1-mcroce@linux.microsoft.com> References: <20210311194256.53706-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.29.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 dbec8e187a68..5dc4aee56fa1 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 Thu Mar 11 19:42:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 398167 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 EA502C433E9 for ; Thu, 11 Mar 2021 19:45:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F13864F8B for ; Thu, 11 Mar 2021 19:45:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230454AbhCKTp1 (ORCPT ); Thu, 11 Mar 2021 14:45:27 -0500 Received: from mail-ej1-f49.google.com ([209.85.218.49]:44647 "EHLO mail-ej1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230408AbhCKTpT (ORCPT ); Thu, 11 Mar 2021 14:45:19 -0500 Received: by mail-ej1-f49.google.com with SMTP id ox4so33092145ejb.11; Thu, 11 Mar 2021 11:45:18 -0800 (PST) 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=PMIMYcrbHu95+Z5QYKuH8PdFbTbIU3hECwcgYx+rkRc=; b=qGQtdgfUXfvBOBPSLmaOCi1dSk9+wJ/g5OBN6Td+vRtbOFWa7m1cWq78vAsOoSfhrQ oBOXu+m50TEpwMCtky2wak/OeFW2y+K2BptkKwjhOzB4IeieITIEdWpe4VNHcmNPsU2O HhQUFGAs01w32C/E3wXlP1YMwCt4H/wwt3p3ez9Svhj5lYsigkD76GlnfH1XJcTRMZjU XmZ4XGcHgvuWkkqJK3P42DO7Q5Om18inMAcJbXOsFFOTPtsFKeN09qgt45i1UUiIeB4h F4AfzFsSmTTQnf9sSLmC7u/bAqAXdf8NPzZe2p8I+owkMlV0mAVFtomt6Zdwp0cGeYG6 zfCg== X-Gm-Message-State: AOAM531oYAy38t+mvO1wGfZTHuP7B5ntrB+TgqGbdmLzeoZcKSSeCT2q rbVQy74/POHhNZH6JDliyQkrq4g/IKg= X-Google-Smtp-Source: ABdhPJzvWv/yOEXPHkrJeMTWiiMzh5T6YRcekoJODR3IqQF0imt6oNulnHANkRYGrQVPP6dBtd5QPA== X-Received: by 2002:a17:906:2344:: with SMTP id m4mr4595885eja.327.1615491918324; Thu, 11 Mar 2021 11:45:18 -0800 (PST) Received: from msft-t490s.teknoraver.net (net-188-216-41-250.cust.vodafonedsl.it. [188.216.41.250]) by smtp.gmail.com with ESMTPSA id t16sm1875652edi.60.2021.03.11.11.45.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:45:17 -0800 (PST) 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 Subject: [RFC net-next 5/6] mvpp2: recycle buffers Date: Thu, 11 Mar 2021 20:42:55 +0100 Message-Id: <20210311194256.53706-6-mcroce@linux.microsoft.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210311194256.53706-1-mcroce@linux.microsoft.com> References: <20210311194256.53706-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 Thu Mar 11 19:42: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: 398166 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 CE55FC433E0 for ; Thu, 11 Mar 2021 19:46:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8AFA764F7D for ; Thu, 11 Mar 2021 19:46:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230489AbhCKTqA (ORCPT ); Thu, 11 Mar 2021 14:46:00 -0500 Received: from mail-ej1-f44.google.com ([209.85.218.44]:36542 "EHLO mail-ej1-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230414AbhCKTp0 (ORCPT ); Thu, 11 Mar 2021 14:45:26 -0500 Received: by mail-ej1-f44.google.com with SMTP id e19so48788116ejt.3; Thu, 11 Mar 2021 11:45:25 -0800 (PST) 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=OeCiiJBsFe7jdSlbBr+NErlckMGg0noG5UTFudr/xQg=; b=nlmh4IuPsrC9/yRJValBnwzz5QgO4TLUJoMExnBSDOLu+u3drUg+GRFaqvyOZuo2iw 5+SENAX9Gt7rdBzq6w/lrICkr12FDxdnbj8UAvnsMRsRTlsojP6cWa6vl3XXrBh0HFf0 9MtwzzO/GZin40gE2PzSqzDaNbkPR2OY6lN2E3e+v8Ul5d5FC82m6obX5KoS/6woH18e ACqE6xCiB3srPfRtxvYbDlZ3IPMid8b+DDobBJ9sSLTaAPeQx871KuywJ6Rl3xv1oYTe EgNJSaZUo2YyiKg7jkGs4WXiaKbIOaOnc9Nd5u9SvkE9F6CAx7bsPBJua7mR2P3YUZNc sRCQ== X-Gm-Message-State: AOAM533HqUQKerSl/KiSI1K2+khha45RFdgTBKcYAZIlybOa8E3Ebgov PBoYdX5ngqAexxyge1ubpfMjg2+g9OU= X-Google-Smtp-Source: ABdhPJyv/nXJ6jqUnFK1YSLBHWALjvbKGaD2EgXaa8fpdAV1hkKMgtKDwfZNovwsvwlzZg4ZkLiZfA== X-Received: by 2002:a17:906:1386:: with SMTP id f6mr4626744ejc.45.1615491924807; Thu, 11 Mar 2021 11:45:24 -0800 (PST) Received: from msft-t490s.teknoraver.net (net-188-216-41-250.cust.vodafonedsl.it. [188.216.41.250]) by smtp.gmail.com with ESMTPSA id t16sm1875652edi.60.2021.03.11.11.45.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:45:24 -0800 (PST) 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 Subject: [RFC net-next 6/6] mvneta: recycle buffers Date: Thu, 11 Mar 2021 20:42:56 +0100 Message-Id: <20210311194256.53706-7-mcroce@linux.microsoft.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210311194256.53706-1-mcroce@linux.microsoft.com> References: <20210311194256.53706-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;