Skip to content

Commit 70e4f9b

Browse files
isilenceaxboe
authored andcommitted
io_uring/zcrx: add pp to ifq conversion helper
It'll likely change how page pools store memory providers, so in preparation for that, keep accesses in one place in io_uring by introducing a helper. Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/3522eb8fa9b4e21bcf32e7e9ae656c616b282210.1744722526.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 25744f8 commit 70e4f9b

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

io_uring/zcrx.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
#include "zcrx.h"
2727
#include "rsrc.h"
2828

29+
static inline struct io_zcrx_ifq *io_pp_to_ifq(struct page_pool *pp)
30+
{
31+
return pp->mp_priv;
32+
}
33+
2934
#define IO_DMA_ATTR (DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING)
3035

3136
static void __io_zcrx_unmap_area(struct io_zcrx_ifq *ifq,
@@ -586,7 +591,7 @@ static void io_zcrx_refill_slow(struct page_pool *pp, struct io_zcrx_ifq *ifq)
586591

587592
static netmem_ref io_pp_zc_alloc_netmems(struct page_pool *pp, gfp_t gfp)
588593
{
589-
struct io_zcrx_ifq *ifq = pp->mp_priv;
594+
struct io_zcrx_ifq *ifq = io_pp_to_ifq(pp);
590595

591596
/* pp should already be ensuring that */
592597
if (unlikely(pp->alloc.count))
@@ -618,7 +623,7 @@ static bool io_pp_zc_release_netmem(struct page_pool *pp, netmem_ref netmem)
618623

619624
static int io_pp_zc_init(struct page_pool *pp)
620625
{
621-
struct io_zcrx_ifq *ifq = pp->mp_priv;
626+
struct io_zcrx_ifq *ifq = io_pp_to_ifq(pp);
622627

623628
if (WARN_ON_ONCE(!ifq))
624629
return -EINVAL;
@@ -637,7 +642,7 @@ static int io_pp_zc_init(struct page_pool *pp)
637642

638643
static void io_pp_zc_destroy(struct page_pool *pp)
639644
{
640-
struct io_zcrx_ifq *ifq = pp->mp_priv;
645+
struct io_zcrx_ifq *ifq = io_pp_to_ifq(pp);
641646
struct io_zcrx_area *area = ifq->area;
642647

643648
if (WARN_ON_ONCE(area->free_count != area->nia.num_niovs))
@@ -792,7 +797,7 @@ static int io_zcrx_recv_frag(struct io_kiocb *req, struct io_zcrx_ifq *ifq,
792797

793798
niov = netmem_to_net_iov(frag->netmem);
794799
if (niov->pp->mp_ops != &io_uring_pp_zc_ops ||
795-
niov->pp->mp_priv != ifq)
800+
io_pp_to_ifq(niov->pp) != ifq)
796801
return -EFAULT;
797802

798803
if (!io_zcrx_queue_cqe(req, niov, ifq, off + skb_frag_off(frag), len))

0 commit comments

Comments
 (0)