From: Jesper Dangaard Brouer <jbrouer@redhat.com>
To: Yunsheng Lin <linyunsheng@huawei.com>,
davem@davemloft.net, kuba@kernel.org
Cc: brouer@redhat.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, linuxarm@openeuler.org,
hawk@kernel.org, ilias.apalodimas@linaro.org,
akpm@linux-foundation.org, peterz@infradead.org, will@kernel.org,
jhubbard@nvidia.com, yuzhao@google.com, mcroce@microsoft.com,
fenghua.yu@intel.com, feng.tang@intel.com, jgg@ziepe.ca,
aarcange@redhat.com, guro@fb.com,
Matthew Wilcox <willy@infradead.org>
Subject: Re: [PATCH net-next v6] page_pool: disable dma mapping support for 32-bit arch with 64-bit DMA
Date: Wed, 13 Oct 2021 12:21:21 +0200 [thread overview]
Message-ID: <458b7f87-a7ca-739d-cb8c-494909bf0dc3@redhat.com> (raw)
In-Reply-To: <20211013091920.1106-1-linyunsheng@huawei.com>
On 13/10/2021 11.19, Yunsheng Lin wrote:
> As the 32-bit arch with 64-bit DMA seems to rare those days,
> and page pool might carry a lot of code and complexity for
> systems that possibly.
>
> So disable dma mapping support for such systems, if drivers
> really want to work on such systems, they have to implement
> their own DMA-mapping fallback tracking outside page_pool.
>
> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
> Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
> ---
> V6: Drop pp page tracking support
> ---
> include/linux/mm_types.h | 13 +------------
> include/net/page_pool.h | 12 +-----------
> net/core/page_pool.c | 10 ++++++----
> 3 files changed, 8 insertions(+), 27 deletions(-)
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
This is a nice simplification of struct page and page_pool code, when we
don't need to handle this 32-bit ARCH with 64-bit DMA case.
It also gets rid of the confusingly named define. Thanks.
> diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
> index 7f8ee09c711f..436e0946d691 100644
> --- a/include/linux/mm_types.h
> +++ b/include/linux/mm_types.h
> @@ -104,18 +104,7 @@ struct page {
> 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;
> - };
> + atomic_long_t pp_frag_count;
> };
> struct { /* slab, slob and slub */
> union {
> diff --git a/include/net/page_pool.h b/include/net/page_pool.h
> index a4082406a003..3855f069627f 100644
> --- a/include/net/page_pool.h
> +++ b/include/net/page_pool.h
> @@ -216,24 +216,14 @@ static inline void page_pool_recycle_direct(struct page_pool *pool,
> page_pool_put_full_page(pool, page, true);
> }
>
> -#define PAGE_POOL_DMA_USE_PP_FRAG_COUNT \
> - (sizeof(dma_addr_t) > sizeof(unsigned long))
> -
> static inline dma_addr_t page_pool_get_dma_addr(struct page *page)
> {
> - dma_addr_t ret = page->dma_addr;
> -
> - if (PAGE_POOL_DMA_USE_PP_FRAG_COUNT)
> - ret |= (dma_addr_t)page->dma_addr_upper << 16 << 16;
> -
> - return ret;
> + return page->dma_addr;
> }
>
> static inline void page_pool_set_dma_addr(struct page *page, dma_addr_t addr)
> {
> page->dma_addr = addr;
> - if (PAGE_POOL_DMA_USE_PP_FRAG_COUNT)
> - page->dma_addr_upper = upper_32_bits(addr);
> }
>
> static inline void page_pool_set_frag_count(struct page *page, long nr)
> diff --git a/net/core/page_pool.c b/net/core/page_pool.c
> index 1a6978427d6c..9b60e4301a44 100644
> --- a/net/core/page_pool.c
> +++ b/net/core/page_pool.c
> @@ -49,6 +49,12 @@ static int page_pool_init(struct page_pool *pool,
> * which is the XDP_TX use-case.
> */
> if (pool->p.flags & PP_FLAG_DMA_MAP) {
> + /* DMA-mapping is not supported on 32-bit systems with
> + * 64-bit DMA mapping.
> + */
> + if (sizeof(dma_addr_t) > sizeof(unsigned long))
> + return -EOPNOTSUPP;
> +
> if ((pool->p.dma_dir != DMA_FROM_DEVICE) &&
> (pool->p.dma_dir != DMA_BIDIRECTIONAL))
> return -EINVAL;
> @@ -69,10 +75,6 @@ static int page_pool_init(struct page_pool *pool,
> */
> }
>
> - if (PAGE_POOL_DMA_USE_PP_FRAG_COUNT &&
> - pool->p.flags & PP_FLAG_PAGE_FRAG)
> - return -EINVAL;
> -
> if (ptr_ring_init(&pool->ring, ring_qsize, GFP_KERNEL) < 0)
> return -ENOMEM;
>
>
next prev parent reply other threads:[~2021-10-13 10:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-13 9:19 [PATCH net-next v6] page_pool: disable dma mapping support for 32-bit arch with 64-bit DMA Yunsheng Lin
2021-10-13 10:21 ` Jesper Dangaard Brouer [this message]
2021-10-15 10:00 ` patchwork-bot+netdevbpf
2021-11-09 9:58 ` Guillaume Tucker
2021-11-09 12:02 ` Yunsheng Lin
2021-11-12 9:21 ` Guillaume Tucker
2021-11-15 3:34 ` Yunsheng Lin
2021-11-15 11:53 ` Ilias Apalodimas
2021-11-15 12:10 ` Ilias Apalodimas
2021-11-15 12:21 ` Yunsheng Lin
2021-11-15 14:39 ` Jesper Dangaard Brouer
2021-11-15 18:55 ` Ilias Apalodimas
2021-11-17 11:52 ` Jesper Dangaard Brouer
2021-11-15 17:59 ` Christoph Hellwig
2021-11-15 18:48 ` Ilias Apalodimas
2021-11-15 18:53 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=458b7f87-a7ca-739d-cb8c-494909bf0dc3@redhat.com \
--to=jbrouer@redhat.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=brouer@redhat.com \
--cc=davem@davemloft.net \
--cc=feng.tang@intel.com \
--cc=fenghua.yu@intel.com \
--cc=guro@fb.com \
--cc=hawk@kernel.org \
--cc=ilias.apalodimas@linaro.org \
--cc=jgg@ziepe.ca \
--cc=jhubbard@nvidia.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@openeuler.org \
--cc=linyunsheng@huawei.com \
--cc=mcroce@microsoft.com \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=will@kernel.org \
--cc=willy@infradead.org \
--cc=yuzhao@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).