net: refactor ->ndo_bpf calls into dev_xdp_propagate

When net devices propagate xdp configurations to slave devices,
we will need to perform a memory provider check to ensure we're
not binding xdp to a device using unreadable netmem.

Currently the ->ndo_bpf calls in a few places. Adding checks to all
these places would not be ideal.

Refactor all the ->ndo_bpf calls into one place where we can add this
check in the future.

Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Mina Almasry <almasrymina@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 96f5470a5f5546333658ba8cb21a21e18a4542cd..a3b6e6c696b4e606e35298c820f9e6a25e5d2c28 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2253,7 +2253,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
                        goto err_sysfs_del;
                }
 
-               res = slave_dev->netdev_ops->ndo_bpf(slave_dev, &xdp);
+               res = dev_xdp_propagate(slave_dev, &xdp);
                if (res < 0) {
                        /* ndo_bpf() sets extack error message */
                        slave_dbg(bond_dev, slave_dev, "Error %d calling ndo_bpf\n", res);
@@ -2389,7 +2389,7 @@ static int __bond_release_one(struct net_device *bond_dev,
                        .prog    = NULL,
                        .extack  = NULL,
                };
-               if (slave_dev->netdev_ops->ndo_bpf(slave_dev, &xdp))
+               if (dev_xdp_propagate(slave_dev, &xdp))
                        slave_warn(bond_dev, slave_dev, "failed to unload XDP program\n");
        }
 
@@ -5579,7 +5579,7 @@ static int bond_xdp_set(struct net_device *dev, struct bpf_prog *prog,
                        goto err;
                }
 
-               err = slave_dev->netdev_ops->ndo_bpf(slave_dev, &xdp);
+               err = dev_xdp_propagate(slave_dev, &xdp);
                if (err < 0) {
                        /* ndo_bpf() sets extack error message */
                        slave_err(dev, slave_dev, "Error %d calling ndo_bpf\n", err);
@@ -5611,7 +5611,7 @@ err:
                if (slave == rollback_slave)
                        break;
 
-               err_unwind = slave_dev->netdev_ops->ndo_bpf(slave_dev, &xdp);
+               err_unwind = dev_xdp_propagate(slave_dev, &xdp);
                if (err_unwind < 0)
                        slave_err(dev, slave_dev,
                                  "Error %d when unwinding XDP program change\n", err_unwind);

diff --git a/drivers/net/hyperv/netvsc_bpf.c b/drivers/net/hyperv/netvsc_bpf.c
index 4a9522689fa4fa1b9fcc9bc22fb13ac3ab7818a0..e01c5997a551c6cc58dda63a355c578a81a39bfb 100644 (file)
--- a/drivers/net/hyperv/netvsc_bpf.c
+++ b/drivers/net/hyperv/netvsc_bpf.c
@@ -183,7 +183,7 @@ int netvsc_vf_setxdp(struct net_device *vf_netdev, struct bpf_prog *prog)
        xdp.command = XDP_SETUP_PROG;
        xdp.prog = prog;
 
-       ret = vf_netdev->netdev_ops->ndo_bpf(vf_netdev, &xdp);
+       ret = dev_xdp_propagate(vf_netdev, &xdp);
 
        if (ret && prog)
                bpf_prog_put(prog);

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 289a6133769c2b87e27dbe6adeb58addb03e1ded..7dfa836d9dbf8ae2a8991c6f39c5c4baaf7b45da 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3925,6 +3925,7 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
 
 int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog);
 u8 dev_xdp_prog_count(struct net_device *dev);
+int dev_xdp_propagate(struct net_device *dev, struct netdev_bpf *bpf);
 u32 dev_xdp_prog_id(struct net_device *dev, enum bpf_xdp_mode mode);
 
 int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb);

diff --git a/net/core/dev.c b/net/core/dev.c
index d0e7483abdcdcc17cbb200de8e0293ba64b31c25..271d6aa0cfb915030a6e9b1c9d013eb66549fd5b 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -9370,6 +9370,15 @@ u8 dev_xdp_prog_count(struct net_device *dev)
 }
 EXPORT_SYMBOL_GPL(dev_xdp_prog_count);
 
+int dev_xdp_propagate(struct net_device *dev, struct netdev_bpf *bpf)
+{
+       if (!dev->netdev_ops->ndo_bpf)
+               return -EOPNOTSUPP;
+
+       return dev->netdev_ops->ndo_bpf(dev, bpf);
+}
+EXPORT_SYMBOL_GPL(dev_xdp_propagate);
+
 u32 dev_xdp_prog_id(struct net_device *dev, enum bpf_xdp_mode mode)
 {
        struct bpf_prog *prog = dev_xdp_prog(dev, mode);