Drop net-ethtool-prevent-flow-steering-to-rss-contexts-wh.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.12/net-ethtool-prevent-flow-steering-to-rss-contexts-wh.patch b/queue-6.12/net-ethtool-prevent-flow-steering-to-rss-contexts-wh.patch
deleted file mode 100644 (file)
index 399ccc4..0000000
--- a/queue-6.12/net-ethtool-prevent-flow-steering-to-rss-contexts-wh.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 78153538a016587abd0c3ceded6e4b8895dbadcc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 6 Feb 2025 15:53:28 -0800
-Subject: net: ethtool: prevent flow steering to RSS contexts which don't exist
-
-From: Jakub Kicinski <kuba@kernel.org>
-
-[ Upstream commit de7f7582dff292832fbdeaeff34e6b2ee6f9f95f ]
-
-Since commit 42dc431f5d0e ("ethtool: rss: prevent rss ctx deletion
-when in use") we prevent removal of RSS contexts pointed to by
-existing flow rules. Core should also prevent creation of rules
-which point to RSS context which don't exist in the first place.
-
-Reviewed-by: Joe Damato <jdamato@fastly.com>
-Link: https://patch.msgid.link/20250206235334.1425329-2-kuba@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/ethtool/ioctl.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
-index 8b9692c35e706..6ed01cec97a8e 100644
---- a/net/ethtool/ioctl.c
-+++ b/net/ethtool/ioctl.c
-@@ -993,10 +993,14 @@ static noinline_for_stack int ethtool_set_rxnfc(struct net_device *dev,
-               return rc;
- 
-       /* Nonzero ring with RSS only makes sense if NIC adds them together */
--      if (cmd == ETHTOOL_SRXCLSRLINS && info.fs.flow_type & FLOW_RSS &&
--          !ops->cap_rss_rxnfc_adds &&
--          ethtool_get_flow_spec_ring(info.fs.ring_cookie))
--              return -EINVAL;
-+      if (cmd == ETHTOOL_SRXCLSRLINS && info.fs.flow_type & FLOW_RSS) {
-+              if (!ops->cap_rss_rxnfc_adds &&
-+                  ethtool_get_flow_spec_ring(info.fs.ring_cookie))
-+                      return -EINVAL;
-+
-+              if (!xa_load(&dev->ethtool->rss_ctx, info.rss_context))
-+                      return -EINVAL;
-+      }
- 
-       if (cmd == ETHTOOL_SRXFH && ops->get_rxfh) {
-               struct ethtool_rxfh_param rxfh = {};
--- 
-2.39.5
-

diff --git a/queue-6.12/series b/queue-6.12/series
index 45b6dab0dc73e4da98e75367939f2ac2a4a3bdcb..8afd6c9a878d1b30c9e51ededbd19a4ce702df2c 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -440,7 +440,6 @@ r8152-add-vendor-device-id-pair-for-dell-alienware-a.patch
 iio-adc-ad7944-don-t-use-storagebits-for-sizing.patch
 pstore-change-kmsg_bytes-storage-size-to-u32.patch
 leds-trigger-netdev-configure-led-blink-interval-for.patch
-net-ethtool-prevent-flow-steering-to-rss-contexts-wh.patch
 ext4-don-t-write-back-data-before-punch-hole-in-nojo.patch
 ext4-remove-writable-userspace-mappings-before-trunc.patch
 wifi-rtw88-fix-download_firmware_validate-for-rtl881.patch

diff --git a/queue-6.14/net-ethtool-prevent-flow-steering-to-rss-contexts-wh.patch b/queue-6.14/net-ethtool-prevent-flow-steering-to-rss-contexts-wh.patch
deleted file mode 100644 (file)
index a33ae7b..0000000
--- a/queue-6.14/net-ethtool-prevent-flow-steering-to-rss-contexts-wh.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 845cdfd025cb2eac5c949cecf90e9470493a1662 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 6 Feb 2025 15:53:28 -0800
-Subject: net: ethtool: prevent flow steering to RSS contexts which don't exist
-
-From: Jakub Kicinski <kuba@kernel.org>
-
-[ Upstream commit de7f7582dff292832fbdeaeff34e6b2ee6f9f95f ]
-
-Since commit 42dc431f5d0e ("ethtool: rss: prevent rss ctx deletion
-when in use") we prevent removal of RSS contexts pointed to by
-existing flow rules. Core should also prevent creation of rules
-which point to RSS context which don't exist in the first place.
-
-Reviewed-by: Joe Damato <jdamato@fastly.com>
-Link: https://patch.msgid.link/20250206235334.1425329-2-kuba@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/ethtool/ioctl.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
-index 1c3ba2247776b..0d3a70a18884f 100644
---- a/net/ethtool/ioctl.c
-+++ b/net/ethtool/ioctl.c
-@@ -993,10 +993,14 @@ static noinline_for_stack int ethtool_set_rxnfc(struct net_device *dev,
-               return rc;
- 
-       /* Nonzero ring with RSS only makes sense if NIC adds them together */
--      if (cmd == ETHTOOL_SRXCLSRLINS && info.fs.flow_type & FLOW_RSS &&
--          !ops->cap_rss_rxnfc_adds &&
--          ethtool_get_flow_spec_ring(info.fs.ring_cookie))
--              return -EINVAL;
-+      if (cmd == ETHTOOL_SRXCLSRLINS && info.fs.flow_type & FLOW_RSS) {
-+              if (!ops->cap_rss_rxnfc_adds &&
-+                  ethtool_get_flow_spec_ring(info.fs.ring_cookie))
-+                      return -EINVAL;
-+
-+              if (!xa_load(&dev->ethtool->rss_ctx, info.rss_context))
-+                      return -EINVAL;
-+      }
- 
-       if (cmd == ETHTOOL_SRXFH && ops->get_rxfh) {
-               struct ethtool_rxfh_param rxfh = {};
--- 
-2.39.5
-

diff --git a/queue-6.14/series b/queue-6.14/series
index 0f2d41e89527fbb477bf794065e5b07f780c19cc..3266a50f602be1d320233328e9f63ad591fc7b5a 100644 (file)
--- a/queue-6.14/series
+++ b/queue-6.14/series
@@ -553,7 +553,6 @@ iio-adc-ad7944-don-t-use-storagebits-for-sizing.patch
 igc-avoid-unnecessary-link-down-event-in-xdp_setup_p.patch
 pstore-change-kmsg_bytes-storage-size-to-u32.patch
 leds-trigger-netdev-configure-led-blink-interval-for.patch
-net-ethtool-prevent-flow-steering-to-rss-contexts-wh.patch
 ext4-don-t-write-back-data-before-punch-hole-in-nojo.patch
 ext4-remove-writable-userspace-mappings-before-trunc.patch
 wifi-rtw88-fix-rtw_update_sta_info-for-rtl8814au.patch