| Message ID | 20230105214631.3939268-21-willy@infradead.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Split netmem from struct page | expand |
On 05/01/2023 22.46, Matthew Wilcox (Oracle) wrote: > These are now split out into their own netmem struct. > > Signed-off-by: Matthew Wilcox (Oracle)<willy@infradead.org> > --- > include/linux/mm_types.h | 22 ---------------------- > include/net/page_pool.h | 4 ---- > 2 files changed, 26 deletions(-) Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
On Thu, Jan 05, 2023 at 09:46:27PM +0000, Matthew Wilcox (Oracle) wrote: > These are now split out into their own netmem struct. > > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> > --- > include/linux/mm_types.h | 22 ---------------------- > include/net/page_pool.h | 4 ---- > 2 files changed, 26 deletions(-) > > diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h > index 603b615f1bf3..90d91088a9d5 100644 > --- a/include/linux/mm_types.h > +++ b/include/linux/mm_types.h > @@ -116,28 +116,6 @@ struct page { > */ > unsigned long private; > }; > - struct { /* page_pool used by netstack */ > - /** > - * @pp_magic: magic value to avoid recycling non > - * page_pool allocated pages. > - */ > - unsigned long pp_magic; > - struct page_pool *pp; > - unsigned long _pp_mapping_pad; > - unsigned long dma_addr; > - union { > - /** > - * dma_addr_upper: might require a 64-bit > - * value on 32-bit architectures. > - */ > - unsigned long dma_addr_upper; > - /** > - * For frag page support, not supported in > - * 32-bit architectures with 64-bit DMA. > - */ > - atomic_long_t pp_frag_count; > - }; > - }; > struct { /* Tail pages of compound page */ > unsigned long compound_head; /* Bit zero is set */ > > diff --git a/include/net/page_pool.h b/include/net/page_pool.h > index a9dae4b5f2f7..c607d67c96dc 100644 > --- a/include/net/page_pool.h > +++ b/include/net/page_pool.h > @@ -86,11 +86,7 @@ struct netmem { > static_assert(offsetof(struct page, pg) == offsetof(struct netmem, nm)) > NETMEM_MATCH(flags, flags); > NETMEM_MATCH(lru, pp_magic); > -NETMEM_MATCH(pp, pp); > NETMEM_MATCH(mapping, _pp_mapping_pad); > -NETMEM_MATCH(dma_addr, dma_addr); > -NETMEM_MATCH(dma_addr_upper, dma_addr_upper); > -NETMEM_MATCH(pp_frag_count, pp_frag_count); > NETMEM_MATCH(_mapcount, _mapcount); > NETMEM_MATCH(_refcount, _refcount); > #undef NETMEM_MATCH > -- > 2.35.1 > Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 603b615f1bf3..90d91088a9d5 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -116,28 +116,6 @@ struct page { */ unsigned long private; }; - struct { /* page_pool used by netstack */ - /** - * @pp_magic: magic value to avoid recycling non - * page_pool allocated pages. - */ - unsigned long pp_magic; - struct page_pool *pp; - unsigned long _pp_mapping_pad; - unsigned long dma_addr; - union { - /** - * dma_addr_upper: might require a 64-bit - * value on 32-bit architectures. - */ - unsigned long dma_addr_upper; - /** - * For frag page support, not supported in - * 32-bit architectures with 64-bit DMA. - */ - atomic_long_t pp_frag_count; - }; - }; struct { /* Tail pages of compound page */ unsigned long compound_head; /* Bit zero is set */ diff --git a/include/net/page_pool.h b/include/net/page_pool.h index a9dae4b5f2f7..c607d67c96dc 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -86,11 +86,7 @@ struct netmem { static_assert(offsetof(struct page, pg) == offsetof(struct netmem, nm)) NETMEM_MATCH(flags, flags); NETMEM_MATCH(lru, pp_magic); -NETMEM_MATCH(pp, pp); NETMEM_MATCH(mapping, _pp_mapping_pad); -NETMEM_MATCH(dma_addr, dma_addr); -NETMEM_MATCH(dma_addr_upper, dma_addr_upper); -NETMEM_MATCH(pp_frag_count, pp_frag_count); NETMEM_MATCH(_mapcount, _mapcount); NETMEM_MATCH(_refcount, _refcount); #undef NETMEM_MATCH
These are now split out into their own netmem struct. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- include/linux/mm_types.h | 22 ---------------------- include/net/page_pool.h | 4 ---- 2 files changed, 26 deletions(-)