Commit 7cd1107f authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Jakub Kicinski
Browse files

bpf, xdp: constify some bpf_prog * function arguments 



In lots of places, bpf_prog pointer is used only for tracing or other
stuff that doesn't modify the structure itself. Same for net_device.
Address at least some of them and add `const` attributes there. The
object code didn't change, but that may prevent unwanted data
modifications and also allow more helpers to have const arguments.

Reviewed-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ca5c9494

include/linux/bpf.h

+6 −6
Original line number Diff line number Diff line
@@ -2591,10 +2591,10 @@ int dev_map_enqueue(struct bpf_dtab_netdev *dst, struct xdp_frame *xdpf, 
int dev_map_enqueue_multi(struct xdp_frame *xdpf, struct net_device *dev_rx,

			  struct bpf_map *map, bool exclude_ingress);

int dev_map_generic_redirect(struct bpf_dtab_netdev *dst, struct sk_buff *skb,

			     struct bpf_prog *xdp_prog);

			     const struct bpf_prog *xdp_prog);

int dev_map_redirect_multi(struct net_device *dev, struct sk_buff *skb,

			   struct bpf_prog *xdp_prog, struct bpf_map *map,

			   bool exclude_ingress);

			   const struct bpf_prog *xdp_prog,

			   struct bpf_map *map, bool exclude_ingress);



void __cpu_map_flush(struct list_head *flush_list);

int cpu_map_enqueue(struct bpf_cpu_map_entry *rcpu, struct xdp_frame *xdpf,
@@ -2864,15 +2864,15 @@ struct sk_buff; 


static inline int dev_map_generic_redirect(struct bpf_dtab_netdev *dst,

					   struct sk_buff *skb,

					   struct bpf_prog *xdp_prog)

					   const struct bpf_prog *xdp_prog)

{

	return 0;

}



static inline

int dev_map_redirect_multi(struct net_device *dev, struct sk_buff *skb,

			   struct bpf_prog *xdp_prog, struct bpf_map *map,

			   bool exclude_ingress)

			   const struct bpf_prog *xdp_prog,

			   struct bpf_map *map, bool exclude_ingress)

{

	return 0;

}

include/linux/filter.h

+5 −4
Original line number Diff line number Diff line
@@ -1179,17 +1179,18 @@ static inline int xdp_ok_fwd_dev(const struct net_device *fwd, 
 * This does not appear to be a real limitation for existing software.

 */

int xdp_do_generic_redirect(struct net_device *dev, struct sk_buff *skb,

			    struct xdp_buff *xdp, struct bpf_prog *prog);

			    struct xdp_buff *xdp, const struct bpf_prog *prog);

int xdp_do_redirect(struct net_device *dev,

		    struct xdp_buff *xdp,

		    struct bpf_prog *prog);

		    const struct bpf_prog *prog);

int xdp_do_redirect_frame(struct net_device *dev,

			  struct xdp_buff *xdp,

			  struct xdp_frame *xdpf,

			  struct bpf_prog *prog);

			  const struct bpf_prog *prog);

void xdp_do_flush(void);



void bpf_warn_invalid_xdp_action(struct net_device *dev, struct bpf_prog *prog, u32 act);

void bpf_warn_invalid_xdp_action(const struct net_device *dev,

				 const struct bpf_prog *prog, u32 act);



#ifdef CONFIG_INET

struct sock *bpf_run_sk_reuseport(struct sock_reuseport *reuse, struct sock *sk,

include/linux/netdevice.h

+3 −3
Original line number Diff line number Diff line
@@ -3958,9 +3958,9 @@ static inline void dev_consume_skb_any(struct sk_buff *skb) 
}



u32 bpf_prog_run_generic_xdp(struct sk_buff *skb, struct xdp_buff *xdp,

			     struct bpf_prog *xdp_prog);

void generic_xdp_tx(struct sk_buff *skb, struct bpf_prog *xdp_prog);

int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff **pskb);

			     const struct bpf_prog *xdp_prog);

void generic_xdp_tx(struct sk_buff *skb, const struct bpf_prog *xdp_prog);

int do_xdp_generic(const struct bpf_prog *xdp_prog, struct sk_buff **pskb);

int netif_rx(struct sk_buff *skb);

int __netif_rx(struct sk_buff *skb);

include/linux/skbuff.h

+1 −1
Original line number Diff line number Diff line
@@ -3627,7 +3627,7 @@ static inline netmem_ref skb_frag_netmem(const skb_frag_t *frag) 
int skb_pp_cow_data(struct page_pool *pool, struct sk_buff **pskb,

		    unsigned int headroom);

int skb_cow_data_for_xdp(struct page_pool *pool, struct sk_buff **pskb,

			 struct bpf_prog *prog);

			 const struct bpf_prog *prog);



/**

 * skb_frag_address - gets the address of the data contained in a paged fragment

kernel/bpf/devmap.c

+4 −4
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ int dev_map_enqueue_multi(struct xdp_frame *xdpf, struct net_device *dev_rx, 
}



int dev_map_generic_redirect(struct bpf_dtab_netdev *dst, struct sk_buff *skb,

			     struct bpf_prog *xdp_prog)

			     const struct bpf_prog *xdp_prog)

{

	int err;
@@ -701,7 +701,7 @@ int dev_map_generic_redirect(struct bpf_dtab_netdev *dst, struct sk_buff *skb, 


static int dev_map_redirect_clone(struct bpf_dtab_netdev *dst,

				  struct sk_buff *skb,

				  struct bpf_prog *xdp_prog)

				  const struct bpf_prog *xdp_prog)

{

	struct sk_buff *nskb;

	int err;
@@ -720,8 +720,8 @@ static int dev_map_redirect_clone(struct bpf_dtab_netdev *dst, 
}



int dev_map_redirect_multi(struct net_device *dev, struct sk_buff *skb,

			   struct bpf_prog *xdp_prog, struct bpf_map *map,

			   bool exclude_ingress)

			   const struct bpf_prog *xdp_prog,

			   struct bpf_map *map, bool exclude_ingress)

{

	struct bpf_dtab *dtab = container_of(map, struct bpf_dtab, map);

	struct bpf_dtab_netdev *dst, *last_dst = NULL;