Re: [PATCH 2/5] io_uring/zcrx: move io_zcrx_iov_page

[David Wei <dw@davidwei.uk>]

On 2025-04-16 08:21, Pavel Begunkov wrote:
> We'll need io_zcrx_iov_page at the top to keep offset calculations
> closer together, move it there.
> 
> Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
> ---
>  io_uring/zcrx.c | 28 ++++++++++++++--------------
>  1 file changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c
> index 659438f4cfcf..0b56d5f84959 100644
> --- a/io_uring/zcrx.c
> +++ b/io_uring/zcrx.c
> @@ -31,6 +31,20 @@ static inline struct io_zcrx_ifq *io_pp_to_ifq(struct page_pool *pp)
>  	return pp->mp_priv;
>  }
>  
> +static inline struct io_zcrx_area *io_zcrx_iov_to_area(const struct net_iov *niov)
> +{
> +	struct net_iov_area *owner = net_iov_owner(niov);
> +
> +	return container_of(owner, struct io_zcrx_area, nia);
> +}
> +
> +static inline struct page *io_zcrx_iov_page(const struct net_iov *niov)
> +{
> +	struct io_zcrx_area *area = io_zcrx_iov_to_area(niov);
> +
> +	return area->pages[net_iov_idx(niov)];
> +}
> +
>  #define IO_DMA_ATTR (DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING)
>  
>  static void __io_zcrx_unmap_area(struct io_zcrx_ifq *ifq,
> @@ -111,13 +125,6 @@ struct io_zcrx_args {
>  
>  static const struct memory_provider_ops io_uring_pp_zc_ops;
>  
> -static inline struct io_zcrx_area *io_zcrx_iov_to_area(const struct net_iov *niov)
> -{
> -	struct net_iov_area *owner = net_iov_owner(niov);
> -
> -	return container_of(owner, struct io_zcrx_area, nia);
> -}
> -
>  static inline atomic_t *io_get_user_counter(struct net_iov *niov)
>  {
>  	struct io_zcrx_area *area = io_zcrx_iov_to_area(niov);
> @@ -140,13 +147,6 @@ static void io_zcrx_get_niov_uref(struct net_iov *niov)
>  	atomic_inc(io_get_user_counter(niov));
>  }
>  
> -static inline struct page *io_zcrx_iov_page(const struct net_iov *niov)
> -{
> -	struct io_zcrx_area *area = io_zcrx_iov_to_area(niov);
> -
> -	return area->pages[net_iov_idx(niov)];
> -}
> -
>  static int io_allocate_rbuf_ring(struct io_zcrx_ifq *ifq,
>  				 struct io_uring_zcrx_ifq_reg *reg,
>  				 struct io_uring_region_desc *rd)

Reviewed-by: David Wei <dw@davidwei.uk>