Merge branch 'bpf-xdp-Report-bpf_prog-ID-in-IFLA_XDP'

Martin KaFai Lau says:

====================
bpf: xdp: Report bpf_prog ID in IFLA_XDP

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.  Jakub Kicinski mentioned
that he will soon introduce XDP_ATTACHED_HW (on top of the existing
XDP_ATTACHED_DRV and XDP_ATTACHED_SKB)
and he is going to reuse the prog_attached for this purpose.
Hence, this patch set keeps the prog_attached even though
!!prog_id also implies there is xdp_prog attached.

I have tested with generic_xdp, mlx4 and mlx5.

v3:
1. Replace 'if' by '?' when checking the xdp_prog pointer
   as suggested by Jakub Kicinski (thanks!)

v2:
1. Remove READ_ONCE since it is alredy under rtnl lock
2. Keep prog_attached in 'struct netdev_xdp' as
   requested by Jakub Kicinski.  The existing prog_attached
   and the new prog_id are put under a struct for XDP_QUERY_PROG.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
index 8ce793a0d030ff713dc1800bb7c0efcb827bd031..7d67552e70d7af3a6ad254bf7bb164a159be9938 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
@@ -218,6 +218,7 @@ int bnxt_xdp(struct net_device *dev, struct netdev_xdp *xdp)
                break;
        case XDP_QUERY_PROG:
                xdp->prog_attached = !!bp->xdp_prog;
+               xdp->prog_id = bp->xdp_prog ? bp->xdp_prog->aux->id : 0;
                rc = 0;
                break;
        default:

diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
index d6477af880858240a25fb7037f17d118abdf1275..573755b0a51b7f48c8565f6e5d638fbf86f99afd 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
@@ -1763,6 +1763,7 @@ static int nicvf_xdp(struct net_device *netdev, struct netdev_xdp *xdp)
                return nicvf_xdp_setup(nic, xdp->prog);
        case XDP_QUERY_PROG:
                xdp->prog_attached = !!nic->xdp_prog;
+               xdp->prog_id = nic->xdp_prog ? nic->xdp_prog->aux->id : 0;
                return 0;
        default:
                return -EINVAL;

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index f3dc5dea930052df4e928fdc25b23e7ff358f6be..f1dbdf26d8e127f24f8871df4640ffcc4560ea58 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -9815,6 +9815,8 @@ static int ixgbe_xdp(struct net_device *dev, struct netdev_xdp *xdp)
                return ixgbe_xdp_setup(dev, xdp->prog);
        case XDP_QUERY_PROG:
                xdp->prog_attached = !!(adapter->xdp_prog);
+               xdp->prog_id = adapter->xdp_prog ?
+                       adapter->xdp_prog->aux->id : 0;
                return 0;
        default:
                return -EINVAL;

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 99c02bb4f30202cd54462f2162fae6d140771f7b..18252a79a074ddfee3363c47aa0009eb3b4c39d8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -2825,11 +2825,25 @@ static int mlx4_xdp_set(struct net_device *dev, struct bpf_prog *prog)
        return err;
 }
 
-static bool mlx4_xdp_attached(struct net_device *dev)
+static u32 mlx4_xdp_query(struct net_device *dev)
 {
        struct mlx4_en_priv *priv = netdev_priv(dev);
+       struct mlx4_en_dev *mdev = priv->mdev;
+       const struct bpf_prog *xdp_prog;
+       u32 prog_id = 0;
+
+       if (!priv->tx_ring_num[TX_XDP])
+               return prog_id;
+
+       mutex_lock(&mdev->state_lock);
+       xdp_prog = rcu_dereference_protected(
+               priv->rx_ring[0]->xdp_prog,
+               lockdep_is_held(&mdev->state_lock));
+       if (xdp_prog)
+               prog_id = xdp_prog->aux->id;
+       mutex_unlock(&mdev->state_lock);
 
-       return !!priv->tx_ring_num[TX_XDP];
+       return prog_id;
 }
 
 static int mlx4_xdp(struct net_device *dev, struct netdev_xdp *xdp)
