From patchwork Sun Apr 30 10:02:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 13227179 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C51EC77B7C for ; Sun, 30 Apr 2023 10:02:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229513AbjD3KC4 (ORCPT ); Sun, 30 Apr 2023 06:02:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229565AbjD3KCz (ORCPT ); Sun, 30 Apr 2023 06:02:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60810213E; Sun, 30 Apr 2023 03:02:54 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 57E5361307; Sun, 30 Apr 2023 10:02:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3096AC433EF; Sun, 30 Apr 2023 10:02:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682848972; bh=/btdq5rgfT++kj3zrOz6f2xeLAKIuCUhQHgcDyc+0p4=; h=From:To:Cc:Subject:Date:From; b=bhbUBxfTlLn8fxz2b9JSx9X/QtK8RmJHR/cmH4zz0nt58xe1vxCHJfvXgAxUw5KRy hQ9/WqcYA0akFiP3Y3D21sh1DnpdYM+EDbtjnVYSetmXTIcY7h10I7kNVY7v0347ZB l3NedKyOfLUCw6VoZq2lG4aelCjpSuXdX9oCbEep6pNsDyTKwpY4o/OkqOFxEQESNV yiNPftqp90b91uSvlMwiw/sEFQv3zqqqlPDfzKFFand4bfvfdv+v6FSl8yivKzz78k Tt+95q1CaO0IJzq/W3IiKoPlATbt+Vsy1o4+7PQUT5gtt/e1JX76ccCL3D7WTiFy41 YlOPzrjvDsGkg== From: Lorenzo Bianconi To: netdev@vger.kernel.org Cc: lorenzo.bianconi@redhat.com, j.vosburgh@gmail.com, andy@greyhouse.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, bpf@vger.kernel.org, andrii@kernel.org, mykolal@fb.com, ast@kernel.org, daniel@iogearbox.net, martin.lau@linux.dev, alardam@gmail.com, memxor@gmail.com, sdf@google.com, brouer@redhat.com, toke@redhat.com Subject: [PATCH v2 net] bonding: add xdp_features support Date: Sun, 30 Apr 2023 12:02:44 +0200 Message-Id: X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Introduce xdp_features support for bonding driver according to the slave devices attached to the master one. xdp_features is required whenever we want to xdp_redirect traffic into a bond device and then into selected slaves attached to it. Fixes: 66c0e13ad236 ("drivers: net: turn on XDP features") Signed-off-by: Lorenzo Bianconi Reviewed-by: Simon Horman Acked-by: Jay Vosburgh --- Change since v1: - remove bpf self-test patch from the series --- drivers/net/bonding/bond_main.c | 48 ++++++++++++++++++++++++++++++ drivers/net/bonding/bond_options.c | 2 ++ include/net/bonding.h | 1 + 3 files changed, 51 insertions(+) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 710548dbd0c1..c98121b426a4 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1789,6 +1789,45 @@ static void bond_ether_setup(struct net_device *bond_dev) bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING; } +void bond_xdp_set_features(struct net_device *bond_dev) +{ + struct bonding *bond = netdev_priv(bond_dev); + xdp_features_t val = NETDEV_XDP_ACT_MASK; + struct list_head *iter; + struct slave *slave; + + ASSERT_RTNL(); + + if (!bond_xdp_check(bond)) { + xdp_clear_features_flag(bond_dev); + return; + } + + bond_for_each_slave(bond, slave, iter) { + struct net_device *dev = slave->dev; + + if (!(dev->xdp_features & NETDEV_XDP_ACT_BASIC)) { + xdp_clear_features_flag(bond_dev); + return; + } + + if (!(dev->xdp_features & NETDEV_XDP_ACT_REDIRECT)) + val &= ~NETDEV_XDP_ACT_REDIRECT; + if (!(dev->xdp_features & NETDEV_XDP_ACT_NDO_XMIT)) + val &= ~NETDEV_XDP_ACT_NDO_XMIT; + if (!(dev->xdp_features & NETDEV_XDP_ACT_XSK_ZEROCOPY)) + val &= ~NETDEV_XDP_ACT_XSK_ZEROCOPY; + if (!(dev->xdp_features & NETDEV_XDP_ACT_HW_OFFLOAD)) + val &= ~NETDEV_XDP_ACT_HW_OFFLOAD; + if (!(dev->xdp_features & NETDEV_XDP_ACT_RX_SG)) + val &= ~NETDEV_XDP_ACT_RX_SG; + if (!(dev->xdp_features & NETDEV_XDP_ACT_NDO_XMIT_SG)) + val &= ~NETDEV_XDP_ACT_NDO_XMIT_SG; + } + + xdp_set_features_flag(bond_dev, val); +} + /* enslave device to bond device */ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, struct netlink_ext_ack *extack) @@ -2236,6 +2275,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, bpf_prog_inc(bond->xdp_prog); } + bond_xdp_set_features(bond_dev); + slave_info(bond_dev, slave_dev, "Enslaving as %s interface with %s link\n", bond_is_active_slave(new_slave) ? "an active" : "a backup", new_slave->link != BOND_LINK_DOWN ? "an up" : "a down"); @@ -2483,6 +2524,7 @@ static int __bond_release_one(struct net_device *bond_dev, if (!netif_is_bond_master(slave_dev)) slave_dev->priv_flags &= ~IFF_BONDING; + bond_xdp_set_features(bond_dev); kobject_put(&slave->kobj); return 0; @@ -3930,6 +3972,9 @@ static int bond_slave_netdev_event(unsigned long event, /* Propagate to master device */ call_netdevice_notifiers(event, slave->bond->dev); break; + case NETDEV_XDP_FEAT_CHANGE: + bond_xdp_set_features(bond_dev); + break; default: break; } @@ -5874,6 +5919,9 @@ void bond_setup(struct net_device *bond_dev) if (BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP) bond_dev->features |= BOND_XFRM_FEATURES; #endif /* CONFIG_XFRM_OFFLOAD */ + + if (bond_xdp_check(bond)) + bond_dev->xdp_features = NETDEV_XDP_ACT_MASK; } /* Destroy a bonding device. diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index f71d5517f829..0498fc6731f8 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c @@ -877,6 +877,8 @@ static int bond_option_mode_set(struct bonding *bond, netdev_update_features(bond->dev); } + bond_xdp_set_features(bond->dev); + return 0; } diff --git a/include/net/bonding.h b/include/net/bonding.h index c3843239517d..a60a24923b55 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -659,6 +659,7 @@ void bond_destroy_sysfs(struct bond_net *net); void bond_prepare_sysfs_group(struct bonding *bond); int bond_sysfs_slave_add(struct slave *slave); void bond_sysfs_slave_del(struct slave *slave); +void bond_xdp_set_features(struct net_device *bond_dev); int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, struct netlink_ext_ack *extack); int bond_release(struct net_device *bond_dev, struct net_device *slave_dev);