[PATCH net-next 5/6] bonding: factor out XDP slave check

From: Hangbin Liu

Date: Fri Nov 13 2026 - 12:43:20 EST


From: Hangbin Liu <liuhangbin@xxxxxxxxxx>

bond_enslave() and bond_xdp_set() carry near-identical XDP slave
capability checks. Factor them into bond_slave_xdp_check() so the
two paths cannot drift apart.

The only behaviour difference is the netlink extack string in
bond_xdp_set(): "Slave device does not support XDP" becomes
"Slave does not support XDP" to match bond_enslave(). Logic and
return values are unchanged.

Signed-off-by: Hangbin Liu <liuhangbin@xxxxxxxxxx>
---
drivers/net/bonding/bond_main.c | 52 ++++++++++++++++++++++-------------------
1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index bb3752683456..5e36612cfaec 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1884,6 +1884,29 @@ void bond_xdp_set_features(struct net_device *bond_dev)
xdp_set_features_flag(bond_dev, val);
}

+/* Verify that slave_dev can take part in the bond's XDP datapath.
+ * Returns 0 if the slave is usable, otherwise -EOPNOTSUPP.
+ */
+static int bond_slave_xdp_check(struct net_device *bond_dev,
+ struct net_device *slave_dev,
+ struct netlink_ext_ack *extack)
+{
+ if (!slave_dev->netdev_ops->ndo_bpf ||
+ !slave_dev->netdev_ops->ndo_xdp_xmit) {
+ SLAVE_NL_ERR(bond_dev, slave_dev, extack,
+ "Slave does not support XDP");
+ return -EOPNOTSUPP;
+ }
+
+ if (dev_xdp_prog_count(slave_dev) > 0) {
+ SLAVE_NL_ERR(bond_dev, slave_dev, extack,
+ "Slave has XDP program loaded, please unload before enslaving");
+ return -EOPNOTSUPP;
+ }
+
+ return 0;
+}
+
/* Make the fully prepared slave visible to the rest of the bonding
* code. All fallible steps of bond_enslave() must have completed
* before this runs: error paths never undo the publication.
@@ -1982,17 +2005,9 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
* XDP can never become visible to bond_xdp_xmit().
*/
if (bond->xdp_prog) {
- if (!slave_ops->ndo_bpf || !slave_ops->ndo_xdp_xmit) {
- SLAVE_NL_ERR(bond_dev, slave_dev, extack,
- "Slave does not support XDP");
- return -EOPNOTSUPP;
- }
-
- if (dev_xdp_prog_count(slave_dev) > 0) {
- SLAVE_NL_ERR(bond_dev, slave_dev, extack,
- "Slave has XDP program loaded, please unload before enslaving");
- return -EOPNOTSUPP;
- }
+ res = bond_slave_xdp_check(bond_dev, slave_dev, extack);
+ if (res)
+ return res;
}

/* set bonding device ether type by slave - bonding netdevices are
@@ -5764,20 +5779,9 @@ static int bond_xdp_set(struct net_device *dev, struct bpf_prog *prog,
bond_for_each_slave(bond, slave, iter) {
struct net_device *slave_dev = slave->dev;

- if (!slave_dev->netdev_ops->ndo_bpf ||
- !slave_dev->netdev_ops->ndo_xdp_xmit) {
- SLAVE_NL_ERR(dev, slave_dev, extack,
- "Slave device does not support XDP");
- err = -EOPNOTSUPP;
+ err = bond_slave_xdp_check(dev, slave_dev, extack);
+ if (err)
goto err;
- }
-
- if (dev_xdp_prog_count(slave_dev) > 0) {
- SLAVE_NL_ERR(dev, slave_dev, extack,
- "Slave has XDP program loaded, please unload before enslaving");
- err = -EOPNOTSUPP;
- goto err;
- }

err = dev_xdp_propagate(slave_dev, &xdp);
if (err < 0) {

--
2.56.0