@@ -2838,7 +2852,8 @@ static int mlx4_xdp(struct net_device *dev, struct netdev_xdp *xdp)
        case XDP_SETUP_PROG:
                return mlx4_xdp_set(dev, xdp->prog);
        case XDP_QUERY_PROG:
-               xdp->prog_attached = mlx4_xdp_attached(dev);
+               xdp->prog_id = mlx4_xdp_query(dev);
+               xdp->prog_attached = !!xdp->prog_id;
                return 0;
        default:
                return -EINVAL;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 5afec0f4a6588b8198603ff3f890a24e617ff53a..c8f3aefe735d192aa4f4f808eec0645c964fdc6c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -3599,11 +3599,19 @@ static int mlx5e_xdp_set(struct net_device *netdev, struct bpf_prog *prog)
        return err;
 }
 
-static bool mlx5e_xdp_attached(struct net_device *dev)
+static u32 mlx5e_xdp_query(struct net_device *dev)
 {
        struct mlx5e_priv *priv = netdev_priv(dev);
+       const struct bpf_prog *xdp_prog;
+       u32 prog_id = 0;
 
-       return !!priv->channels.params.xdp_prog;
+       mutex_lock(&priv->state_lock);
+       xdp_prog = priv->channels.params.xdp_prog;
+       if (xdp_prog)
+               prog_id = xdp_prog->aux->id;
+       mutex_unlock(&priv->state_lock);
+
+       return prog_id;
 }
 
 static int mlx5e_xdp(struct net_device *dev, struct netdev_xdp *xdp)
@@ -3612,7 +3620,8 @@ static int mlx5e_xdp(struct net_device *dev, struct netdev_xdp *xdp)
        case XDP_SETUP_PROG:
                return mlx5e_xdp_set(dev, xdp->prog);
        case XDP_QUERY_PROG:
-               xdp->prog_attached = mlx5e_xdp_attached(dev);
+               xdp->prog_id = mlx5e_xdp_query(dev);
+               xdp->prog_attached = !!xdp->prog_id;
                return 0;
        default:
                return -EINVAL;

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index 49d1756d6a8e0e74b4045b58e6b34c546ad48cc1..378512dec80d476269a822ae219174581bee7589 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -3256,6 +3256,7 @@ static int nfp_net_xdp(struct net_device *netdev, struct netdev_xdp *xdp)
                return nfp_net_xdp_setup(nn, xdp);
        case XDP_QUERY_PROG:
                xdp->prog_attached = !!nn->dp.xdp_prog;
+               xdp->prog_id = nn->dp.xdp_prog ? nn->dp.xdp_prog->aux->id : 0;
                return 0;
        default:
                return -EINVAL;

diff --git a/drivers/net/ethernet/qlogic/qede/qede_filter.c b/drivers/net/ethernet/qlogic/qede/qede_filter.c
index 13955a3bd3b36abee318569cd2089e5a14803c5f..f939db5bac5fc4132687fdb664388a7be38a05ee 100644 (file)
--- a/drivers/net/ethernet/qlogic/qede/qede_filter.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_filter.c
@@ -1037,6 +1037,7 @@ int qede_xdp(struct net_device *dev, struct netdev_xdp *xdp)
                return qede_xdp_set(edev, xdp->prog);
        case XDP_QUERY_PROG:
                xdp->prog_attached = !!edev->xdp_prog;
+               xdp->prog_id = edev->xdp_prog ? edev->xdp_prog->aux->id : 0;
                return 0;
        default:
                return -EINVAL;

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 6bacbd2f0eca51bfcedb7a8cd448f95d9d32232b..5c6388fb7dd13922e310aba329325e84fb434474 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1955,16 +1955,18 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,
        return err;
 }
 
-static bool virtnet_xdp_query(struct net_device *dev)
+static u32 virtnet_xdp_query(struct net_device *dev)
 {
        struct virtnet_info *vi = netdev_priv(dev);
+       const struct bpf_prog *xdp_prog;
        int i;
 
        for (i = 0; i < vi->max_queue_pairs; i++) {
-               if (vi->rq[i].xdp_prog)
-                       return true;
+               xdp_prog = rtnl_dereference(vi->rq[i].xdp_prog);
+               if (xdp_prog)
+                       return xdp_prog->aux->id;
        }
-       return false;
+       return 0;
 }
 
 static int virtnet_xdp(struct net_device *dev, struct netdev_xdp *xdp)
