netdev - Re: [PATCH bpf-next 3/3] i40e: adapt driver to new xdp

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <d41ac731-be62-4049-3caa-5bbe2f58c756@iogearbox.net>
Date:   Fri, 31 Aug 2018 12:34:06 +0200
From:   Daniel Borkmann <daniel@...earbox.net>
To:     Magnus Karlsson <magnus.karlsson@...el.com>, bjorn.topel@...el.com,
        ast@...nel.org, netdev@...r.kernel.org
Subject: Re: [PATCH bpf-next 3/3] i40e: adapt driver to new xdp_umem structure

On 08/30/2018 03:56 PM, Magnus Karlsson wrote:
> The struct xdp_umem_props was removed in the xsk code and this commit
> adapts the i40e af_xdp zero-copy driver code to the new xdp_umem
> structure.
> 
> Signed-off-by: Magnus Karlsson <magnus.karlsson@...el.com>
> ---
>  drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
> index 41ca7e1..2ebfc78 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
> @@ -442,7 +442,7 @@ static void i40e_reuse_rx_buffer_zc(struct i40e_ring *rx_ring,
>  				    struct i40e_rx_buffer *old_bi)
>  {
>  	struct i40e_rx_buffer *new_bi = &rx_ring->rx_bi[rx_ring->next_to_alloc];
> -	unsigned long mask = (unsigned long)rx_ring->xsk_umem->props.chunk_mask;
> +	unsigned long mask = (unsigned long)rx_ring->xsk_umem->chunk_mask;

That is buggy indeed, kbuild bot complained that this hurts bisectability
because you removed struct xdp_umem_props props from umem in prior patch.
Please respin the full series with this one squashed into prior commit instead
and I'll toss the old one from bpf-next tree.

>  	u64 hr = rx_ring->xsk_umem->headroom + XDP_PACKET_HEADROOM;
>  	u16 nta = rx_ring->next_to_alloc;
>  
> @@ -477,7 +477,7 @@ void i40e_zca_free(struct zero_copy_allocator *alloc, unsigned long handle)
>  
>  	rx_ring = container_of(alloc, struct i40e_ring, zca);
>  	hr = rx_ring->xsk_umem->headroom + XDP_PACKET_HEADROOM;
> -	mask = rx_ring->xsk_umem->props.chunk_mask;
> +	mask = rx_ring->xsk_umem->chunk_mask;
>  
>  	nta = rx_ring->next_to_alloc;
>  	bi = &rx_ring->rx_bi[nta];
>