From: Sasha Levin Date: Fri, 23 May 2025 12:18:46 +0000 (-0400) Subject: Drop net-ethtool-prevent-flow-steering-to-rss-contexts-wh.patch X-Git-Tag: v6.12.31~90 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=370f4b9cd8abbc446b68efdbd6c6865b7a6484f6;p=thirdparty%2Fkernel%2Fstable-queue.git Drop net-ethtool-prevent-flow-steering-to-rss-contexts-wh.patch Signed-off-by: Sasha Levin --- 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 index 399ccc4c10..0000000000 --- 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 -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 - -[ 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 -Link: https://patch.msgid.link/20250206235334.1425329-2-kuba@kernel.org -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - 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 45b6dab0dc..8afd6c9a87 100644 --- 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 index a33ae7bf59..0000000000 --- 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 -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 - -[ 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 -Link: https://patch.msgid.link/20250206235334.1425329-2-kuba@kernel.org -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - 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 0f2d41e895..3266a50f60 100644 --- 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