Commit 70e4f9bf authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

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: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/3522eb8fa9b4e21bcf32e7e9ae656c616b282210.1744722526.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 25744f84

io_uring/zcrx.c

+9 −4
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ 
#include "zcrx.h"

#include "rsrc.h"



static inline struct io_zcrx_ifq *io_pp_to_ifq(struct page_pool *pp)

{

	return pp->mp_priv;

}



#define IO_DMA_ATTR (DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING)



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) 


static netmem_ref io_pp_zc_alloc_netmems(struct page_pool *pp, gfp_t gfp)

{

	struct io_zcrx_ifq *ifq = pp->mp_priv;

	struct io_zcrx_ifq *ifq = io_pp_to_ifq(pp);



	/* pp should already be ensuring that */

	if (unlikely(pp->alloc.count))
@@ -618,7 +623,7 @@ static bool io_pp_zc_release_netmem(struct page_pool *pp, netmem_ref netmem) 


static int io_pp_zc_init(struct page_pool *pp)

{

	struct io_zcrx_ifq *ifq = pp->mp_priv;

	struct io_zcrx_ifq *ifq = io_pp_to_ifq(pp);



	if (WARN_ON_ONCE(!ifq))

		return -EINVAL;
@@ -637,7 +642,7 @@ static int io_pp_zc_init(struct page_pool *pp) 


static void io_pp_zc_destroy(struct page_pool *pp)

{

	struct io_zcrx_ifq *ifq = pp->mp_priv;

	struct io_zcrx_ifq *ifq = io_pp_to_ifq(pp);

	struct io_zcrx_area *area = ifq->area;



	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, 


	niov = netmem_to_net_iov(frag->netmem);

	if (niov->pp->mp_ops != &io_uring_pp_zc_ops ||

	    niov->pp->mp_priv != ifq)

	    io_pp_to_ifq(niov->pp) != ifq)

		return -EFAULT;



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