linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Jesper Dangaard Brouer <hawk@kernel.org>,
	Ilias Apalodimas <ilias.apalodimas@linaro.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
	netdev@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH 03/24] page_pool: Add netmem_set_dma_addr() and netmem_get_dma_addr()
Date: Wed, 30 Nov 2022 22:07:42 +0000	[thread overview]
Message-ID: <20221130220803.3657490-4-willy@infradead.org> (raw)
In-Reply-To: <20221130220803.3657490-1-willy@infradead.org>

Turn page_pool_set_dma_addr() and page_pool_get_dma_addr() into
wrappers.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 include/net/page_pool.h | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/include/net/page_pool.h b/include/net/page_pool.h
index 0ce20b95290b..a68746a5b99c 100644
--- a/include/net/page_pool.h
+++ b/include/net/page_pool.h
@@ -427,21 +427,31 @@ static inline void page_pool_recycle_direct(struct page_pool *pool,
 #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)
+static inline dma_addr_t netmem_get_dma_addr(struct netmem *nmem)
 {
-	dma_addr_t ret = page->dma_addr;
+	dma_addr_t ret = nmem->dma_addr;
 
 	if (PAGE_POOL_DMA_USE_PP_FRAG_COUNT)
-		ret |= (dma_addr_t)page->dma_addr_upper << 16 << 16;
+		ret |= (dma_addr_t)nmem->dma_addr_upper << 16 << 16;
 
 	return ret;
 }
 
-static inline void page_pool_set_dma_addr(struct page *page, dma_addr_t addr)
+static inline dma_addr_t page_pool_get_dma_addr(struct page *page)
+{
+	return netmem_get_dma_addr(page_netmem(page));
+}
+
+static inline void netmem_set_dma_addr(struct netmem *nmem, dma_addr_t addr)
 {
-	page->dma_addr = addr;
+	nmem->dma_addr = addr;
 	if (PAGE_POOL_DMA_USE_PP_FRAG_COUNT)
-		page->dma_addr_upper = upper_32_bits(addr);
+		nmem->dma_addr_upper = upper_32_bits(addr);
+}
+
+static inline void page_pool_set_dma_addr(struct page *page, dma_addr_t addr)
+{
+	netmem_set_dma_addr(page_netmem(page), addr);
 }
 
 static inline bool is_page_pool_compiled_in(void)
-- 
2.35.1



  parent reply	other threads:[~2022-11-30 22:08 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-30 22:07 [PATCH 00/24] Split page pools from struct page Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 01/24] netmem: Create new type Matthew Wilcox (Oracle)
2022-12-05 14:42   ` Jesper Dangaard Brouer
2022-11-30 22:07 ` [PATCH 02/24] netmem: Add utility functions Matthew Wilcox (Oracle)
2022-11-30 22:07 ` Matthew Wilcox (Oracle) [this message]
2022-11-30 22:07 ` [PATCH 04/24] page_pool: Convert page_pool_release_page() to page_pool_release_netmem() Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 05/24] page_pool: Start using netmem in allocation path Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 06/24] page_pool: Convert page_pool_return_page() to page_pool_return_netmem() Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 07/24] page_pool: Convert __page_pool_put_page() to __page_pool_put_netmem() Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 08/24] page_pool: Convert pp_alloc_cache to contain netmem Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 09/24] page_pool: Convert page_pool_defrag_page() to page_pool_defrag_netmem() Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 10/24] page_pool: Convert page_pool_put_defragged_page() to netmem Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 11/24] page_pool: Convert page_pool_empty_ring() to use netmem Matthew Wilcox (Oracle)
2022-12-02 21:25   ` Alexander H Duyck
2022-11-30 22:07 ` [PATCH 12/24] page_pool: Convert page_pool_alloc_pages() to page_pool_alloc_netmem() Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 13/24] page_pool: Convert page_pool_dma_sync_for_device() to take a netmem Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 14/24] page_pool: Convert page_pool_recycle_in_cache() to netmem Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 15/24] page_pool: Remove page_pool_defrag_page() Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 16/24] page_pool: Use netmem in page_pool_drain_frag() Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 17/24] page_pool: Convert page_pool_return_skb_page() to use netmem Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 18/24] page_pool: Convert frag_page to frag_nmem Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 19/24] xdp: Convert to netmem Matthew Wilcox (Oracle)
2022-11-30 22:07 ` [PATCH 20/24] mm: Remove page pool members from struct page Matthew Wilcox (Oracle)
2022-11-30 22:08 ` [PATCH 21/24] netmem_to_virt Matthew Wilcox (Oracle)
2022-11-30 22:08 ` [PATCH 22/24] page_pool: Pass a netmem to init_callback() Matthew Wilcox (Oracle)
2022-11-30 22:08 ` [PATCH 23/24] net: Add support for netmem in skb_frag Matthew Wilcox (Oracle)
2022-11-30 22:08 ` [PATCH 24/24] mvneta: Convert to netmem Matthew Wilcox (Oracle)
2022-12-05 15:34 ` [PATCH 00/24] Split page pools from struct page Jesper Dangaard Brouer
2022-12-05 15:44   ` Ilias Apalodimas
2022-12-05 16:31   ` Matthew Wilcox
2022-12-06  9:43     ` Jesper Dangaard Brouer
2022-12-06 16:08       ` Matthew Wilcox
2022-12-08 15:33         ` Jesper Dangaard Brouer
2022-12-06 16:05 ` [PATCH 25/26] netpool: Additional utility functions Matthew Wilcox (Oracle)
2022-12-06 16:05 ` [PATCH 26/26] mlx5: Convert to netmem Matthew Wilcox (Oracle)
2022-12-08 15:10   ` Jesper Dangaard Brouer

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=20221130220803.3657490-4-willy@infradead.org \
    --to=willy@infradead.org \
    --cc=hawk@kernel.org \
    --cc=ilias.apalodimas@linaro.org \
    --cc=linux-mm@kvack.org \
    --cc=netdev@vger.kernel.org \
    /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).