From nobody Sun Feb 8 15:58:31 2026 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D09BD7D3E1 for ; Tue, 12 Mar 2024 16:10:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710259806; cv=none; b=SeXcFe4mh4mmOmv+TQ5veXmaLxWsICoNsLoms5XLtOhPfxQRb0u1kXoExxnaMnnGEzEytJfE7Iaeec4KTBQ2c9RphgjU8z+46MOVC23XtjS4LKXPj8Fkobev1GMhXBqFpig+vwADv7t0ODkfXgDQ2UqjflqIR8MZ3FeEclmIBVo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710259806; c=relaxed/simple; bh=G8C1oEjdrYjzoN8BtMudNJ3vM/Hhj9cwGQ+yfqEivJk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=ep8p6spDuw/FeOgcFQET1rC+HoKdfd3zidp1vO4LgWrPFg24NGxJZXCKmPfFAf6xpq3fShtzadT6hrYlPZX0L4QpSQhjwdcFBmsQxanyDxSw+leUvcursjeTup5RkrXKUi+wTJzUEN+2vYBrV2P/Kv7KfQeKyO24Z2YtqA3X6LU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com; spf=pass smtp.mailfrom=cloudflare.com; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b=TKm3kokM; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="TKm3kokM" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-4132a348546so14944085e9.1 for ; Tue, 12 Mar 2024 09:10:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1710259803; x=1710864603; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T8y9cotcn2YcwHYQkWcYzADrL0CgjgqPVI4Ap8W1Z/w=; b=TKm3kokMRVibK+WzOzuaGfhJbhQ4n22ai8Auf/duBPG0PIWjk1rm+6uH9Ga7ndfbh5 XlejJexZyRAICGAwSM8VUg0fPlhf+gq9JDjmchvi8MYY4rY1xhAuNZnfLloOgG/nGOom VPGzmRrxN8apNaq9l8hPzuL6z7DNZjGCAqilVETc822LkGVPDhm2ey7UgkIGomg36wpo l/hq5gxqkaEmh5RRTsGicqmMl+UbMAwaMr7DHav13jyXNqvH+kFpJHDKka2po3rVrEvM h0zCEhk4ZJMwpXDwNFctnykCxiX1yWJbf0lQvDAtYiu6++7iHrBxY0IVfAXxGZ+OUuGB wuJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710259803; x=1710864603; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T8y9cotcn2YcwHYQkWcYzADrL0CgjgqPVI4Ap8W1Z/w=; b=kiYo2xxoFMoxBw31WOMVRG+Qhdof77ZuiHDvQW/p7UfyUXwmI2j0DTKDEFdxgj3j32 dr46pv4tVrAbc0WXOBu0zwWwKAqIokns27yS3FoyiEeoFzDyQyr/R+aUohI9a9Phgucj dxLPASFYcw0rXXCC/Id0izBNSGn1EM8K9nCdyuKFeLkP4niICdzrIo/8n59a50OSlrxZ MBmuQGMV2I+fzfG+GFtklEH/1w6ny92ZGfA3B74StCebypRf7UlHIz7Arb6pVN3XWJSW 4wtGHBEcGtQd2el96fzm4iFTGJFPaH3ueiozKKeJswGZbrowig1PYW3mgQNT/m831O+y Hvcg== X-Forwarded-Encrypted: i=1; AJvYcCVLK3ZmkfjZAryRDjH3CojGQl07a8d9Iye8shgvBsHQszuWnFNP58PG1m5wKZHps0b3YqlyeQIwR9Uw3LMVIy/tXrfp7nPDa5R9RNKj X-Gm-Message-State: AOJu0YwMEGfYbaEvM24mbaBc377Vp9tdo8mzcuNvXRQsJYKGYRFT2Qy5 9mR8K0EZMLWHtdaegU8kCQSWlnzMEBCRtOUjPgGY26MDJ/LJ544a5ICR5QWwpLk= X-Google-Smtp-Source: AGHT+IHqfxZojQFqGYalatcTwN7r4+eqL0JqCeWkKtamZQWH4DLqUok57Uowustec7URYbqzuvnK8w== X-Received: by 2002:a05:600c:4508:b0:413:2a10:8a29 with SMTP id t8-20020a05600c450800b004132a108a29mr4223456wmo.13.1710259802871; Tue, 12 Mar 2024 09:10:02 -0700 (PDT) Received: from localhost.localdomain ([104.28.232.7]) by smtp.gmail.com with ESMTPSA id fl8-20020a05600c0b8800b00413e523b7f9sm474253wmb.43.2024.03.12.09.10.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 12 Mar 2024 09:10:02 -0700 (PDT) From: Ignat Korchagin To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel-team@cloudflare.com, Ignat Korchagin , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Subject: [PATCH net v2 1/2] net: veth: do not manipulate GRO when using XDP Date: Tue, 12 Mar 2024 16:05:51 +0000 Message-Id: <20240312160551.73184-2-ignat@cloudflare.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240312160551.73184-1-ignat@cloudflare.com> References: <20240312160551.73184-1-ignat@cloudflare.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Commit d3256efd8e8b ("veth: allow enabling NAPI even without XDP") tried to= fix the fact that GRO was not possible without XDP, because veth did not use NA= PI without XDP. However, it also introduced the behaviour that GRO is always enabled, when XDP is enabled. While it might be desired for most cases, it is confusing for the user at b= est as the GRO flag suddenly changes, when an XDP program is attached. It also introduces some complexities in state management as was partially addressed= in commit fe9f801355f0 ("net: veth: clear GRO when clearing XDP even when down= "). But the biggest problem is that it is not possible to disable GRO at all, w= hen an XDP program is attached, which might be needed for some use cases. Fix this by not touching the GRO flag on XDP enable/disable as the code alr= eady supports switching to NAPI if either GRO or XDP is requested. Changes in v2: * add Fixes reference to commit description * fix commit message spelling Link: https://lore.kernel.org/lkml/20240311124015.38106-1-ignat@cloudflare.= com/ Fixes: d3256efd8e8b ("veth: allow enabling NAPI even without XDP") Fixes: fe9f801355f0 ("net: veth: clear GRO when clearing XDP even when down= ") Signed-off-by: Ignat Korchagin Reviewed-by: Toke H=C3=B8iland-J=C3=B8rgensen --- drivers/net/veth.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/net/veth.c b/drivers/net/veth.c index cd4a6fe458f9..f0b2c4d5fe43 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -1533,8 +1533,6 @@ static netdev_features_t veth_fix_features(struct net= _device *dev, if (peer_priv->_xdp_prog) features &=3D ~NETIF_F_GSO_SOFTWARE; } - if (priv->_xdp_prog) - features |=3D NETIF_F_GRO; =20 return features; } @@ -1638,14 +1636,6 @@ static int veth_xdp_set(struct net_device *dev, stru= ct bpf_prog *prog, } =20 if (!old_prog) { - if (!veth_gro_requested(dev)) { - /* user-space did not require GRO, but adding - * XDP is supposed to get GRO working - */ - dev->features |=3D NETIF_F_GRO; - netdev_features_change(dev); - } - peer->hw_features &=3D ~NETIF_F_GSO_SOFTWARE; peer->max_mtu =3D max_mtu; } @@ -1661,14 +1651,6 @@ static int veth_xdp_set(struct net_device *dev, stru= ct bpf_prog *prog, if (dev->flags & IFF_UP) veth_disable_xdp(dev); =20 - /* if user-space did not require GRO, since adding XDP - * enabled it, clear it now - */ - if (!veth_gro_requested(dev)) { - dev->features &=3D ~NETIF_F_GRO; - netdev_features_change(dev); - } - if (peer) { peer->hw_features |=3D NETIF_F_GSO_SOFTWARE; peer->max_mtu =3D ETH_MAX_MTU; --=20 2.39.2 From nobody Sun Feb 8 15:58:31 2026 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 058267D3E1 for ; Tue, 12 Mar 2024 16:10:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710259812; cv=none; b=jN8zJhg9mrJKpWiQcB/QbHxPnKti77oNdpL3pJrrX3bHjs47Fxks7UsPgXnC0o+44w2auh0AK7QKv3Ek/XOQgN+krKZRAJ1f+c18mMNg5nsxyFihxLYGO0QYdDP96kFNc8avUyCs2Mq+/xBv3mJ66YcKB/8mKZ36fwjfZebd5nQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710259812; c=relaxed/simple; bh=Fc7O8sfBRRb8zOY1eOkMRYKNnB5ApRvE6ZnNgsRMbYg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=C0OLBO3BUwCtbnPv2v9uEzXlWeyqfntjimolugSY9+ryIaBJUJMVWbJ7OjBlslbcTjcsOyS9epZZKr6YbAndbRWE0i/pp21Vjc+/6+H6UcTK/vtgeHnu9178HRQSP9adV2TPfIc0Jm0rYQ/W6+X11ig5Si0kt5bWJC2fiHiusWU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com; spf=pass smtp.mailfrom=cloudflare.com; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b=WfeGElob; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="WfeGElob" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-413e642806fso1207715e9.2 for ; Tue, 12 Mar 2024 09:10:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1710259809; x=1710864609; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9wNUX9DZCZhkOtkzBdWY6lDTHbYdRFBZXQzvAC4CccA=; b=WfeGElob94iVcNvEUrLD+hD8IJpTbHvgaI3ykcUz8EI9MyeYXhnmblK0VLvuzDGKsL oKXQtHwEO1cmNl5w4j2qseyBWbAazM1QmqOzgOthxNx3OKFIaDhZvU42AKfwwmZPg41m LTLf0BDBJ99PkNAT0M+hff4C6aieJsbpfwCIIKuxlr8cN0lFON4R11oxp3GvHnXUbfSA xr1NKAzkqFqX7YSCTYWTrypKMyBQ8XsxnNzDIEFQ8cl5BSKKXdD4lH6W7ylDOYOIm8Sg D/U7aPYXT43vgaGjOPX2iVG0G1YsD/AvjjK9SJtEZ/ckdrLLgN6USca979ApfivmtwpI ILeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710259809; x=1710864609; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9wNUX9DZCZhkOtkzBdWY6lDTHbYdRFBZXQzvAC4CccA=; b=OaXbwTydZ0O4ydUFHm8RSQ86QqtPLNWAMSTMceYf057xmVo36qpbfzID194LTTiwd2 vANk4yAzC/H7VqZ+60kggaOYvLotyzRUXd5XdUb3gcdEvZPSKeJdoeaK692dCOkNkkaj ZJLfEwDgnSETcrmh8qsWDtnZ82jI77ptxVg8dje+6MCmc2Sv3H91VDo1VcpxZjmjazkV cp9Ph4yTfonpYAx14Glf+6soBPKNETP8MR6hfS6mdFiZ8CHyyrsP94xxk/U0TAjqPWBA Hmym3bslXy9K9L7NNgRfEegmVKreG2DswGt/KW6F09m/YZbINiSDHEFoMq7i9m2oZsAY ojwA== X-Forwarded-Encrypted: i=1; AJvYcCVq2wFCMti9Z258AACdLYJ4tNESjyAdxLUSL6rKhoAbQgwo1DNqHQDwSciOqHkdplj3L+iN5AFORIjVanwrNPGgu+Pz45PwuMWaN0Xk X-Gm-Message-State: AOJu0YyOQEoGaEg8J5GBr3gAo9K1FIbSstrBgL4eWWWfglRDvAJfAT/7 VqGsGxBIl7X0e0XzcH2nsn+qrpj0JFACOvqcRLdlAP8TChR4Jfwa11j69qichp4= X-Google-Smtp-Source: AGHT+IF+bWouiIFf+uP88Mr8eQSuWHP1533kqdq4LfgBW7SC7cEl/s7h/DffeGifPPsn3+G8rECSuw== X-Received: by 2002:a05:600c:4690:b0:412:95fb:e41 with SMTP id p16-20020a05600c469000b0041295fb0e41mr1840249wmo.24.1710259809271; Tue, 12 Mar 2024 09:10:09 -0700 (PDT) Received: from localhost.localdomain ([104.28.232.7]) by smtp.gmail.com with ESMTPSA id fl8-20020a05600c0b8800b00413e523b7f9sm474253wmb.43.2024.03.12.09.10.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 12 Mar 2024 09:10:08 -0700 (PDT) From: Ignat Korchagin To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel-team@cloudflare.com, Ignat Korchagin Subject: [PATCH net v2 2/2] selftests: net: veth: test the ability to independently manipulate GRO and XDP Date: Tue, 12 Mar 2024 16:05:52 +0000 Message-Id: <20240312160551.73184-3-ignat@cloudflare.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240312160551.73184-1-ignat@cloudflare.com> References: <20240312160551.73184-1-ignat@cloudflare.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We should be able to independently flip either XDP or GRO states and toggli= ng one should not affect the other. Signed-off-by: Ignat Korchagin --- tools/testing/selftests/net/veth.sh | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/veth.sh b/tools/testing/selftests/= net/veth.sh index 5ae85def0739..3a394b43e274 100755 --- a/tools/testing/selftests/net/veth.sh +++ b/tools/testing/selftests/net/veth.sh @@ -249,9 +249,9 @@ cleanup create_ns ip -n $NS_DST link set dev veth$DST up ip -n $NS_DST link set dev veth$DST xdp object ${BPF_FILE} section xdp -chk_gro_flag "gro vs xdp while down - gro flag on" $DST on +chk_gro_flag "gro vs xdp while down - gro flag off" $DST off ip -n $NS_DST link set dev veth$DST down -chk_gro_flag " - after down" $DST on +chk_gro_flag " - after down" $DST off ip -n $NS_DST link set dev veth$DST xdp off chk_gro_flag " - after xdp off" $DST off ip -n $NS_DST link set dev veth$DST up @@ -260,6 +260,21 @@ ip -n $NS_SRC link set dev veth$SRC xdp object ${BPF_F= ILE} section xdp chk_gro_flag " - after peer xdp" $DST off cleanup =20 +create_ns +ip -n $NS_DST link set dev veth$DST up +ip -n $NS_DST link set dev veth$DST xdp object ${BPF_FILE} section xdp +ip netns exec $NS_DST ethtool -K veth$DST generic-receive-offload on +chk_gro_flag "gro vs xdp while down - gro flag on" $DST on +ip -n $NS_DST link set dev veth$DST down +chk_gro_flag " - after down" $DST on +ip -n $NS_DST link set dev veth$DST xdp off +chk_gro_flag " - after xdp off" $DST on +ip -n $NS_DST link set dev veth$DST up +chk_gro_flag " - after up" $DST on +ip -n $NS_SRC link set dev veth$SRC xdp object ${BPF_FILE} section xdp +chk_gro_flag " - after peer xdp" $DST on +cleanup + create_ns chk_channels "default channels" $DST 1 1 =20 @@ -327,11 +342,14 @@ if [ $CPUS -gt 2 ]; then fi =20 ip -n $NS_DST link set dev veth$DST xdp object ${BPF_FILE} section xdp 2>/= dev/null -chk_gro_flag "with xdp attached - gro flag" $DST on +chk_gro_flag "with xdp attached - gro flag" $DST off chk_gro_flag " - peer gro flag" $SRC off chk_tso_flag " - tso flag" $SRC off chk_tso_flag " - peer tso flag" $DST on ip netns exec $NS_DST ethtool -K veth$DST rx-udp-gro-forwarding on +chk_gro " - no aggregation" 10 +ip netns exec $NS_DST ethtool -K veth$DST generic-receive-offload on +chk_gro_flag " - gro flag with GRO on" $DST on chk_gro " - aggregation" 1 =20 =20 --=20 2.39.2