lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <9e53ca46be34f3c393861b7a645bb25f0b03f1d2.camel@redhat.com> Date: Thu, 14 Sep 2023 17:17:10 +0200 From: Paolo Abeni <pabeni@...hat.com> To: Yunsheng Lin <linyunsheng@...wei.com>, davem@...emloft.net, kuba@...nel.org Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org, Lorenzo Bianconi <lorenzo@...nel.org>, Alexander Duyck <alexander.duyck@...il.com>, Liang Chen <liangchen.linux@...il.com>, Alexander Lobakin <aleksander.lobakin@...el.com>, Jesper Dangaard Brouer <hawk@...nel.org>, Ilias Apalodimas <ilias.apalodimas@...aro.org>, Eric Dumazet <edumazet@...gle.com> Subject: Re: [PATCH net-next v8 2/6] page_pool: unify frag_count handling in page_pool_is_last_frag() On Tue, 2023-09-12 at 16:31 +0800, Yunsheng Lin wrote: > Currently when page_pool_create() is called with > PP_FLAG_PAGE_FRAG flag, page_pool_alloc_pages() is only > allowed to be called under the below constraints: > 1. page_pool_fragment_page() need to be called to setup > page->pp_frag_count immediately. > 2. page_pool_defrag_page() often need to be called to drain > the page->pp_frag_count when there is no more user will > be holding on to that page. > > Those constraints exist in order to support a page to be > split into multi frags. > > And those constraints have some overhead because of the > cache line dirtying/bouncing and atomic update. > > Those constraints are unavoidable for case when we need a > page to be split into more than one frag, but there is also > case that we want to avoid the above constraints and their > overhead when a page can't be split as it can only hold a big > frag as requested by user, depending on different use cases: > use case 1: allocate page without page splitting. > use case 2: allocate page with page splitting. > use case 3: allocate page with or without page splitting > depending on the frag size. > > Currently page pool only provide page_pool_alloc_pages() and > page_pool_alloc_frag() API to enable the 1 & 2 separately, > so we can not use a combination of 1 & 2 to enable 3, it is > not possible yet because of the per page_pool flag > PP_FLAG_PAGE_FRAG. > > So in order to allow allocating unsplit page without the > overhead of split page while still allow allocating split > page we need to remove the per page_pool flag in > page_pool_is_last_frag(), as best as I can think of, it seems > there are two methods as below: > 1. Add per page flag/bit to indicate a page is split or > not, which means we might need to update that flag/bit > everytime the page is recycled, dirtying the cache line > of 'struct page' for use case 1. > 2. Unify the page->pp_frag_count handling for both split and > unsplit page by assuming all pages in the page pool is split > into a big frag initially. > > As page pool already supports use case 1 without dirtying the > cache line of 'struct page' whenever a page is recyclable, we > need to support the above use case 3 with minimal overhead, > especially not adding any noticeable overhead for use case 1, > and we are already doing an optimization by not updating > pp_frag_count in page_pool_defrag_page() for the last frag > user, this patch chooses to unify the pp_frag_count handling > to support the above use case 3. > > Signed-off-by: Yunsheng Lin <linyunsheng@...wei.com> > CC: Lorenzo Bianconi <lorenzo@...nel.org> > CC: Alexander Duyck <alexander.duyck@...il.com> > CC: Liang Chen <liangchen.linux@...il.com> > CC: Alexander Lobakin <aleksander.lobakin@...el.com> > --- > include/net/page_pool/helpers.h | 48 ++++++++++++++++++++++++--------- > net/core/page_pool.c | 10 ++++++- > 2 files changed, 44 insertions(+), 14 deletions(-) > > diff --git a/include/net/page_pool/helpers.h b/include/net/page_pool/helpers.h > index 8e1c85de4995..0ec81b91bed8 100644 > --- a/include/net/page_pool/helpers.h > +++ b/include/net/page_pool/helpers.h > @@ -115,28 +115,50 @@ static inline long page_pool_defrag_page(struct page *page, long nr) > long ret; > > /* If nr == pp_frag_count then we have cleared all remaining > - * references to the page. No need to actually overwrite it, instead > - * we can leave this to be overwritten by the calling function. > + * 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 frag draining. > * > - * The main advantage to doing this is that 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. > + * 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 frag and non-frag handling by ensuring all > + * pages have been split into one big frag initially, and only > + * overwrite it when the page is split into more than one frag. > */ > - if (atomic_long_read(&page->pp_frag_count) == nr) > + if (atomic_long_read(&page->pp_frag_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 frag 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); > + > return 0; > + } > > ret = atomic_long_sub_return(nr, &page->pp_frag_count); > WARN_ON(ret < 0); > + > + /* We are the last user here too, reset frag count back to 1 to > + * ensure all pages have been split into one big frag initially, > + * this should be the rare case when the last two frag users call > + * page_pool_defrag_page() currently. > + */ > + if (unlikely(!ret)) > + atomic_long_set(&page->pp_frag_count, 1); > + > return ret; > } > > -static inline bool page_pool_is_last_frag(struct page_pool *pool, > - struct page *page) > +static inline bool page_pool_is_last_frag(struct page *page) > { > - /* If fragments aren't enabled or count is 0 we were the last user */ > - return !(pool->p.flags & PP_FLAG_PAGE_FRAG) || > - (page_pool_defrag_page(page, 1) == 0); > + /* If page_pool_defrag_page() returns 0, we were the last user */ > + return page_pool_defrag_page(page, 1) == 0; > } > > /** > @@ -161,7 +183,7 @@ 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(pool, page)) > + if (!page_pool_is_last_frag(page)) > return; > > page_pool_put_defragged_page(pool, page, dma_sync_size, allow_direct); > diff --git a/net/core/page_pool.c b/net/core/page_pool.c > index 8a9868ea5067..403b6df2e144 100644 > --- a/net/core/page_pool.c > +++ b/net/core/page_pool.c > @@ -376,6 +376,14 @@ static void page_pool_set_pp_info(struct page_pool *pool, > { > page->pp = pool; > page->pp_magic |= PP_SIGNATURE; > + > + /* Ensuring all pages have been split into one big frag initially: > + * page_pool_set_pp_info() is only called once for every page when it > + * is allocated from the page allocator and page_pool_fragment_page() > + * is dirtying the same cache line as the page->pp_magic above, so > + * the overhead is negligible. > + */ > + page_pool_fragment_page(page, 1); > if (pool->p.init_callback) > pool->p.init_callback(page, pool->p.init_arg); > } I think it would be nice backing the above claim with some benchmarks. (possibly even just a micro-benchmark around the relevant APIs) and include such info into the changelog message. Cheers, Paolo
Powered by blists - more mailing lists