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>
Subject: [PATCH v2 23/24] mvneta: Convert to netmem
Date: Thu, 5 Jan 2023 21:46:30 +0000 [thread overview]
Message-ID: <20230105214631.3939268-24-willy@infradead.org> (raw)
In-Reply-To: <20230105214631.3939268-1-willy@infradead.org>
Use the netmem APIs instead of the page APIs. Improves type-safety.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
drivers/net/ethernet/marvell/mvneta.c | 48 +++++++++++++--------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index f8925cac61e4..6177d2ffd33c 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -1931,15 +1931,15 @@ static int mvneta_rx_refill(struct mvneta_port *pp,
gfp_t gfp_mask)
{
dma_addr_t phys_addr;
- struct page *page;
+ struct netmem *nmem;
- page = page_pool_alloc_pages(rxq->page_pool,
+ nmem = page_pool_alloc_netmem(rxq->page_pool,
gfp_mask | __GFP_NOWARN);
- if (!page)
+ if (!nmem)
return -ENOMEM;
- phys_addr = page_pool_get_dma_addr(page) + pp->rx_offset_correction;
- mvneta_rx_desc_fill(rx_desc, phys_addr, page, rxq);
+ phys_addr = netmem_get_dma_addr(nmem) + pp->rx_offset_correction;
+ mvneta_rx_desc_fill(rx_desc, phys_addr, nmem, rxq);
return 0;
}
@@ -2006,7 +2006,7 @@ static void mvneta_rxq_drop_pkts(struct mvneta_port *pp,
if (!data || !(rx_desc->buf_phys_addr))
continue;
- page_pool_put_full_page(rxq->page_pool, data, false);
+ page_pool_put_full_netmem(rxq->page_pool, data, false);
}
if (xdp_rxq_info_is_reg(&rxq->xdp_rxq))
xdp_rxq_info_unreg(&rxq->xdp_rxq);
@@ -2072,11 +2072,11 @@ mvneta_xdp_put_buff(struct mvneta_port *pp, struct mvneta_rx_queue *rxq,
goto out;
for (i = 0; i < sinfo->nr_frags; i++)
- page_pool_put_full_page(rxq->page_pool,
- skb_frag_page(&sinfo->frags[i]), true);
+ page_pool_put_full_netmem(rxq->page_pool,
+ skb_frag_netmem(&sinfo->frags[i]), true);
out:
- page_pool_put_page(rxq->page_pool, virt_to_head_page(xdp->data),
+ page_pool_put_netmem(rxq->page_pool, virt_to_netmem(xdp->data),
sync_len, true);
}
@@ -2088,7 +2088,6 @@ mvneta_xdp_submit_frame(struct mvneta_port *pp, struct mvneta_tx_queue *txq,
struct device *dev = pp->dev->dev.parent;
struct mvneta_tx_desc *tx_desc;
int i, num_frames = 1;
- struct page *page;
if (unlikely(xdp_frame_has_frags(xdpf)))
num_frames += sinfo->nr_frags;
@@ -2123,9 +2122,10 @@ mvneta_xdp_submit_frame(struct mvneta_port *pp, struct mvneta_tx_queue *txq,
buf->type = MVNETA_TYPE_XDP_NDO;
} else {
- page = unlikely(frag) ? skb_frag_page(frag)
- : virt_to_page(xdpf->data);
- dma_addr = page_pool_get_dma_addr(page);
+ struct netmem *nmem = unlikely(frag) ?
+ skb_frag_netmem(frag) :
+ virt_to_netmem(xdpf->data);
+ dma_addr = netmem_get_dma_addr(nmem);
if (unlikely(frag))
dma_addr += skb_frag_off(frag);
else
@@ -2308,9 +2308,9 @@ mvneta_swbm_rx_frame(struct mvneta_port *pp,
struct mvneta_rx_desc *rx_desc,
struct mvneta_rx_queue *rxq,
struct xdp_buff *xdp, int *size,
- struct page *page)
+ struct netmem *nmem)
{
- unsigned char *data = page_address(page);
+ unsigned char *data = netmem_to_virt(nmem);
int data_len = -MVNETA_MH_SIZE, len;
struct net_device *dev = pp->dev;
enum dma_data_direction dma_dir;
@@ -2343,7 +2343,7 @@ mvneta_swbm_add_rx_fragment(struct mvneta_port *pp,
struct mvneta_rx_desc *rx_desc,
struct mvneta_rx_queue *rxq,
struct xdp_buff *xdp, int *size,
- struct page *page)
+ struct netmem *nmem)
{
struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp);
struct net_device *dev = pp->dev;
@@ -2371,16 +2371,16 @@ mvneta_swbm_add_rx_fragment(struct mvneta_port *pp,
skb_frag_off_set(frag, pp->rx_offset_correction);
skb_frag_size_set(frag, data_len);
- __skb_frag_set_page(frag, page);
+ __skb_frag_set_netmem(frag, nmem);
if (!xdp_buff_has_frags(xdp)) {
sinfo->xdp_frags_size = *size;
xdp_buff_set_frags_flag(xdp);
}
- if (page_is_pfmemalloc(page))
+ if (netmem_is_pfmemalloc(nmem))
xdp_buff_set_frag_pfmemalloc(xdp);
} else {
- page_pool_put_full_page(rxq->page_pool, page, true);
+ page_pool_put_full_netmem(rxq->page_pool, nmem, true);
}
*size -= len;
}
@@ -2440,10 +2440,10 @@ static int mvneta_rx_swbm(struct napi_struct *napi,
struct mvneta_rx_desc *rx_desc = mvneta_rxq_next_desc_get(rxq);
u32 rx_status, index;
struct sk_buff *skb;
- struct page *page;
+ struct netmem *nmem;
index = rx_desc - rxq->descs;
- page = (struct page *)rxq->buf_virt_addr[index];
+ nmem = rxq->buf_virt_addr[index];
rx_status = rx_desc->status;
rx_proc++;
@@ -2461,17 +2461,17 @@ static int mvneta_rx_swbm(struct napi_struct *napi,
desc_status = rx_status;
mvneta_swbm_rx_frame(pp, rx_desc, rxq, &xdp_buf,
- &size, page);
+ &size, nmem);
} else {
if (unlikely(!xdp_buf.data_hard_start)) {
rx_desc->buf_phys_addr = 0;
- page_pool_put_full_page(rxq->page_pool, page,
+ page_pool_put_full_netmem(rxq->page_pool, nmem,
true);
goto next;
}
mvneta_swbm_add_rx_fragment(pp, rx_desc, rxq, &xdp_buf,
- &size, page);
+ &size, nmem);
} /* Middle or Last descriptor */
if (!(rx_status & MVNETA_RXD_LAST_DESC))
--
2.35.1
next prev parent reply other threads:[~2023-01-05 21:47 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-05 21:46 [PATCH v2 00/24] Split netmem from struct page Matthew Wilcox (Oracle)
2023-01-05 21:46 ` [PATCH v2 01/24] netmem: Create new type Matthew Wilcox (Oracle)
2023-01-06 13:07 ` Jesper Dangaard Brouer
2023-01-09 17:20 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 02/24] netmem: Add utility functions Matthew Wilcox (Oracle)
2023-01-06 2:24 ` kernel test robot
2023-01-06 20:35 ` Matthew Wilcox
2023-01-06 13:35 ` Jesper Dangaard Brouer
2023-01-05 21:46 ` [PATCH v2 03/24] page_pool: Add netmem_set_dma_addr() and netmem_get_dma_addr() Matthew Wilcox (Oracle)
2023-01-06 13:43 ` Jesper Dangaard Brouer
2023-01-09 17:30 ` Ilias Apalodimas
2023-01-10 9:17 ` Ilias Apalodimas
2023-01-10 18:16 ` Matthew Wilcox
2023-01-10 18:15 ` Matthew Wilcox
2023-01-05 21:46 ` [PATCH v2 04/24] page_pool: Convert page_pool_release_page() to page_pool_release_netmem() Matthew Wilcox (Oracle)
2023-01-06 13:46 ` Jesper Dangaard Brouer
2023-01-10 9:28 ` Ilias Apalodimas
2023-01-10 18:47 ` Matthew Wilcox
2023-01-11 13:56 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 05/24] page_pool: Start using netmem in allocation path Matthew Wilcox (Oracle)
2023-01-06 2:34 ` kernel test robot
2023-01-06 13:59 ` Jesper Dangaard Brouer
2023-01-06 15:36 ` Matthew Wilcox
2023-01-10 9:30 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 06/24] page_pool: Convert page_pool_return_page() to page_pool_return_netmem() Matthew Wilcox (Oracle)
2023-01-06 14:10 ` Jesper Dangaard Brouer
2023-01-10 9:39 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 07/24] page_pool: Convert __page_pool_put_page() to __page_pool_put_netmem() Matthew Wilcox (Oracle)
2023-01-06 14:14 ` Jesper Dangaard Brouer
2023-01-10 9:47 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 08/24] page_pool: Convert pp_alloc_cache to contain netmem Matthew Wilcox (Oracle)
2023-01-06 14:18 ` Jesper Dangaard Brouer
2023-01-10 9:58 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 09/24] page_pool: Convert page_pool_defrag_page() to page_pool_defrag_netmem() Matthew Wilcox (Oracle)
2023-01-06 14:29 ` Jesper Dangaard Brouer
2023-01-10 10:27 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 10/24] page_pool: Convert page_pool_put_defragged_page() to netmem Matthew Wilcox (Oracle)
2023-01-06 14:32 ` Jesper Dangaard Brouer
2023-01-10 10:36 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 11/24] page_pool: Convert page_pool_empty_ring() to use netmem Matthew Wilcox (Oracle)
2023-01-06 15:22 ` Jesper Dangaard Brouer
2023-01-10 10:38 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 12/24] page_pool: Convert page_pool_alloc_pages() to page_pool_alloc_netmem() Matthew Wilcox (Oracle)
2023-01-06 15:27 ` Jesper Dangaard Brouer
2023-01-10 10:45 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 13/24] page_pool: Convert page_pool_dma_sync_for_device() to take a netmem Matthew Wilcox (Oracle)
2023-01-06 15:28 ` Jesper Dangaard Brouer
2023-01-10 10:47 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 14/24] page_pool: Convert page_pool_recycle_in_cache() to netmem Matthew Wilcox (Oracle)
2023-01-06 15:29 ` Jesper Dangaard Brouer
2023-01-10 10:48 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 15/24] page_pool: Remove page_pool_defrag_page() Matthew Wilcox (Oracle)
2023-01-06 15:29 ` Jesper Dangaard Brouer
2023-01-10 9:47 ` Ilias Apalodimas
2023-01-10 22:00 ` Matthew Wilcox
2023-01-11 13:58 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 16/24] page_pool: Use netmem in page_pool_drain_frag() Matthew Wilcox (Oracle)
2023-01-06 15:30 ` Jesper Dangaard Brouer
2023-01-10 11:00 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 17/24] page_pool: Convert page_pool_return_skb_page() to use netmem Matthew Wilcox (Oracle)
2023-01-06 15:49 ` Jesper Dangaard Brouer
2023-01-06 16:53 ` Matthew Wilcox
2023-01-06 20:16 ` Jesper Dangaard Brouer
2023-01-09 18:36 ` Matthew Wilcox
2023-01-10 10:04 ` Jesper Dangaard Brouer
2023-01-05 21:46 ` [PATCH v2 18/24] page_pool: Convert frag_page to frag_nmem Matthew Wilcox (Oracle)
2023-01-06 15:51 ` Jesper Dangaard Brouer
2023-01-10 11:36 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 19/24] xdp: Convert to netmem Matthew Wilcox (Oracle)
2023-01-06 15:53 ` Jesper Dangaard Brouer
2023-01-10 11:50 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 20/24] mm: Remove page pool members from struct page Matthew Wilcox (Oracle)
2023-01-06 15:56 ` Jesper Dangaard Brouer
2023-01-10 11:51 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 21/24] page_pool: Pass a netmem to init_callback() Matthew Wilcox (Oracle)
2023-01-06 16:02 ` Jesper Dangaard Brouer
2023-01-10 11:32 ` Ilias Apalodimas
2023-01-05 21:46 ` [PATCH v2 22/24] net: Add support for netmem in skb_frag Matthew Wilcox (Oracle)
2023-01-05 21:46 ` Matthew Wilcox (Oracle) [this message]
2023-01-05 21:46 ` [PATCH v2 24/24] mlx5: Convert to netmem Matthew Wilcox (Oracle)
2023-01-06 16:31 ` Jesper Dangaard Brouer
2023-01-09 11:46 ` Tariq Toukan
2023-01-09 12:27 ` Tariq Toukan
2023-01-06 1:20 ` [PATCH v2 00/24] Split netmem from struct page Jesse Brandeburg
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=20230105214631.3939268-24-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 \
--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;
as well as URLs for NNTP newsgroup(s).