Re: [PATCH v2 11/24] page_pool: Convert page_pool_empty_ring() to use netmem

Retrieve a netmem from the ptr_ring instead of a page.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
  net/core/page_pool.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index e727a74504c2..0212244e07e7 100644
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c

@@ -755,16 +755,16 @@ EXPORT_SYMBOL(page_pool_alloc_frag);
  
  static void page_pool_empty_ring(struct page_pool *pool)
  {
-	struct page *page;
+	struct netmem *nmem;
  
  	/* Empty recycle ring */
-	while ((page = ptr_ring_consume_bh(&pool->ring))) {
+	while ((nmem = ptr_ring_consume_bh(&pool->ring)) != NULL) {
  		/* Verify the refcnt invariant of cached pages */
-		if (!(page_ref_count(page) == 1))
+		if (netmem_ref_count(nmem) != 1)
  			pr_crit("%s() page_pool refcnt %d violation\n",
-				__func__, page_ref_count(page));
+				__func__, netmem_ref_count(nmem));
  
-		page_pool_return_page(pool, page);
+		page_pool_return_netmem(pool, nmem);
  	}