From patchwork Thu Nov 30 11:56:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liang Chen X-Patchwork-Id: 13474282 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5C4AC4167B for ; Thu, 30 Nov 2023 11:59:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5235D6B0451; Thu, 30 Nov 2023 06:59:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4D3CE6B0452; Thu, 30 Nov 2023 06:59:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 375286B0455; Thu, 30 Nov 2023 06:59:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 24ACB6B0451 for ; Thu, 30 Nov 2023 06:59:22 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id EDDF1801A2 for ; Thu, 30 Nov 2023 11:59:21 +0000 (UTC) X-FDA: 81514475322.27.4496459 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf09.hostedemail.com (Postfix) with ESMTP id 1F86714001B for ; Thu, 30 Nov 2023 11:59:19 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=VD1+WxfL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of liangchen.linux@gmail.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=liangchen.linux@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701345560; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZZWS54X8mcgcqAw+X+OUycTX99DXvCwUKOjkw8ctdBo=; b=OlLVIyL8pMBoCs8uhrSDPLh8pFYnTLY1G0UToL7FghdI70UE03uXWmu8cWgNZN7jz4DlPc Z+i3mDSuxJM9q18udNg+5H6ObvMWMEBsQBJ6Qg9/dFpkv808O5LqA0g4oElqeYlPg5wUlC b9/j4FYkomIY4vbf8wYY/57urZZdZrU= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=VD1+WxfL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of liangchen.linux@gmail.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=liangchen.linux@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701345560; a=rsa-sha256; cv=none; b=z1ooRg3RC2yHoXMQ7tuQebdGzBr0/WT7zbr4ySSNL6QDQWeJMxWxaEGI4soseITIj8Oq4X 6h7c+KWzslmDAKEOYy0naa3KjSWzvqEQX5ruNmeL4dDS74e2xHQQdJwc5r4euxg9wJFDzB EsYIpftf+H7xBIPsbtJscmAJcWRDk9o= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1cfc2d03b3aso7418155ad.1 for ; Thu, 30 Nov 2023 03:59:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701345559; x=1701950359; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZZWS54X8mcgcqAw+X+OUycTX99DXvCwUKOjkw8ctdBo=; b=VD1+WxfLGWClcijiMf+umzKQW7pUZksFYnUbZW+jzsiVkUs1E9kLDz9kDF6oMGOE/c tq/bCMllxMr6NecjftZGCtKVAokuC1hWQPxQjnQl0/ioTyK8ewjb0B+ErWHgorTEAY6j xGa5ia5Nm0LU4lMRrkT3IMmpy2ids/GezOdhyGlKtIK9wIFsW1KV4ZANWbBkFZQ858Ol qND8We8x8yBKHiepJV8bXveFP8PwKVos+ZRoVLhT2N2B771n9Kl5Dzc8XL5+SW0GLp3L 8qQTDWSRHpv+WrkDupx+fFZgFWsKdx5Y88A+/q5doVLB/CuscbTI/FlSCLexKH40fdif ptyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701345559; x=1701950359; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZZWS54X8mcgcqAw+X+OUycTX99DXvCwUKOjkw8ctdBo=; b=l9mCf57O8drizzmyfGpwTGffT67Jf7pSe1E7WtNcwpvHmQoCtRIqi37ePQH69uIA5q zlnHM+RmA2COV9hJ6Zv2+Vi18G+Xpcp/bO069olDM8s91NsevLiVv5mmEMucqvjJ5QXw MnircmmcaqBKwLR76uybEZK3A6BPoua8s25xwhX9vqUaK74bOp+S2u5gmlcBtzT0jqhT 0FYJoEhB1aBLFS5dvqlsnEOjejvJGZdJI0t84dNoL1xyVPjvgKNKIlrKlJLSfD0CoOux Yk1tvu4Wtr26cQKyn0p7VdH3FEmtcm7I0H4lRuyGIVYHSsgz2SMpP26/ma7ZZqsgJxkY xdGg== X-Gm-Message-State: AOJu0YzMw3Q64cuSNtrw4v5Qlj7rWAMjZDf2WuA8FzBiAFwjC1xITWGr cX9u83MubJz9TetfEv3jL9Q= X-Google-Smtp-Source: AGHT+IEFg+yFUSmUMm6bGeknZuLySmqx8cl4tbjihUx75Zipzvla7rdzPbuDWyb+GpBEGmnp3RJAlw== X-Received: by 2002:a17:903:11c8:b0:1cf:5760:43f9 with SMTP id q8-20020a17090311c800b001cf576043f9mr23756691plh.64.1701345559051; Thu, 30 Nov 2023 03:59:19 -0800 (PST) Received: from localhost.localdomain ([89.187.161.180]) by smtp.gmail.com with ESMTPSA id e10-20020a170902b78a00b001cfa718039bsm472530pls.216.2023.11.30.03.59.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 03:59:18 -0800 (PST) From: Liang Chen To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, hawk@kernel.org, ilias.apalodimas@linaro.org, linyunsheng@huawei.com Cc: netdev@vger.kernel.org, linux-mm@kvack.org, jasowang@redhat.com, liangchen.linux@gmail.com Subject: [PATCH net-next v6 1/4] page_pool: Rename pp_frag_count to pp_ref_count Date: Thu, 30 Nov 2023 19:56:08 +0800 Message-Id: <20231130115611.6632-2-liangchen.linux@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231130115611.6632-1-liangchen.linux@gmail.com> References: <20231130115611.6632-1-liangchen.linux@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: pfu7pgcwbqryj7e99e9k6sm1qf6cx6is X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 1F86714001B X-HE-Tag: 1701345559-576977 X-HE-Meta: U2FsdGVkX19oNlTTsY0TlzlxeSzuxlV954leo+V5VrSRMIxQiTmHnPwfrl8dCZDV9WhMU3cI82e4vxLX7ElEE2cL2g9is67iMs2e2l/8p0FU0w+4ensWYK6iKMBdNJeB3nMLVaBdcmCb2J8ocHZ3ScqhWK6yBPR7yVClD7LPJnUn6HLwbJfugarn2fzw0ZX+pgNI/tB1e3vSoLFMV7Kfru5W9wSMmrr8o/XvyitPxU94yQXzOZJhtkfEtnLm2tnRJtgRXpHLUTw76yfmcWHzaqMioJDdS/84LFVhsEsnsNN+4EewwwqcxI8uHZfMvSuDLqFaT3j6m7Om2Ufu8Wun4IiIrh1oWVyHULkl7EmsoY9QDrzWYY44yupnVwfRy16oVnRuuu/QKYNcb3XVWQXVyCjkBxb+rZhTugmMiXmmvSYlaNIK6sQsFnf2Gmi1ej735T6H7LEUZjXikqUCsUWBZzzRA6LJZw07Lz8y35tKvzzlrp0kiPsuai0xh1mb/AHySnqobuPrGTioDGgZmGS+Qqi9aOk0pL8jt1CLsol8TSs9PihKIJHR3leWrbC3Bd+TRO7kiBXL7zG88jDyw/nxziYn0n1DFi2bqAy0Y3zbwM2arpP4mn/YKCxDuLUa9WEBMdhbxIZyHsy6rRIXTqNZKIrsH4UdSDKfeeqgmO22or28L8WWJcOR5tYS5/hjht77ZqqI7aukh313OAVa6c03ar2xJxWUXfUcczJDqiKtm+rhiBTfeNc0bOjBntE5WJD8SpXn8l2ecvWMh6fXFMubh8+LZ7cZG0bQkJ47DGa8+KM/8bQTABiRkqPpsY6XLtufGDe+Qwead05woD4VZNAovaW3BU7ht7BCoojQTOmkH3c6YTaLOxFt7tBZEichyjBQwXet6+fxARY+Hr15RRKmquKh5KaL6/fy3c842blQtv06l3TLEtEyNkFv5sXKzQQFFykvy1rqig3/yo56SZi A5XdHHQr XJBkRpliTVVc5qvn5YESF9v+o8sfaHW3j9IJamg93l2zF0Ic8XQ1nWnrj1XkLQ1cQOXy07kxloz3pecUwUz1/0YDvaOt8l4mHsf8t/TYdO9mEc+Jp8JmTmIPNguIXGaSZj2fd44I3jLgaoRp21zCQuXBr4oreyhZ5QPuaxK+p4IFxqmVHsKyrZKqa3aigMiS1IjtoiBnv2K2hIXROY3m7RYRDZYoTkkTmCnNoFX0WBMA7GLEcrf2BXl8xlG5lSwPSsJ0XcGmDbMo3+APUVQILX3TnRCJuC5xuLtKgtsQamUOaPD7I1VhKKLvDAfOvoj69zyRK4lefVQAOmOVmqxoxkww2gdtLn8lyyKxqnHLL27ODBEwCPGRIcdFQsE6Vc1svbyQHCtz0NvurE4WwCgpQl2bWikqzz/VISb0B0X8okUDAIjc2ay0nREMg5pibJ8hr/eKSoGCFhc9OSUu6tVPUvEinSq3LAomPQ9xOkI3+kaWUKEtyvOvnoaA2Nwxol78nMYUtFn4MCdm5Qfe9w64JdMPd3aMVhUzaQwvHAYOBFpT95VB5UJMVa+jevRPHJHwiu9R527J+Ul1wZ/rATRmCXOHbe6QURgdg5dGzE82RtT3R/q9oSX+Exp//rFWDJgE9quNT2mfB3FZyAyMqIkSg9O5vUafqUTYHw4fC/RJAjsdNLtY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: To support multiple users referencing the same fragment, pp_frag_count is renamed to pp_ref_count to better reflect its actual meaning based on the suggestion from [1]. [1] http://lore.kernel.org/netdev/f71d9448-70c8-8793-dc9a-0eb48a570300@huawei.com Signed-off-by: Liang Chen Reviewed-by: Yunsheng Lin --- .../net/ethernet/mellanox/mlx5/core/en_rx.c | 4 +- include/linux/mm_types.h | 2 +- include/net/page_pool/helpers.h | 45 ++++++++++--------- include/net/page_pool/types.h | 6 +-- net/core/page_pool.c | 12 ++--- 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c index 8d9743a5e42c..98d33ac7ec64 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c @@ -298,8 +298,8 @@ static void mlx5e_page_release_fragmented(struct mlx5e_rq *rq, u16 drain_count = MLX5E_PAGECNT_BIAS_MAX - frag_page->frags; struct page *page = frag_page->page; - if (page_pool_defrag_page(page, drain_count) == 0) - page_pool_put_defragged_page(rq->page_pool, page, -1, true); + if (page_pool_unref_page(page, drain_count) == 0) + page_pool_put_unrefed_page(rq->page_pool, page, -1, true); } static inline int mlx5e_get_rx_frag(struct mlx5e_rq *rq, diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 957ce38768b2..64e4572ef06d 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -125,7 +125,7 @@ struct page { struct page_pool *pp; unsigned long _pp_mapping_pad; unsigned long dma_addr; - atomic_long_t pp_frag_count; + atomic_long_t pp_ref_count; }; struct { /* Tail pages of compound page */ unsigned long compound_head; /* Bit zero is set */ diff --git a/include/net/page_pool/helpers.h b/include/net/page_pool/helpers.h index 4ebd544ae977..9dc8eaf8a959 100644 --- a/include/net/page_pool/helpers.h +++ b/include/net/page_pool/helpers.h @@ -29,7 +29,7 @@ * page allocated from page pool. Page splitting enables memory saving and thus * avoids TLB/cache miss for data access, but there also is some cost to * implement page splitting, mainly some cache line dirtying/bouncing for - * 'struct page' and atomic operation for page->pp_frag_count. + * 'struct page' and atomic operation for page->pp_ref_count. * * The API keeps track of in-flight pages, in order to let API users know when * it is safe to free a page_pool object, the API users must call @@ -214,69 +214,74 @@ inline enum dma_data_direction page_pool_get_dma_dir(struct page_pool *pool) return pool->p.dma_dir; } -/* pp_frag_count represents the number of writers who can update the page +/* pp_ref_count represents the number of writers who can update the page * either by updating skb->data or via DMA mappings for the device. * We can't rely on the page refcnt for that as we don't know who might be * holding page references and we can't reliably destroy or sync DMA mappings * of the fragments. * - * When pp_frag_count reaches 0 we can either recycle the page if the page + * pp_ref_count initially corresponds to the number of fragments. However, + * when multiple users start to reference a single fragment, for example in + * skb_try_coalesce, the pp_ref_count will become greater than the number of + * fragments. + * + * When pp_ref_count reaches 0 we can either recycle the page if the page * refcnt is 1 or return it back to the memory allocator and destroy any * mappings we have. */ static inline void page_pool_fragment_page(struct page *page, long nr) { - atomic_long_set(&page->pp_frag_count, nr); + atomic_long_set(&page->pp_ref_count, nr); } -static inline long page_pool_defrag_page(struct page *page, long nr) +static inline long page_pool_unref_page(struct page *page, long nr) { long ret; - /* If nr == pp_frag_count then we have cleared all remaining + /* If nr == pp_ref_count then we have cleared all remaining * references to the page: * 1. 'n == 1': no need to actually overwrite it. * 2. 'n != 1': overwrite it with one, which is the rare case - * for pp_frag_count draining. + * for pp_ref_count draining. * * The main advantage to doing this is that not only we avoid a atomic * update, as an atomic_read is generally a much cheaper operation than * an atomic update, especially when dealing with a page that may be - * partitioned into only 2 or 3 pieces; but also unify the pp_frag_count + * referenced by only 2 or 3 users; but also unify the pp_ref_count * handling by ensuring all pages have partitioned into only 1 piece * initially, and only overwrite it when the page is partitioned into * more than one piece. */ - if (atomic_long_read(&page->pp_frag_count) == nr) { + if (atomic_long_read(&page->pp_ref_count) == nr) { /* As we have ensured nr is always one for constant case using * the BUILD_BUG_ON(), only need to handle the non-constant case - * here for pp_frag_count draining, which is a rare case. + * here for pp_ref_count draining, which is a rare case. */ BUILD_BUG_ON(__builtin_constant_p(nr) && nr != 1); if (!__builtin_constant_p(nr)) - atomic_long_set(&page->pp_frag_count, 1); + atomic_long_set(&page->pp_ref_count, 1); return 0; } - ret = atomic_long_sub_return(nr, &page->pp_frag_count); + ret = atomic_long_sub_return(nr, &page->pp_ref_count); WARN_ON(ret < 0); - /* We are the last user here too, reset pp_frag_count back to 1 to + /* We are the last user here too, reset pp_ref_count back to 1 to * ensure all pages have been partitioned into 1 piece initially, * this should be the rare case when the last two fragment users call - * page_pool_defrag_page() currently. + * page_pool_unref_page() currently. */ if (unlikely(!ret)) - atomic_long_set(&page->pp_frag_count, 1); + atomic_long_set(&page->pp_ref_count, 1); return ret; } -static inline bool page_pool_is_last_frag(struct page *page) +static inline bool page_pool_is_last_ref(struct page *page) { - /* If page_pool_defrag_page() returns 0, we were the last user */ - return page_pool_defrag_page(page, 1) == 0; + /* If page_pool_unref_page() returns 0, we were the last user */ + return page_pool_unref_page(page, 1) == 0; } /** @@ -301,10 +306,10 @@ static inline void page_pool_put_page(struct page_pool *pool, * allow registering MEM_TYPE_PAGE_POOL, but shield linker. */ #ifdef CONFIG_PAGE_POOL - if (!page_pool_is_last_frag(page)) + if (!page_pool_is_last_ref(page)) return; - page_pool_put_defragged_page(pool, page, dma_sync_size, allow_direct); + page_pool_put_unrefed_page(pool, page, dma_sync_size, allow_direct); #endif } diff --git a/include/net/page_pool/types.h b/include/net/page_pool/types.h index e1bb92c192de..6a5323619f6e 100644 --- a/include/net/page_pool/types.h +++ b/include/net/page_pool/types.h @@ -224,9 +224,9 @@ static inline void page_pool_put_page_bulk(struct page_pool *pool, void **data, } #endif -void page_pool_put_defragged_page(struct page_pool *pool, struct page *page, - unsigned int dma_sync_size, - bool allow_direct); +void page_pool_put_unrefed_page(struct page_pool *pool, struct page *page, + unsigned int dma_sync_size, + bool allow_direct); static inline bool is_page_pool_compiled_in(void) { diff --git a/net/core/page_pool.c b/net/core/page_pool.c index df2a06d7da52..106220b1f89c 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -650,8 +650,8 @@ __page_pool_put_page(struct page_pool *pool, struct page *page, return NULL; } -void page_pool_put_defragged_page(struct page_pool *pool, struct page *page, - unsigned int dma_sync_size, bool allow_direct) +void page_pool_put_unrefed_page(struct page_pool *pool, struct page *page, + unsigned int dma_sync_size, bool allow_direct) { page = __page_pool_put_page(pool, page, dma_sync_size, allow_direct); if (page && !page_pool_recycle_in_ring(pool, page)) { @@ -660,7 +660,7 @@ void page_pool_put_defragged_page(struct page_pool *pool, struct page *page, page_pool_return_page(pool, page); } } -EXPORT_SYMBOL(page_pool_put_defragged_page); +EXPORT_SYMBOL(page_pool_put_unrefed_page); /** * page_pool_put_page_bulk() - release references on multiple pages @@ -687,7 +687,7 @@ void page_pool_put_page_bulk(struct page_pool *pool, void **data, struct page *page = virt_to_head_page(data[i]); /* It is not the last user for the page frag case */ - if (!page_pool_is_last_frag(page)) + if (!page_pool_is_last_ref(page)) continue; page = __page_pool_put_page(pool, page, -1, false); @@ -729,7 +729,7 @@ static struct page *page_pool_drain_frag(struct page_pool *pool, long drain_count = BIAS_MAX - pool->frag_users; /* Some user is still using the page frag */ - if (likely(page_pool_defrag_page(page, drain_count))) + if (likely(page_pool_unref_page(page, drain_count))) return NULL; if (page_ref_count(page) == 1 && !page_is_pfmemalloc(page)) { @@ -750,7 +750,7 @@ static void page_pool_free_frag(struct page_pool *pool) pool->frag_page = NULL; - if (!page || page_pool_defrag_page(page, drain_count)) + if (!page || page_pool_unref_page(page, drain_count)) return; page_pool_return_page(pool, page); From patchwork Thu Nov 30 11:56:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liang Chen X-Patchwork-Id: 13474283 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C379C4167B for ; Thu, 30 Nov 2023 11:59:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EC1BA8D0048; Thu, 30 Nov 2023 06:59:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E70938D0001; Thu, 30 Nov 2023 06:59:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D11D68D0048; Thu, 30 Nov 2023 06:59:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id BF3038D0001 for ; Thu, 30 Nov 2023 06:59:27 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A4B751A018A for ; Thu, 30 Nov 2023 11:59:27 +0000 (UTC) X-FDA: 81514475574.05.FE08951 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf09.hostedemail.com (Postfix) with ESMTP id DD40B14001B for ; Thu, 30 Nov 2023 11:59:25 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=VoTVwnDz; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of liangchen.linux@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=liangchen.linux@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701345565; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=J730iItaW8fpD9bcYiCc3WSDtwgBtsyA2Jb0R83edv4=; b=xBfOAK8xBPogBWWCBSfv5t/l53u3kOQ4D+erNrmdKrg1vV4tYeN34et1Wsr2bcjMhJhkyU xne9gd6e7HqbGBr7LSiErrI4uhOfWSaPYGsJxOAV4kL1K+ULNGgCIWxl/Gx7hfvMjCD7lL UMQQa6IckxrgULM50c5FC6h7DGdVGG8= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=VoTVwnDz; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of liangchen.linux@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=liangchen.linux@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701345565; a=rsa-sha256; cv=none; b=QGp8Apcj9q3WL5r4ezTQ20vqIixeVFkO6a4j/OPT4IbzR2luE4pneKQi/rTiwNiphOuHhv z8hSURO3hClB3YryjiIJbukAjyfSTNW/G8v/8eDDwbQzUHIWaYf+LLXwiSSSZX1mO5umzB r1I1LrcC7149kGDFnyMr8rjudIvX9Q0= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1d03bcf27e9so2532105ad.0 for ; Thu, 30 Nov 2023 03:59:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701345565; x=1701950365; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J730iItaW8fpD9bcYiCc3WSDtwgBtsyA2Jb0R83edv4=; b=VoTVwnDzVj4eARkIGrcnujAs2+yVDUugxtAxoKgPIhlOLFTzhGvmRIZiIPGYe6s6/u geZwQgDfhG7dFhN+154FoJaVYsAyTBUhteuT4SYaHhkriB0WHuRQ0lNsvzn4IHwMgTrh eo5JEMspZmo4lycC6qpxRUwoLdsH3uoSUV6hI2Ii9aMemAduXdsM1+bkK6zSrT8rz+VF NaiY3izzsZRwNWm8PpOt9iwTlUffOZGsvlzMDRWxtgRoH2qoM7pUTYTOWB+rPoY1RgOB QZsR10/dkdTveSo8VA3PiBATLcKIVJO0OEz8+tGSJONT9JkVk0LdqqSTSFK+oQjTKERl pl0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701345565; x=1701950365; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J730iItaW8fpD9bcYiCc3WSDtwgBtsyA2Jb0R83edv4=; b=I4pQhmA5VXV7/7r0DICCPoAYWi8/wX8r9w7bysr3dbX7YZcG1KEkOFlvFFkSopFE1e +14xqVLYtcCb7kmSv2QV/9Xcv3+wQ2xiGkQ5lAAsYoM41+XoviGI2sXJNprf1/UbC5WA QJxDqLfsUnQCgGSn2dIZ7WjnswqtfmsCy1kd0L8C0pH8dw0vVZzOyg6ceapYZFfs0f5L N93VnNTKb1ObleoSaceAfAhhx2IOc4l7v82/ME7bz9gQmqG0/d+yTxjxiTYzLjzLJ9tJ I2ADpeUOWq5Y2mz6MiMMsYi9wQIUJWWOcFNdbONYszyS4bpv9OdVvxi1lZKSH9dj8MxS AJ/g== X-Gm-Message-State: AOJu0Yz+eN1euig3ZrzVUJ5n3i8KUtpJiOJEWOq0mFD7dEEMNzEyH7QW xElYvOeEZHXWTO2vIh01SOQ= X-Google-Smtp-Source: AGHT+IGY3HYZroqUW39ELjMIRzpuePdhXYHqeCf/80vvVvHgcH2WhD/f+1CJF7r0FJpL6g4XS6meBg== X-Received: by 2002:a17:902:d508:b0:1cf:f28f:2d99 with SMTP id b8-20020a170902d50800b001cff28f2d99mr10704606plg.19.1701345564706; Thu, 30 Nov 2023 03:59:24 -0800 (PST) Received: from localhost.localdomain ([89.187.161.180]) by smtp.gmail.com with ESMTPSA id e10-20020a170902b78a00b001cfa718039bsm472530pls.216.2023.11.30.03.59.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 03:59:23 -0800 (PST) From: Liang Chen To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, hawk@kernel.org, ilias.apalodimas@linaro.org, linyunsheng@huawei.com Cc: netdev@vger.kernel.org, linux-mm@kvack.org, jasowang@redhat.com, liangchen.linux@gmail.com Subject: [PATCH net-next v6 2/4] page_pool: halve BIAS_MAX for multiple user references of a fragment Date: Thu, 30 Nov 2023 19:56:09 +0800 Message-Id: <20231130115611.6632-3-liangchen.linux@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231130115611.6632-1-liangchen.linux@gmail.com> References: <20231130115611.6632-1-liangchen.linux@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: m4gyuau399t1tb7r93hfwx3qcy6shknr X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: DD40B14001B X-HE-Tag: 1701345565-623260 X-HE-Meta: U2FsdGVkX19cjlhAQ1/nuBqIb0+a7wEEIxeDCEyriST2xnK12hN5aibkStnfp2v8aG2+wU9Jk1FJ7gFmWwgNSth01rjpKW+8GJkE06kAoLTAxeu+TzXfQv/daD1bZlrpR7Krp32z+/IUhgb9vE5wN5TFZVuWgNZXbFXbqqe3j0oWknZV5Ifw10GlwOLjageraATrZqgoYlc/Amx+W7VQ6C7d9ADXLGi52wrObloomda1cwmTfo8ccnQcxE50ZnRC8ntMfkDV9XQIsCa1iv05cFva6zb5SvAIv/lDp8GoJS9X1JCVsJrQ8dnjXz6l5HpXZoryRh/if3UfnX2AlwfKjEb1GRteqOL9SiWbJ3GM/Pr+EaVs0s9SdEBLGD3VomtIc9qlsc9+J1+97e76yaN3Kr/6IPS5qGzhhHcHtTFpwW7wzZl2Fi/XVucaR6zoAiIFkBwKP89XngulFpE9eDvlCUbPWIkbLUO24mDbLk8OcxS+quTplzgb4rNNXHWl3ilVEiIQrV83Ix16TzCcVmHtQodnPIKwKBnbk4XmRw1lXtNKI+/H7UTEs6O/mU21TXfjAayRkojlaiVObhf94kuCycKeXe7Q+h2gB4PISDkqjOkoO/u1KuNO3A3TjmWpvR5KmVfYX1rEI6tegOh/n+LkFFaaHSLbX65ZDX2F91xRz+lDzP1za9FbyKut8lR4v2WgeTi+lKzcyEvSpW8U0e0G5nde6DLtM0gunDDmByeJ/x0Smq1QgwObQEywt6mHwoUv3Hn9ROxtK/XDz4UEBwVt6W3FVFbI089eauluwQIqmmSYGG8R7tgT22rukh/7HpWVL1NMblu9/sFKFGrIuSswPiyu0dPvhVBmdODQ8CRiGWcp8A6JViGXA/L9ms4JBOKacBfW5BKl4t8rD7H2oghUJdIyCQGGSDQtpuSWT/ieBJQJcDsNbxWaQucGz2Iyi9xGiQjJ7nfThmsVuA9Q7yo O0AH/MZD y7nfIylru5ruZZUUOo0CBiJP1D5FFPfRe13taJbmEZJJ3Pzf9ryL9Wvc+KHpFfOdlQg2y+j1zYUYbsydHuI5gKdfyNmXNo9XfiYEIEpC+6QAoeQHwmHOt234ChaNqAo67pKsPbLQqqS6NW0NdoXeFsw+g7Ttdp/atgcRdl1THmqWJfcXK5/rRFWzNb5paUOnuOkfWFrU+CaVps+GuJ2XeppKJB6e97bPZBhaKd6gGSKCvmht3beyuW8ro1VyqpGDTiPcGy14Q1mrFQKLk0A+RgRb44xSet1aUEKrM1Au3B1zqjCjE12Gc6nnFM8OX2aQ68qkDRDf+lwef6tCNTcPYC84TzYN1/QuDD6tQ6gPQXM8hNeZsjZA8OiWwgwqFfUyl8ZR1BI5JtUd4HQM46NMLGUJtpbj/ICqAqU1nIZCNl1hFgNOTUdcNqpLEC3cf5W8Rgeoais2CiqhjpnciWmNdUaffMVRR20VO2klp0ED1+4PFOXuch+Ud3sJNJfF1WzhsuIF/tB4y7WajJ5/0NKQbFK/IVpuRXFoPLyJKASgyHRIzbvblqj5xa2JlUxsLM3XW9G3DUyW8dPywAK+vQBgPYZN+9Fx6FJLUBHfpC7pCCsGUuUsgldzcdL/fGR6HplED/o2nFYxDj83mTuuwxXhmH2W2r5PJEOoqf0VhkV4efBOMFvM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.001497, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Referring to patch [1], in order to support multiple users referencing the same fragment and prevent overflow from pp_ref_count growing, the initial value of pp_ref_count is halved, leaving room for pp_ref_count to increment before the page is drained. [1] https://lore.kernel.org/all/20211009093724.10539-3-linyunsheng@huawei.com/ Signed-off-by: Liang Chen Reviewed-by: Yunsheng Lin --- net/core/page_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/page_pool.c b/net/core/page_pool.c index 106220b1f89c..436f7ffea7b4 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -26,7 +26,7 @@ #define DEFER_TIME (msecs_to_jiffies(1000)) #define DEFER_WARN_INTERVAL (60 * HZ) -#define BIAS_MAX LONG_MAX +#define BIAS_MAX (LONG_MAX >> 1) #ifdef CONFIG_PAGE_POOL_STATS /* alloc_stat_inc is intended to be used in softirq context */ From patchwork Thu Nov 30 11:56:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liang Chen X-Patchwork-Id: 13474284 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECB13C10DC1 for ; Thu, 30 Nov 2023 11:59:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 573D58D0049; Thu, 30 Nov 2023 06:59:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 521948D0001; Thu, 30 Nov 2023 06:59:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 39C618D0049; Thu, 30 Nov 2023 06:59:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 261B38D0001 for ; Thu, 30 Nov 2023 06:59:34 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F131CA01A6 for ; Thu, 30 Nov 2023 11:59:33 +0000 (UTC) X-FDA: 81514475826.15.5F292DF Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf20.hostedemail.com (Postfix) with ESMTP id 1687A1C002B for ; Thu, 30 Nov 2023 11:59:31 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NowaFRQ5; spf=pass (imf20.hostedemail.com: domain of liangchen.linux@gmail.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=liangchen.linux@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701345572; a=rsa-sha256; cv=none; b=bNI8sQoSZdzlGnqMKjLcGAr0XPPnSHUmtyvI5YMJm4nAOr740uHNc0jiyhtY2lduDtxsVW KnJkd/V2np6FNCUDI7t+5bRz2KkeS8T9gnyrm06In+KyHojK8dqtjcQYY83VlWTisHeZPA wnNdCM4ljxajh91YGEcZ5qwcdJhuGz8= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NowaFRQ5; spf=pass (imf20.hostedemail.com: domain of liangchen.linux@gmail.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=liangchen.linux@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701345572; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=JqbHmSBHyDiifA4Jyxx0ZxpzcDGefiCrTqwukJus35I=; b=WKRGcvuFlu3HfhpzcuvjhmeFPcMXt09K0g7YxiR8S5tLrqgw5SYfp55ubClvvF5FeYkwd+ gD58G4mbW0/Qki0j30zwLSQxkN2iT3WIca5k6AMWTDmwF+1KcZ6L8bUdYwDdGliMQQ0atV IUREX1FbTjomCcDALQLu71/dGCu2KQo= Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1cfae5ca719so7856385ad.0 for ; Thu, 30 Nov 2023 03:59:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701345571; x=1701950371; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JqbHmSBHyDiifA4Jyxx0ZxpzcDGefiCrTqwukJus35I=; b=NowaFRQ5Jnkrdgtoh/RFQjetWZ4jPcvur/dYs3Q3nNOtxbffsv2/gS33j2/OfRvTei w49NdFhqLvUlc2pxkObTGnc+iTfvpYifz5T9D5CgXlmDAFPjMGGFeeP8fHod3wXncpg+ 7nxpbBsoOBax+ObGXjeD2RbCdpczDQBggOOSIpvvC7B8VfcKFMRD2AulQJYRS4DmeS5/ QihmcNIVTVgXDtK6jk8dV6iTN/FBwSuTd15Ckewill73OUGIaFTmYkszKe6xKhtepXWO 1H26RJ46Fsg3kVPEBN42a4maUVDbgv306zRPAObEcNEkdvjgWSESVOGcSlwTmrGUYUC/ 8OvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701345571; x=1701950371; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JqbHmSBHyDiifA4Jyxx0ZxpzcDGefiCrTqwukJus35I=; b=ORRd4CesjojXsxFyEJGkHTwnmOV2Iwh25t1Usj/cDAO2oA6b0NeBwZl3CK8jTYc7B8 1yESUTUzXWBsrfEL2/7geUsitafIbsI7f2NW2JN2S6A2/XVWlh4TAGneP1UO2Gv2vV5F t1MUS7xMVanK4sCmeEKE3ynxUT/qCv7/zGRh0S7aAXRZN2cB0VfZGsAVvkyfSZ9ZIDBx Bdx522HnbL7OxHzDrZlIKYY4FqF0O+O0SqBvn7lvNFv2NQ5yqUa65XGwLcn8mlsbfElM 4CmWFxBRgoy4YKhBWbVqP0KRyjhSpYTzcrZtmEYMoxEbH3M90hqppvswA0aXiizHRQ3w 2SAw== X-Gm-Message-State: AOJu0YwjyLaJhmaJMKpVafm5/UANKFSkKK6tzXDitbj8XFne040U7hdG tQZRqEVJBm+k9fU/zT1AlCI= X-Google-Smtp-Source: AGHT+IFPxYDEWz5QUP9V1+q0/wuLjXnVe/hts5cDiBAGpcl9t4OB8fb9xkbu+wgamHO/QGFjCzea3Q== X-Received: by 2002:a17:902:fc4c:b0:1d0:22b9:d98c with SMTP id me12-20020a170902fc4c00b001d022b9d98cmr4175095plb.38.1701345570948; Thu, 30 Nov 2023 03:59:30 -0800 (PST) Received: from localhost.localdomain ([89.187.161.180]) by smtp.gmail.com with ESMTPSA id e10-20020a170902b78a00b001cfa718039bsm472530pls.216.2023.11.30.03.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 03:59:30 -0800 (PST) From: Liang Chen To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, hawk@kernel.org, ilias.apalodimas@linaro.org, linyunsheng@huawei.com Cc: netdev@vger.kernel.org, linux-mm@kvack.org, jasowang@redhat.com, liangchen.linux@gmail.com Subject: [PATCH net-next v6 3/4] skbuff: Add a function to check if a page belongs to page_pool Date: Thu, 30 Nov 2023 19:56:10 +0800 Message-Id: <20231130115611.6632-4-liangchen.linux@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231130115611.6632-1-liangchen.linux@gmail.com> References: <20231130115611.6632-1-liangchen.linux@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 1687A1C002B X-Stat-Signature: k3y4zh6ou5gt3exwj57osyq1st4x997x X-Rspam-User: X-HE-Tag: 1701345571-896504 X-HE-Meta: U2FsdGVkX19helgD4nZjMgw5M2ex30HiG+xYIyqDuf4xPLfQ2RBztu1as1FBi2zk8n9ywkGdSx0L2sqRZsPJ5f9v2w3nxzokIhW8+hTVtXZaj4fKFMWo50I798EDUtV22WYVwPFd7aDt1eOiE4w7e0sEwkSgNvETFK6GHtIq9hOea4cxyzPzgJ3JU9Hy51d3Wmpb+UO/vOH6RFP1jMDKmjRJoPpfXXb0T2MUYBZ8759LwMQ8FVq+i8pzgf/eZpOQlTiIH5DQMjcVOWpwecp8Ia4smMXsEH9yYxBIOUAA054ZqLyvD3g902gkAyIE2y5SqkjTxWZl2TZkQbH2o0L4zv1mJvGc/btgwml/1fn4/aEs1pESsskuND9kLE+ScaOw+6UPbh64EltKORVeOd2dFIJVknlz1TnH9FUZtS3u3KnVZ2VncOpdsIBs/qWJtB4Mssvc0na3C1c9LugeP8zcjTp+znRxaPBXqwXpvLprbpRPootWW+4egQq3qjjAk/3lGxPaEKQUOmuqK4fNqEHKjJHNW6uhJRg7UXtKx8Z4um9ActS6O7xWHJprpNH6psEQzRFVITNBCanJjCkyAC3QFHng443IwsK5v6ti6il95h8P/CUNMjSVf+XuUFjr41fPfUXVr1C+cXojdu+KhkE7HyyMJUN9/gn6pgB2PPmAWAt8dg/uHx+mObvLR2zjDl9qekLa6malrq5gh+kpg6cK+Omq03HYT3N+Zqz4nzoycBbS0UpZnzddQ2czxV/RsEp8+gGQlgxXubhMCb7Zb5wqRhlAacVOYzuH34hRnRkJQc4PSYkELTisbnFjc51a7IPoKRc65KdzdcvCdp3JK4LpFJlO3vAT1WX3tzubNyGDP98hW81Zb6CGyw5jvpRUcYztDXM4YZZk0IAT1S+E14mqcAY2IU91C5GpJ/g6ROt70/6DkAbSuxOkOldU3YHxjV1kN5ZzugQetBs2vcdlfBH S5/CkPWz E3lEgPZKZgRNDR9sjPvxWQEU6OhQ58n32lgCD1lT/fB+U+L8K4+kZQUZgkChA5hFnCpjrgKR9jS5e/tVNVGFHQwHuUhNaq+BBZ8sJPuOt9YHk0ZqmdnuvaVAbIdMezqxjucs+H4z60waJrdEs5qgkR4soNxuc/GBacAazZxoRRqrhrwfHuyEawBuxbDbvonXHpYs7ZmGKzDaOn54btABxhxHWsDUIbr9yBzofjnjZEpd9DL1nZPijci8t9MoyZ5J9eDCgbWo1YabKAtUUAeOFgS5eHtQzrmdzcmov5HBaVvsp6PpzCbAcLbobfHMuWwadNQ+awuXqEJa5Xl0YQtMssSA/3OwFEWdb9HiSPrI3rz8LNU+z7IfNMsVupn1f5wOZgLDv9PsJQedzllvWHzpntC8jkqnLr3ZmuK0yN6t/4IxRcAuSwh2YZIK30we02smyVAogYrUsehhwClK+3Dg25rFm/qFJ33EX9IMw8A7tzBddQbF60DH+YW5kt6Nnog+wdSqZjYcG1IX6o1/YuOIFScRc0RBUGUiee4d+et8p+lfCHjKxrxg53sl62/OfFBZtBORuq81qcShvimLp8TxCxQjxc1Iir455DzEJfJXTUeiYfPrw5rRWwf02PY9/o3HQOGmR2f9FJddh+mrnomwuMifapzk0o4CQ6Ubi2tCWlBCBWjICK8RKEE+3Tw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Wrap code for checking if a page is a page_pool page into a function for better readability and ease of reuse. Signed-off-by: Liang Chen Reviewed-by: Yunsheng Lin --- net/core/skbuff.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index b157efea5dea..31e57c29c556 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -890,6 +890,11 @@ static void skb_clone_fraglist(struct sk_buff *skb) skb_get(list); } +static bool skb_frag_is_pp_page(struct page *page) +{ + return (page->pp_magic & ~0x3UL) == PP_SIGNATURE; +} + #if IS_ENABLED(CONFIG_PAGE_POOL) bool napi_pp_put_page(struct page *page, bool napi_safe) { @@ -905,7 +910,7 @@ bool napi_pp_put_page(struct page *page, bool napi_safe) * and page_is_pfmemalloc() is checked in __page_pool_put_page() * to avoid recycling the pfmemalloc page. */ - if (unlikely((page->pp_magic & ~0x3UL) != PP_SIGNATURE)) + if (unlikely(!skb_frag_is_pp_page(page))) return false; pp = page->pp; From patchwork Thu Nov 30 11:56:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liang Chen X-Patchwork-Id: 13474285 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48F5EC4167B for ; Thu, 30 Nov 2023 11:59:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D3AAD8D004A; Thu, 30 Nov 2023 06:59:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CEB0A8D0001; Thu, 30 Nov 2023 06:59:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B8B168D004A; Thu, 30 Nov 2023 06:59:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id A435E8D0001 for ; Thu, 30 Nov 2023 06:59:40 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 80737A0142 for ; Thu, 30 Nov 2023 11:59:40 +0000 (UTC) X-FDA: 81514476120.18.60EA97C Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf14.hostedemail.com (Postfix) with ESMTP id A949C10001D for ; Thu, 30 Nov 2023 11:59:38 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=hOQA3p2F; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf14.hostedemail.com: domain of liangchen.linux@gmail.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=liangchen.linux@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701345578; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=e4UjmZfACngDCvpkyy81/IrPoWizpPZEkLdIVW/4fro=; b=Fp9UmJPxy5vDerFVJjUpd7BT9BxctJF61sROA8j60wq8fDvhbKP6q3REH7O/5kPhkKbZUg VeDOz22Y7D86qjETzffhPCWwIJ28wcuJb3DN1uBKhbAd88pCxucXgIO8tuYY2uN1+Xrkey hZN+qgaW/Nkp4xrx0Y9kcNCi5gSd6MI= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=hOQA3p2F; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf14.hostedemail.com: domain of liangchen.linux@gmail.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=liangchen.linux@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701345578; a=rsa-sha256; cv=none; b=xVAsFr1qKMuPa2gm6DKAms7ud2fl+aYTgEjBlFpthOVQNEcMlLZG2UfoiwMgso77TdDBlK 2id6Ja/m5HUEQA6337ynhj6t8vdX4SsnQ+vxQdDB6/sVE8F58nyrA2/481ms0aChBvpwey ZxHlBszg7A0oi0HAb5LJRVjz7eXF8LM= Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1cfcc9b3b5cso8236955ad.0 for ; Thu, 30 Nov 2023 03:59:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701345577; x=1701950377; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e4UjmZfACngDCvpkyy81/IrPoWizpPZEkLdIVW/4fro=; b=hOQA3p2FiR6+6M1Bn2b5PHvI8YAPDYpsR2302sP5WcwyiV0SzHmfwZlR1m9uxBiPBX VEQeBkiS/tGhIhhd7Pdb6EvV8ESWHwRBxAz8rhvUfaydFKsAVG24lqgKCw9hdY/DeIq0 t5LrHXZmDhfJUbhurPKQDsY1jLV5uQwEzr1qwqyxjxZiFSf2Z3YGTBZ7Pf15TBDzcKAD z5rAKD1yqinM7aA3AJOJT/fKEsrGIOik6szPYOs8xN5zKSKHBdVnh514LuiiMDFXLiuz D43jROvFeTi2eabxGvoX+Hbx02b23y5F0TfxGixdo4QqrYeJp36QmsbynksU+xO0PJYI ug/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701345577; x=1701950377; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e4UjmZfACngDCvpkyy81/IrPoWizpPZEkLdIVW/4fro=; b=se5J1TIZy1FhvH3evOXMzrqs4YDvzWgLxkFeKczfqwIQLZukxFrHFsCd4ivi+BCbvI aqGrKL9S6Sc8R6IPCm/tTAFP18qPZydlcChSDwEUzS/2eh74PPgmVH3vZoRVe+9ByLlq UbzlDQuIlMlEWRmucJbg/S3/o2CA7TTnuvVnYHqkCp730s9Yub7ega7seRgcwasjmuTG wpF/bLGjcrv5y3FCKVbXtDCdeThOUw2QI559NikKDXwtxTFsjzv3Qd+KutwICFwSUuhV L64rzR1z3DMOZiV+Bzgdkl55lH4Ju+SU9DxKR2LShgDt3FyfzG4lnoKGKch3WBGtiwYE ueqA== X-Gm-Message-State: AOJu0YxMtxXvGGtmYWbayqEUFsVJHzSy/U4ttft9sue09mCBMZna3qKQ QQPU2C5YTsLOJt7W1qsEQbE= X-Google-Smtp-Source: AGHT+IGQPbwg2/v+iM7Z5IwBB/Tw9Enrlsk/fWYHKf0MrHmKrLdE9W5Fo7jHLLxhldr5J/MePpKApw== X-Received: by 2002:a17:902:eb84:b0:1cf:a204:b52d with SMTP id q4-20020a170902eb8400b001cfa204b52dmr23847249plg.22.1701345577508; Thu, 30 Nov 2023 03:59:37 -0800 (PST) Received: from localhost.localdomain ([89.187.161.180]) by smtp.gmail.com with ESMTPSA id e10-20020a170902b78a00b001cfa718039bsm472530pls.216.2023.11.30.03.59.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 03:59:36 -0800 (PST) From: Liang Chen To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, hawk@kernel.org, ilias.apalodimas@linaro.org, linyunsheng@huawei.com Cc: netdev@vger.kernel.org, linux-mm@kvack.org, jasowang@redhat.com, liangchen.linux@gmail.com Subject: [PATCH net-next v6 4/4] skbuff: Optimization of SKB coalescing for page pool Date: Thu, 30 Nov 2023 19:56:11 +0800 Message-Id: <20231130115611.6632-5-liangchen.linux@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231130115611.6632-1-liangchen.linux@gmail.com> References: <20231130115611.6632-1-liangchen.linux@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: A949C10001D X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 4gpn8bttnc7mebitti918kn9dhw3ufwq X-HE-Tag: 1701345578-124741 X-HE-Meta: U2FsdGVkX1/ryw0y9SiVdly1QdfFsgxGuuFOnYHNeUWnRRHfX5py9fbpr7F9eiaw+AHLPWS9EhKH3C15lRAGC2r/0Mo13ufjqmX9KbzpMJ8N3TtUu58MP3KDXhVX/EU/5iLbxfWamLr3UcLTDFlcZycC4gYw0cBMtcDWMu1OMSAmVbFG7xHnALxsXTBKb8kQ7E384EsO7U8y+0Z1FmQU3KPK+9d2qoo1QYF/bQx7p2HN3MNTH8h8qVLZ6xae+ySz+jfw4u+knG05+BCjselmIn1w6WgxB6De5Zl9vn/eHf6q3EBz1KIInMr5Am+Mh8B80uZLMJ1IlvggyJ2oAIooXz6IV1rvF1KUlhJ7tzLhmadrlGXgdqfHG6souJ8SD51oOZDcyvVkBqeguRKTZYNIPC1qIg6zel1mbklH5G5SWB9Z/NyWIHQ441rLSXP1B5v+PlCV6XTWAMFXNE3WSWOEnPlJ8IO4pGozZGX65/vHeqesVFIPNftRDhYyrZzyLEclmkoXzqLKnv9l74wE7OfFX04ylW9swct2adsRby1OjNE8Rmvb+mDP/4vIz47vBqALZVNyD9JuiB+hYkZZawSFMpltl45BcpqdaKGBt5y4d4x3lJ/3qWt8rR1x1qD0tO1AbC/7BuG89OVxwVgUtLzInW2SgvesoNZx/iSxsK/mc3w6oT78x2rbRHwHgA2KQL7ZA3eADC553U7jzHCjAlQjnKo1R/pFokl4k3xXUZBdlKzKUxV/ZL4pb8d8EETEqlkCxkyv0n1oNVitFlbkHxGGl14TRYNZWKGUxDPcJjXkH97Oy1Lvl/5NspYAqtAfpY19ZYYWLvQN6XlP7l46K62+XuXfaZBBH3dj7waCvzux/Ty53jliz19haN/Tv/zuMCPpNofjaAqQk+veI1ah6f7cZWKkK7S+AnIvXFxMEEpnmjM8x9OAZyIwmFHcU+oXvScJL+vxZkbxQ4CajQ0b0bl rNsMZsgx kHyiPfBIZyqcHY3wCytS9qBd5ae33kZcIisdy+AcFgQsNTcw6c+g6EKW3h4e6FBSNV8/7SWm8YXimf293L7lEGK/j0nb5C8A/hLSmP3P3BZ2C4A8TTRSo8+GndMNzv1tzjG4MU2te1gnbNM7l18aSwasZ8LJxQ/3D6RMHBnAKoE4tNb6mB5GGgHkZiX4eMzvHmPMAiM4jJyj75nR3Q3VCLgjsQhQ/OMIb1dSgispQrvNDZVVakhsU0luf09hwkimJEnmWEC/KG52OekYVPpF7Poa2A9mBN/Qtyuv8zVF9vX/mcrCUO8KzJU/t9m0ONW3UX1qGdRyh2MdA0o8opVIJAOaqEOJDFOwW9LzDu41HjKrafjU/gO5yX2W1lKG2p5Nl7jW6aQVeI76k8laIjabJo/9PD2qjW4BdffUhJ1iii+RzKgC4JbFxm34lsQqMevEY2NYKL0LmRX52T3yu7bz6GC1BgWeNwh4OaD//crnSH2QD0vmmcNu9TFbLg56YY6W64S4Lb3gylHNrj+2zFXxgYvaeuWWsWx0sgjXqMCh190JKZ0nGY7fwSowPhR3BUKgMuR0UVpQOXCgBdZ4re53ZyLRUZw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In order to address the issues encountered with commit 1effe8ca4e34 ("skbuff: fix coalescing for page_pool fragment recycling"), the combination of the following condition was excluded from skb coalescing: from->pp_recycle = 1 from->cloned = 1 to->pp_recycle = 1 However, with page pool environments, the aforementioned combination can be quite common(ex. NetworkMananger may lead to the additional packet_type being registered, thus the cloning). In scenarios with a higher number of small packets, it can significantly affect the success rate of coalescing. For example, considering packets of 256 bytes size, our comparison of coalescing success rate is as follows: Without page pool: 70% With page pool: 13% Consequently, this has an impact on performance: Without page pool: 2.57 Gbits/sec With page pool: 2.26 Gbits/sec Therefore, it seems worthwhile to optimize this scenario and enable coalescing of this particular combination. To achieve this, we need to ensure the correct increment of the "from" SKB page's page pool reference count (pp_ref_count). Following this optimization, the success rate of coalescing measured in our environment has improved as follows: With page pool: 60% This success rate is approaching the rate achieved without using page pool, and the performance has also been improved: With page pool: 2.52 Gbits/sec Below is the performance comparison for small packets before and after this optimization. We observe no impact to packets larger than 4K. packet size before after improved (bytes) (Gbits/sec) (Gbits/sec) 128 1.19 1.27 7.13% 256 2.26 2.52 11.75% 512 4.13 4.81 16.50% 1024 6.17 6.73 9.05% 2048 14.54 15.47 6.45% 4096 25.44 27.87 9.52% Signed-off-by: Liang Chen Reviewed-by: Yunsheng Lin Suggested-by: Jason Wang --- include/net/page_pool/helpers.h | 5 ++++ net/core/skbuff.c | 41 +++++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/include/net/page_pool/helpers.h b/include/net/page_pool/helpers.h index 9dc8eaf8a959..268bc9d9ffd3 100644 --- a/include/net/page_pool/helpers.h +++ b/include/net/page_pool/helpers.h @@ -278,6 +278,11 @@ static inline long page_pool_unref_page(struct page *page, long nr) return ret; } +static inline void page_pool_ref_page(struct page *page) +{ + atomic_long_inc(&page->pp_ref_count); +} + static inline bool page_pool_is_last_ref(struct page *page) { /* If page_pool_unref_page() returns 0, we were the last user */ diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 31e57c29c556..2d797f33d809 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -947,6 +947,24 @@ static bool skb_pp_recycle(struct sk_buff *skb, void *data, bool napi_safe) return napi_pp_put_page(virt_to_page(data), napi_safe); } +/** + * skb_pp_frag_ref() - Increase fragment reference count of a page + * @page: page of the fragment on which to increase a reference + * + * Increase fragment reference count (pp_ref_count) on a page, but if it is + * not a page pool page, fallback to increase a reference(_refcount) on a + * normal page. + */ +static void skb_pp_frag_ref(struct page *page) +{ + struct page *head_page = compound_head(page); + + if (likely(skb_frag_is_pp_page(head_page))) + page_pool_ref_page(head_page); + else + page_ref_inc(head_page); +} + static void skb_kfree_head(void *head, unsigned int end_offset) { if (end_offset == SKB_SMALL_HEAD_HEADROOM) @@ -5769,17 +5787,12 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, return false; /* In general, avoid mixing page_pool and non-page_pool allocated - * pages within the same SKB. Additionally avoid dealing with clones - * with page_pool pages, in case the SKB is using page_pool fragment - * references (page_pool_alloc_frag()). Since we only take full page - * references for cloned SKBs at the moment that would result in - * inconsistent reference counts. - * In theory we could take full references if @from is cloned and - * !@to->pp_recycle but its tricky (due to potential race with - * the clone disappearing) and rare, so not worth dealing with. + * pages within the same SKB. In theory we could take full + * references if @from is cloned and !@to->pp_recycle but its + * tricky (due to potential race with the clone disappearing) and + * rare, so not worth dealing with. */ - if (to->pp_recycle != from->pp_recycle || - (from->pp_recycle && skb_cloned(from))) + if (to->pp_recycle != from->pp_recycle) return false; if (len <= skb_tailroom(to)) { @@ -5836,8 +5849,12 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, /* if the skb is not cloned this does nothing * since we set nr_frags to 0. */ - for (i = 0; i < from_shinfo->nr_frags; i++) - __skb_frag_ref(&from_shinfo->frags[i]); + if (from->pp_recycle) + for (i = 0; i < from_shinfo->nr_frags; i++) + skb_pp_frag_ref(skb_frag_page(&from_shinfo->frags[i])); + else + for (i = 0; i < from_shinfo->nr_frags; i++) + __skb_frag_ref(&from_shinfo->frags[i]); to->truesize += delta; to->len += len;