netdev - Re: linux-next: manual merge of the bpf-next tree with the net-next tree

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: <20200721085355.GA2315@lore-desk>
Date:   Tue, 21 Jul 2020 10:53:55 +0200
From:   Lorenzo Bianconi <lorenzo@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Daniel Borkmann <daniel@...earbox.net>,
        Alexei Starovoitov <ast@...nel.org>,
        Networking <netdev@...r.kernel.org>,
        David Miller <davem@...emloft.net>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Jesper Dangaard Brouer <brouer@...hat.com>
Subject: Re: linux-next: manual merge of the bpf-next tree with the net-next
 tree

[...]

> diff --cc include/net/xdp.h
> index d3005bef812f,5be0d4d65b94..000000000000
> --- a/include/net/xdp.h
> +++ b/include/net/xdp.h
> @@@ -104,15 -98,12 +104,21 @@@ struct xdp_frame 
>   	struct net_device *dev_rx; /* used by cpumap */
>   };
>   
>  +static inline struct skb_shared_info *
>  +xdp_get_shared_info_from_frame(struct xdp_frame *frame)
>  +{
>  +	void *data_hard_start = frame->data - frame->headroom - sizeof(*frame);
>  +
>  +	return (struct skb_shared_info *)(data_hard_start + frame->frame_sz -
>  +				SKB_DATA_ALIGN(sizeof(struct skb_shared_info)));
>  +}
>  +
> + struct xdp_cpumap_stats {
> + 	unsigned int redirect;
> + 	unsigned int pass;
> + 	unsigned int drop;
> + };

Hi Stephen,

the fix is correct, thanks and sorry for the noise. I will point out possible
conflicts next time.

Regards,
Lorenzo

> + 
>   /* Clear kernel pointers in xdp_frame */
>   static inline void xdp_scrub_frame(struct xdp_frame *frame)
>   {



Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)