mirror of
https://github.com/netdata/libbpf.git
synced 2026-03-24 10:19:07 +08:00
fbd60dbff5
Fix test_progs failure xdp_bonding/xdp_bonding_redirect_multi with a missing commit (in bpf, but not in bpf-next yet). Signed-off-by: Song Liu <song@kernel.org>
84 lines
2.8 KiB
Diff
84 lines
2.8 KiB
Diff
From 8267fc71abb2dc47338570e56dd3473a58313fce Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Mon, 17 Apr 2023 23:53:22 +0200
|
|
Subject: [PATCH] veth: take into account peer device for
|
|
NETDEV_XDP_ACT_NDO_XMIT xdp_features flag
|
|
|
|
For veth pairs, NETDEV_XDP_ACT_NDO_XMIT is supported by the current
|
|
device if the peer one is running a XDP program or if it has GRO enabled.
|
|
Fix the xdp_features flags reporting considering peer device and not
|
|
current one for NETDEV_XDP_ACT_NDO_XMIT.
|
|
|
|
Fixes: fccca038f300 ("veth: take into account device reconfiguration for xdp_features flag")
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://lore.kernel.org/r/4f1ca6f6f6b42ae125bfdb5c7782217c83968b2e.1681767806.git.lorenzo@kernel.org
|
|
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
|
|
---
|
|
drivers/net/veth.c | 17 +++++++++++------
|
|
1 file changed, 11 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
|
|
index e1b38fbf1dd9..4b3c6647edc6 100644
|
|
--- a/drivers/net/veth.c
|
|
+++ b/drivers/net/veth.c
|
|
@@ -1262,11 +1262,12 @@ static void veth_set_xdp_features(struct net_device *dev)
|
|
|
|
peer = rtnl_dereference(priv->peer);
|
|
if (peer && peer->real_num_tx_queues <= dev->real_num_rx_queues) {
|
|
+ struct veth_priv *priv_peer = netdev_priv(peer);
|
|
xdp_features_t val = NETDEV_XDP_ACT_BASIC |
|
|
NETDEV_XDP_ACT_REDIRECT |
|
|
NETDEV_XDP_ACT_RX_SG;
|
|
|
|
- if (priv->_xdp_prog || veth_gro_requested(dev))
|
|
+ if (priv_peer->_xdp_prog || veth_gro_requested(peer))
|
|
val |= NETDEV_XDP_ACT_NDO_XMIT |
|
|
NETDEV_XDP_ACT_NDO_XMIT_SG;
|
|
xdp_set_features_flag(dev, val);
|
|
@@ -1504,19 +1505,23 @@ static int veth_set_features(struct net_device *dev,
|
|
{
|
|
netdev_features_t changed = features ^ dev->features;
|
|
struct veth_priv *priv = netdev_priv(dev);
|
|
+ struct net_device *peer;
|
|
int err;
|
|
|
|
if (!(changed & NETIF_F_GRO) || !(dev->flags & IFF_UP) || priv->_xdp_prog)
|
|
return 0;
|
|
|
|
+ peer = rtnl_dereference(priv->peer);
|
|
if (features & NETIF_F_GRO) {
|
|
err = veth_napi_enable(dev);
|
|
if (err)
|
|
return err;
|
|
|
|
- xdp_features_set_redirect_target(dev, true);
|
|
+ if (peer)
|
|
+ xdp_features_set_redirect_target(peer, true);
|
|
} else {
|
|
- xdp_features_clear_redirect_target(dev);
|
|
+ if (peer)
|
|
+ xdp_features_clear_redirect_target(peer);
|
|
veth_napi_del(dev);
|
|
}
|
|
return 0;
|
|
@@ -1598,13 +1603,13 @@ static int veth_xdp_set(struct net_device *dev, struct bpf_prog *prog,
|
|
peer->max_mtu = max_mtu;
|
|
}
|
|
|
|
- xdp_features_set_redirect_target(dev, true);
|
|
+ xdp_features_set_redirect_target(peer, true);
|
|
}
|
|
|
|
if (old_prog) {
|
|
if (!prog) {
|
|
- if (!veth_gro_requested(dev))
|
|
- xdp_features_clear_redirect_target(dev);
|
|
+ if (peer && !veth_gro_requested(dev))
|
|
+ xdp_features_clear_redirect_target(peer);
|
|
|
|
if (dev->flags & IFF_UP)
|
|
veth_disable_xdp(dev);
|
|
--
|
|
2.34.1
|
|
|