netdev - Re: [PATCH net-next 00/10] bpf: xdp: Report bpf_prog ID in IFLA

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] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 12 Jun 2017 22:35:34 -0700
From:   Martin KaFai Lau <kafai@...com>
To:     Jakub Kicinski <kubakici@...pl>
CC:     <netdev@...r.kernel.org>, Alexei Starovoitov <ast@...com>,
        Daniel Borkmann <daniel@...earbox.net>, <kernel-team@...com>
Subject: Re: [PATCH net-next 00/10] bpf: xdp: Report bpf_prog ID in IFLA_XDP

On Mon, Jun 12, 2017 at 06:26:02PM -0700, Jakub Kicinski wrote:
> On Mon, 12 Jun 2017 18:00:15 -0700, Martin KaFai Lau wrote:
> > This is the first usage of the new bpf_prog ID.  It is for
> > reporting the ID of a xdp_prog through netlink.
> >
> > It rides on the existing IFLA_XDP.  This patch adds IFLA_XDP_PROG_ID
> > for the bpf_prog ID reporting.
> >
> > It starts with changing the generic_xdp first.  After that,
> > the hardware driver is changed one by one.  The final patch
> > removes the prog_attached from 'struct netdev_xdp' because
> > prog_id > 0 implies the presence of xdp_prog.
>
> Daniel made the XDP_ATTACHED an enum to be able to extend it with other
> modes.  I would appreciate if you didn't remove the member since I have
> this waiting in my tree:
I see. I will keep prog_attached then.

>
> From: Jakub Kicinski <jakub.kicinski@...ronome.com>
> Date: Mon, 5 Jun 2017 22:52:01 -0700
> Subject: [PATCH net-next] xdp: add reporting of offload mode
>
> Extend the XDP_ATTACHED_* values to include offloaded mode.
> Let drivers report whether program is installed in the driver
> or the HW by changing the prog_attached field from bool to
> u8 (type of the netlink attribute).
>
> Signed-off-by: Jakub Kicinski <jakub.kicinski@...ronome.com>
> ---
>  include/linux/netdevice.h    | 7 ++++---
j
>  include/uapi/linux/if_link.h | 1 +
>  net/core/dev.c               | 2 +-
>  net/core/rtnetlink.c         | 6 +++---
>  4 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index 524c7776ce96..76165dfd2a1e 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -808,7 +808,8 @@ enum xdp_netdev_command {
>  	 */
>  	XDP_SETUP_PROG,
>  	/* Check if a bpf program is set on the device.  The callee should
> -	 * return true if a program is currently attached and running.
> +	 * set @prog_attached to one of XDP_ATTACHED_* values, note that "true"
> +	 * is equivalent to XDP_ATTACHED_DRV.
>  	 */
>  	XDP_QUERY_PROG,
>  };
> @@ -824,7 +825,7 @@ struct netdev_xdp {
>  			struct netlink_ext_ack *extack;
>  		};
>  		/* XDP_QUERY_PROG */
> -		bool prog_attached;
> +		u8 prog_attached;
>  	};
>  };
>
> @@ -3302,7 +3303,7 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
>  typedef int (*xdp_op_t)(struct net_device *dev, struct netdev_xdp *xdp);
>  int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,
>  		      int fd, u32 flags);
> -bool __dev_xdp_attached(struct net_device *dev, xdp_op_t xdp_op);
> +u8 __dev_xdp_attached(struct net_device *dev, xdp_op_t xdp_op);
>
>  int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb);
>  int dev_forward_skb(struct net_device *dev, struct sk_buff *skb);
> diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
> index 8ed679fe603f..4dd59b7463a9 100644
> --- a/include/uapi/linux/if_link.h
> +++ b/include/uapi/linux/if_link.h
> @@ -900,6 +900,7 @@ enum {
>  	XDP_ATTACHED_NONE = 0,
>  	XDP_ATTACHED_DRV,
>  	XDP_ATTACHED_SKB,
> +	XDP_ATTACHED_HW,
>  };
>
>  enum {
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 8f72f4a9c6ac..8f29b6ba99ac 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -6930,7 +6930,7 @@ int dev_change_proto_down(struct net_device *dev, bool proto_down)
>  }
>  EXPORT_SYMBOL(dev_change_proto_down);
>
> -bool __dev_xdp_attached(struct net_device *dev, xdp_op_t xdp_op)
> +u8 __dev_xdp_attached(struct net_device *dev, xdp_op_t xdp_op)
>  {
>  	struct netdev_xdp xdp;
>
> diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
> index 7084f1db2446..5b16e479ea68 100644
> --- a/net/core/rtnetlink.c
> +++ b/net/core/rtnetlink.c
> @@ -1255,10 +1255,10 @@ static u8 rtnl_xdp_attached_mode(struct net_device *dev)
>
>  	if (rcu_access_pointer(dev->xdp_prog))
>  		return XDP_ATTACHED_SKB;
> -	if (ops->ndo_xdp && __dev_xdp_attached(dev, ops->ndo_xdp))
> -		return XDP_ATTACHED_DRV;
> +	if (!ops->ndo_xdp)
> +		return XDP_ATTACHED_NONE;
>
> -	return XDP_ATTACHED_NONE;
> +	return __dev_xdp_attached(dev, ops->ndo_xdp);
>  }
>
>  static int rtnl_xdp_fill(struct sk_buff *skb, struct net_device *dev)
> --
> 2.11.0
>