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,
	Shakeel Butt <shakeelb@google.com>,
	Jesper Dangaard Brouer <brouer@redhat.com>,
	Jesse Brandeburg <jesse.brandeburg@intel.com>
Subject: [PATCH v3 16/26] page_pool: Use netmem in page_pool_drain_frag()
Date: Wed, 11 Jan 2023 04:22:04 +0000	[thread overview]
Message-ID: <20230111042214.907030-17-willy@infradead.org> (raw)
In-Reply-To: <20230111042214.907030-1-willy@infradead.org>

We're not quite ready to change the API of page_pool_drain_frag(),
but we can remove the use of several wrappers by using the netmem
throughout.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
---
 net/core/page_pool.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index c495e3a16e83..cd469a9970e7 100644
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@ -672,17 +672,17 @@ 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_defrag_netmem(nmem, drain_count)))
 		return NULL;
 
-	if (page_ref_count(page) == 1 && !page_is_pfmemalloc(page)) {
+	if (netmem_ref_count(nmem) == 1 && !netmem_is_pfmemalloc(nmem)) {
 		if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV)
 			page_pool_dma_sync_for_device(pool, nmem, -1);
 
 		return page;
 	}
 
-	page_pool_return_page(pool, page);
+	page_pool_return_netmem(pool, nmem);
 	return NULL;
 }
 
-- 
2.35.1



  parent reply	other threads:[~2023-01-11  4:22 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-11  4:21 [PATCH v3 00/26] Split netmem from struct page Matthew Wilcox (Oracle)
2023-01-11  4:21 ` [PATCH v3 01/26] netmem: Create new type Matthew Wilcox (Oracle)
2023-01-11  4:21 ` [PATCH v3 02/26] netmem: Add utility functions Matthew Wilcox (Oracle)
2023-01-11  4:21 ` [PATCH v3 03/26] page_pool: Add netmem_set_dma_addr() and netmem_get_dma_addr() Matthew Wilcox (Oracle)
2023-01-11  4:21 ` [PATCH v3 04/26] page_pool: Convert page_pool_release_page() to page_pool_release_netmem() Matthew Wilcox (Oracle)
2023-01-11  4:21 ` [PATCH v3 05/26] page_pool: Start using netmem in allocation path Matthew Wilcox (Oracle)
2023-01-12 15:36   ` Shay Agroskin
2023-01-12 20:29     ` Matthew Wilcox
2023-01-11  4:21 ` [PATCH v3 06/26] page_pool: Convert page_pool_return_page() to page_pool_return_netmem() Matthew Wilcox (Oracle)
2023-01-11  4:21 ` [PATCH v3 07/26] page_pool: Convert __page_pool_put_page() to __page_pool_put_netmem() Matthew Wilcox (Oracle)
2023-01-11  4:21 ` [PATCH v3 08/26] page_pool: Convert pp_alloc_cache to contain netmem Matthew Wilcox (Oracle)
2023-01-14 12:28   ` Shay Agroskin
2023-01-14 17:58     ` Matthew Wilcox
2023-01-15 11:03       ` Shay Agroskin
2023-01-11  4:21 ` [PATCH v3 09/26] page_pool: Convert page_pool_defrag_page() to page_pool_defrag_netmem() Matthew Wilcox (Oracle)
2023-01-11  4:21 ` [PATCH v3 10/26] page_pool: Convert page_pool_put_defragged_page() to netmem Matthew Wilcox (Oracle)
2023-01-11  4:21 ` [PATCH v3 11/26] page_pool: Convert page_pool_empty_ring() to use netmem Matthew Wilcox (Oracle)
2023-01-11  4:22 ` [PATCH v3 12/26] page_pool: Convert page_pool_alloc_pages() to page_pool_alloc_netmem() Matthew Wilcox (Oracle)
2023-01-11  4:22 ` [PATCH v3 13/26] page_pool: Convert page_pool_dma_sync_for_device() to take a netmem Matthew Wilcox (Oracle)
2023-01-11  4:22 ` [PATCH v3 14/26] page_pool: Convert page_pool_recycle_in_cache() to netmem Matthew Wilcox (Oracle)
2023-01-11  4:22 ` [PATCH v3 15/26] page_pool: Remove __page_pool_put_page() Matthew Wilcox (Oracle)
2023-01-11  4:22 ` Matthew Wilcox (Oracle) [this message]
2023-01-11  4:22 ` [PATCH v3 17/26] page_pool: Convert page_pool_return_skb_page() to use netmem Matthew Wilcox (Oracle)
2023-01-12  8:46   ` Jesper Dangaard Brouer
2023-01-11  4:22 ` [PATCH v3 18/26] page_pool: Allow page_pool_recycle_direct() to take a netmem or a page Matthew Wilcox (Oracle)
2023-01-11 12:48   ` kernel test robot
2023-01-11 13:43     ` Matthew Wilcox
2023-01-12  8:45       ` Jesper Dangaard Brouer
2023-01-11  4:22 ` [PATCH v3 19/26] page_pool: Convert frag_page to frag_nmem Matthew Wilcox (Oracle)
2023-01-11  4:22 ` [PATCH v3 20/26] xdp: Convert to netmem Matthew Wilcox (Oracle)
2023-01-11  4:22 ` [PATCH v3 21/26] mm: Remove page pool members from struct page Matthew Wilcox (Oracle)
2023-01-11  4:22 ` [PATCH v3 22/26] page_pool: Pass a netmem to init_callback() Matthew Wilcox (Oracle)
2023-01-11  4:22 ` [PATCH v3 23/26] net: Add support for netmem in skb_frag Matthew Wilcox (Oracle)
2023-01-11  4:22 ` [PATCH v3 24/26] mvneta: Convert to netmem Matthew Wilcox (Oracle)
2023-01-11  4:22 ` [PATCH v3 25/26] mlx5: " Matthew Wilcox (Oracle)
2023-01-11  4:22 ` [PATCH v3 26/26] hns3: " Matthew Wilcox (Oracle)
2023-01-11  8:25 ` [PATCH v3 00/26] Split netmem from struct page Yunsheng Lin
2023-01-11 13:21   ` Matthew Wilcox
2023-01-12  2:12     ` Yunsheng Lin
2023-01-12 10:15     ` Jesper Dangaard Brouer
2023-01-13  2:19       ` Yunsheng Lin

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=20230111042214.907030-17-willy@infradead.org \
    --to=willy@infradead.org \
    --cc=brouer@redhat.com \
    --cc=hawk@kernel.org \
    --cc=ilias.apalodimas@linaro.org \
    --cc=jesse.brandeburg@intel.com \
    --cc=linux-mm@kvack.org \
    --cc=netdev@vger.kernel.org \
    --cc=shakeelb@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