@@ -1973,7 +1975,8 @@ static int virtnet_xdp(struct net_device *dev, struct netdev_xdp *xdp)
        case XDP_SETUP_PROG:
                return virtnet_xdp_set(dev, xdp->prog, xdp->extack);
        case XDP_QUERY_PROG:
-               xdp->prog_attached = virtnet_xdp_query(dev);
+               xdp->prog_id = virtnet_xdp_query(dev);
+               xdp->prog_attached = !!xdp->prog_id;
                return 0;
        default:
                return -EINVAL;

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index ad98a83f1332f3d27a5af5b5e89f28079e26c81d..7c7118b3bd692831e1c58e22c017d6985169b301 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -824,7 +824,10 @@ struct netdev_xdp {
                        struct netlink_ext_ack *extack;
                };
                /* XDP_QUERY_PROG */
-               bool prog_attached;
+               struct {
+                       bool prog_attached;
+                       u32 prog_id;
+               };
        };
 };
 
@@ -3302,7 +3305,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);
+bool __dev_xdp_attached(struct net_device *dev, xdp_op_t xdp_op, u32 *prog_id);
 
 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 8ed679fe603fcf013da907a6318b5a92f3ae681a..dd88375a6580268fe996282bbfd4f5e7a3c4b109 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -907,6 +907,7 @@ enum {
        IFLA_XDP_FD,
        IFLA_XDP_ATTACHED,
        IFLA_XDP_FLAGS,
+       IFLA_XDP_PROG_ID,
        __IFLA_XDP_MAX,
 };
 

diff --git a/net/core/dev.c b/net/core/dev.c
index 8658074ecad60b44ac7db2ac229773270eebdb65..b8d6dd9e8b5c7776d078738a2fd956e8e437aa67 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4342,13 +4342,12 @@ static struct static_key generic_xdp_needed __read_mostly;
 
 static int generic_xdp_install(struct net_device *dev, struct netdev_xdp *xdp)
 {
+       struct bpf_prog *old = rtnl_dereference(dev->xdp_prog);
        struct bpf_prog *new = xdp->prog;
        int ret = 0;
 
        switch (xdp->command) {
-       case XDP_SETUP_PROG: {
-               struct bpf_prog *old = rtnl_dereference(dev->xdp_prog);
-
+       case XDP_SETUP_PROG:
                rcu_assign_pointer(dev->xdp_prog, new);
                if (old)
                        bpf_prog_put(old);
@@ -4360,10 +4359,10 @@ static int generic_xdp_install(struct net_device *dev, struct netdev_xdp *xdp)
                        dev_disable_lro(dev);
                }
                break;
-       }
 
        case XDP_QUERY_PROG:
-               xdp->prog_attached = !!rcu_access_pointer(dev->xdp_prog);
+               xdp->prog_attached = !!old;
+               xdp->prog_id = old ? old->aux->id : 0;
                break;
 
        default:
@@ -6937,7 +6936,8 @@ 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)
+bool __dev_xdp_attached(struct net_device *dev, xdp_op_t xdp_op,
+                       u32 *prog_id)
 {
        struct netdev_xdp xdp;
 
@@ -6946,6 +6946,9 @@ bool __dev_xdp_attached(struct net_device *dev, xdp_op_t xdp_op)
 
        /* Query must always succeed. */
        WARN_ON(xdp_op(dev, &xdp) < 0);
+       if (prog_id)
+               *prog_id = xdp.prog_id;
+
        return xdp.prog_attached;
 }
 
@@ -6991,10 +6994,10 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,
                xdp_chk = generic_xdp_install;
 
        if (fd >= 0) {
-               if (xdp_chk && __dev_xdp_attached(dev, xdp_chk))
+               if (xdp_chk && __dev_xdp_attached(dev, xdp_chk, NULL))
                        return -EEXIST;
                if ((flags & XDP_FLAGS_UPDATE_IF_NOEXIST) &&
-                   __dev_xdp_attached(dev, xdp_op))
+                   __dev_xdp_attached(dev, xdp_op, NULL))
                        return -EBUSY;
 
                prog = bpf_prog_get_type(fd, BPF_PROG_TYPE_XDP);

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 2769ad9834d1135485f21185ce402d28b11a4299..3aa57848a8955bc4d2606103f9500319948f0727 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -39,6 +39,7 @@
 #include <linux/if_vlan.h>
 #include <linux/pci.h>
 #include <linux/etherdevice.h>
+#include <linux/bpf.h>
 
 #include <linux/uaccess.h>
 
@@ -899,7 +900,8 @@ static size_t rtnl_port_size(const struct net_device *dev,
 static size_t rtnl_xdp_size(void)
 {
        size_t xdp_size = nla_total_size(0) +   /* nest IFLA_XDP */
-                         nla_total_size(1);    /* XDP_ATTACHED */
+                         nla_total_size(1) +   /* XDP_ATTACHED */
+                         nla_total_size(4);    /* XDP_PROG_ID */
 
        return xdp_size;
 }
@@ -1248,15 +1250,20 @@ static int rtnl_fill_link_ifmap(struct sk_buff *skb, struct net_device *dev)
        return 0;
 }
 
-static u8 rtnl_xdp_attached_mode(struct net_device *dev)
+static u8 rtnl_xdp_attached_mode(struct net_device *dev, u32 *prog_id)
 {
        const struct net_device_ops *ops = dev->netdev_ops;
+       const struct bpf_prog *generic_xdp_prog;
 
        ASSERT_RTNL();
 
-       if (rcu_access_pointer(dev->xdp_prog))
+       *prog_id = 0;
+       generic_xdp_prog = rtnl_dereference(dev->xdp_prog);
+       if (generic_xdp_prog) {
+               *prog_id = generic_xdp_prog->aux->id;
                return XDP_ATTACHED_SKB;
-       if (ops->ndo_xdp && __dev_xdp_attached(dev, ops->ndo_xdp))
+       }
+       if (ops->ndo_xdp && __dev_xdp_attached(dev, ops->ndo_xdp, prog_id))
                return XDP_ATTACHED_DRV;
 
        return XDP_ATTACHED_NONE;
@@ -1265,6 +1272,7 @@ static u8 rtnl_xdp_attached_mode(struct net_device *dev)
 static int rtnl_xdp_fill(struct sk_buff *skb, struct net_device *dev)
 {
        struct nlattr *xdp;
+       u32 prog_id;
        int err;
 
        xdp = nla_nest_start(skb, IFLA_XDP);
@@ -1272,10 +1280,16 @@ static int rtnl_xdp_fill(struct sk_buff *skb, struct net_device *dev)
                return -EMSGSIZE;
 
        err = nla_put_u8(skb, IFLA_XDP_ATTACHED,
-                        rtnl_xdp_attached_mode(dev));
+                        rtnl_xdp_attached_mode(dev, &prog_id));
        if (err)
                goto err_cancel;
 
+       if (prog_id) {
+               err = nla_put_u32(skb, IFLA_XDP_PROG_ID, prog_id);
+               if (err)
+                       goto err_cancel;
+       }
+
        nla_nest_end(skb, xdp);
        return 0;
 
@@ -1553,6 +1567,7 @@ static const struct nla_policy ifla_xdp_policy[IFLA_XDP_MAX + 1] = {
        [IFLA_XDP_FD]           = { .type = NLA_S32 },
        [IFLA_XDP_ATTACHED]     = { .type = NLA_U8 },
        [IFLA_XDP_FLAGS]        = { .type = NLA_U32 },
+       [IFLA_XDP_PROG_ID]      = { .type = NLA_U32 },
 };
 
 static const struct rtnl_link_ops *linkinfo_to_kind_ops(const struct nlattr *nla)
@@ -2225,7 +2240,7 @@ static int do_setlink(const struct sk_buff *skb,
                if (err < 0)
                        goto errout;
 
-               if (xdp[IFLA_XDP_ATTACHED]) {
+               if (xdp[IFLA_XDP_ATTACHED] || xdp[IFLA_XDP_PROG_ID]) {
                        err = -EINVAL;
                        goto errout;
                }