From: Greg Kroah-Hartman Date: Fri, 8 Nov 2024 07:37:32 +0000 (+0100) Subject: drop igb patch as it is being reverted X-Git-Tag: v4.19.323~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ee0cda5389e1417585757fccfac1bbc0aa80904;p=thirdparty%2Fkernel%2Fstable-queue.git drop igb patch as it is being reverted --- diff --git a/queue-4.19/igb-disable-threaded-irq-for-igb_msix_other.patch b/queue-4.19/igb-disable-threaded-irq-for-igb_msix_other.patch deleted file mode 100644 index ac7be127398..00000000000 --- a/queue-4.19/igb-disable-threaded-irq-for-igb_msix_other.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 4218875d87f8973c20320d160c6a49dfeb0e6399 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 21 Oct 2024 16:26:24 -0700 -Subject: igb: Disable threaded IRQ for igb_msix_other - -From: Wander Lairson Costa - -[ Upstream commit 338c4d3902feb5be49bfda530a72c7ab860e2c9f ] - -During testing of SR-IOV, Red Hat QE encountered an issue where the -ip link up command intermittently fails for the igbvf interfaces when -using the PREEMPT_RT variant. Investigation revealed that -e1000_write_posted_mbx returns an error due to the lack of an ACK -from e1000_poll_for_ack. - -The underlying issue arises from the fact that IRQs are threaded by -default under PREEMPT_RT. While the exact hardware details are not -available, it appears that the IRQ handled by igb_msix_other must -be processed before e1000_poll_for_ack times out. However, -e1000_write_posted_mbx is called with preemption disabled, leading -to a scenario where the IRQ is serviced only after the failure of -e1000_write_posted_mbx. - -To resolve this, we set IRQF_NO_THREAD for the affected interrupt, -ensuring that the kernel handles it immediately, thereby preventing -the aforementioned error. - -Reproducer: - - #!/bin/bash - - # echo 2 > /sys/class/net/ens14f0/device/sriov_numvfs - ipaddr_vlan=3 - nic_test=ens14f0 - vf=${nic_test}v0 - - while true; do - ip link set ${nic_test} mtu 1500 - ip link set ${vf} mtu 1500 - ip link set $vf up - ip link set ${nic_test} vf 0 vlan ${ipaddr_vlan} - ip addr add 172.30.${ipaddr_vlan}.1/24 dev ${vf} - ip addr add 2021:db8:${ipaddr_vlan}::1/64 dev ${vf} - if ! ip link show $vf | grep 'state UP'; then - echo 'Error found' - break - fi - ip link set $vf down - done - -Signed-off-by: Wander Lairson Costa -Fixes: 9d5c824399de ("igb: PCI-Express 82575 Gigabit Ethernet driver") -Reported-by: Yuying Ma -Reviewed-by: Przemek Kitszel -Tested-by: Rafal Romanowski -Signed-off-by: Jacob Keller -Reviewed-by: Simon Horman -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/intel/igb/igb_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c -index 3a65dccc08ba8..5867e2db17fd5 100644 ---- a/drivers/net/ethernet/intel/igb/igb_main.c -+++ b/drivers/net/ethernet/intel/igb/igb_main.c -@@ -943,7 +943,7 @@ static int igb_request_msix(struct igb_adapter *adapter) - int i, err = 0, vector = 0, free_vector = 0; - - err = request_irq(adapter->msix_entries[vector].vector, -- igb_msix_other, 0, netdev->name, adapter); -+ igb_msix_other, IRQF_NO_THREAD, netdev->name, adapter); - if (err) - goto err_out; - --- -2.43.0 - diff --git a/queue-4.19/series b/queue-4.19/series index 6f032157f44..79ae2128ebd 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -323,7 +323,6 @@ usb-dwc3-add-splitdisable-quirk-for-hisilicon-kirin-.patch usb-dwc3-core-stop-processing-of-pending-events-if-c.patch cgroup-fix-potential-overflow-issue-when-checking-ma.patch wifi-mac80211-skip-non-uploaded-keys-in-ieee80211_it.patch -igb-disable-threaded-irq-for-igb_msix_other.patch gtp-simplify-error-handling-code-in-gtp_encap_enable.patch gtp-allow-1-to-be-specified-as-file-description-from.patch net-sched-stop-qdisc_tree_reduce_backlog-on-tc_h_roo.patch diff --git a/queue-5.10/igb-disable-threaded-irq-for-igb_msix_other.patch b/queue-5.10/igb-disable-threaded-irq-for-igb_msix_other.patch deleted file mode 100644 index 1a23a7ed82c..00000000000 --- a/queue-5.10/igb-disable-threaded-irq-for-igb_msix_other.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 380908c1343b7460d32621bab283aa6cdb1705b8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 21 Oct 2024 16:26:24 -0700 -Subject: igb: Disable threaded IRQ for igb_msix_other - -From: Wander Lairson Costa - -[ Upstream commit 338c4d3902feb5be49bfda530a72c7ab860e2c9f ] - -During testing of SR-IOV, Red Hat QE encountered an issue where the -ip link up command intermittently fails for the igbvf interfaces when -using the PREEMPT_RT variant. Investigation revealed that -e1000_write_posted_mbx returns an error due to the lack of an ACK -from e1000_poll_for_ack. - -The underlying issue arises from the fact that IRQs are threaded by -default under PREEMPT_RT. While the exact hardware details are not -available, it appears that the IRQ handled by igb_msix_other must -be processed before e1000_poll_for_ack times out. However, -e1000_write_posted_mbx is called with preemption disabled, leading -to a scenario where the IRQ is serviced only after the failure of -e1000_write_posted_mbx. - -To resolve this, we set IRQF_NO_THREAD for the affected interrupt, -ensuring that the kernel handles it immediately, thereby preventing -the aforementioned error. - -Reproducer: - - #!/bin/bash - - # echo 2 > /sys/class/net/ens14f0/device/sriov_numvfs - ipaddr_vlan=3 - nic_test=ens14f0 - vf=${nic_test}v0 - - while true; do - ip link set ${nic_test} mtu 1500 - ip link set ${vf} mtu 1500 - ip link set $vf up - ip link set ${nic_test} vf 0 vlan ${ipaddr_vlan} - ip addr add 172.30.${ipaddr_vlan}.1/24 dev ${vf} - ip addr add 2021:db8:${ipaddr_vlan}::1/64 dev ${vf} - if ! ip link show $vf | grep 'state UP'; then - echo 'Error found' - break - fi - ip link set $vf down - done - -Signed-off-by: Wander Lairson Costa -Fixes: 9d5c824399de ("igb: PCI-Express 82575 Gigabit Ethernet driver") -Reported-by: Yuying Ma -Reviewed-by: Przemek Kitszel -Tested-by: Rafal Romanowski -Signed-off-by: Jacob Keller -Reviewed-by: Simon Horman -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/intel/igb/igb_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c -index 17cdda3fe415a..e1936aa94077b 100644 ---- a/drivers/net/ethernet/intel/igb/igb_main.c -+++ b/drivers/net/ethernet/intel/igb/igb_main.c -@@ -936,7 +936,7 @@ static int igb_request_msix(struct igb_adapter *adapter) - int i, err = 0, vector = 0, free_vector = 0; - - err = request_irq(adapter->msix_entries[vector].vector, -- igb_msix_other, 0, netdev->name, adapter); -+ igb_msix_other, IRQF_NO_THREAD, netdev->name, adapter); - if (err) - goto err_out; - --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index d542508aea4..d8f47efc3a8 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -67,7 +67,6 @@ mac80211-add-support-to-trigger-sta-disconnect-on-ha.patch wifi-iwlwifi-mvm-disconnect-station-vifs-if-recovery.patch wifi-iwlwifi-mvm-fix-response-handling-in-iwl_mvm_se.patch asoc-cs42l51-fix-some-error-handling-paths-in-cs42l5.patch -igb-disable-threaded-irq-for-igb_msix_other.patch ipv4-ip_tunnel-fix-suspicious-rcu-usage-warning-in-i.patch gtp-allow-1-to-be-specified-as-file-description-from.patch net-sched-stop-qdisc_tree_reduce_backlog-on-tc_h_roo.patch diff --git a/queue-5.15/igb-disable-threaded-irq-for-igb_msix_other.patch b/queue-5.15/igb-disable-threaded-irq-for-igb_msix_other.patch deleted file mode 100644 index 82073897364..00000000000 --- a/queue-5.15/igb-disable-threaded-irq-for-igb_msix_other.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 9d7a1ed92d47919a56125b16e6420298f02a11d4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 21 Oct 2024 16:26:24 -0700 -Subject: igb: Disable threaded IRQ for igb_msix_other - -From: Wander Lairson Costa - -[ Upstream commit 338c4d3902feb5be49bfda530a72c7ab860e2c9f ] - -During testing of SR-IOV, Red Hat QE encountered an issue where the -ip link up command intermittently fails for the igbvf interfaces when -using the PREEMPT_RT variant. Investigation revealed that -e1000_write_posted_mbx returns an error due to the lack of an ACK -from e1000_poll_for_ack. - -The underlying issue arises from the fact that IRQs are threaded by -default under PREEMPT_RT. While the exact hardware details are not -available, it appears that the IRQ handled by igb_msix_other must -be processed before e1000_poll_for_ack times out. However, -e1000_write_posted_mbx is called with preemption disabled, leading -to a scenario where the IRQ is serviced only after the failure of -e1000_write_posted_mbx. - -To resolve this, we set IRQF_NO_THREAD for the affected interrupt, -ensuring that the kernel handles it immediately, thereby preventing -the aforementioned error. - -Reproducer: - - #!/bin/bash - - # echo 2 > /sys/class/net/ens14f0/device/sriov_numvfs - ipaddr_vlan=3 - nic_test=ens14f0 - vf=${nic_test}v0 - - while true; do - ip link set ${nic_test} mtu 1500 - ip link set ${vf} mtu 1500 - ip link set $vf up - ip link set ${nic_test} vf 0 vlan ${ipaddr_vlan} - ip addr add 172.30.${ipaddr_vlan}.1/24 dev ${vf} - ip addr add 2021:db8:${ipaddr_vlan}::1/64 dev ${vf} - if ! ip link show $vf | grep 'state UP'; then - echo 'Error found' - break - fi - ip link set $vf down - done - -Signed-off-by: Wander Lairson Costa -Fixes: 9d5c824399de ("igb: PCI-Express 82575 Gigabit Ethernet driver") -Reported-by: Yuying Ma -Reviewed-by: Przemek Kitszel -Tested-by: Rafal Romanowski -Signed-off-by: Jacob Keller -Reviewed-by: Simon Horman -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/intel/igb/igb_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c -index f3a433b4c7cdb..7b4d04d33154a 100644 ---- a/drivers/net/ethernet/intel/igb/igb_main.c -+++ b/drivers/net/ethernet/intel/igb/igb_main.c -@@ -937,7 +937,7 @@ static int igb_request_msix(struct igb_adapter *adapter) - int i, err = 0, vector = 0, free_vector = 0; - - err = request_irq(adapter->msix_entries[vector].vector, -- igb_msix_other, 0, netdev->name, adapter); -+ igb_msix_other, IRQF_NO_THREAD, netdev->name, adapter); - if (err) - goto err_out; - --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 06a6ee543e5..33421b8a41b 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -16,7 +16,6 @@ wifi-iwlwifi-mvm-disconnect-station-vifs-if-recovery.patch wifi-iwlwifi-mvm-fix-response-handling-in-iwl_mvm_se.patch asoc-cs42l51-fix-some-error-handling-paths-in-cs42l5.patch net-stmmac-tso-fix-unbalanced-dma-map-unmap-for-non-.patch -igb-disable-threaded-irq-for-igb_msix_other.patch ipv4-ip_tunnel-fix-suspicious-rcu-usage-warning-in-i.patch gtp-allow-1-to-be-specified-as-file-description-from.patch net-sched-stop-qdisc_tree_reduce_backlog-on-tc_h_roo.patch diff --git a/queue-5.4/igb-disable-threaded-irq-for-igb_msix_other.patch b/queue-5.4/igb-disable-threaded-irq-for-igb_msix_other.patch deleted file mode 100644 index b21633002f0..00000000000 --- a/queue-5.4/igb-disable-threaded-irq-for-igb_msix_other.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d1dffef8369f0cb64bd73346249409b206f6f762 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 21 Oct 2024 16:26:24 -0700 -Subject: igb: Disable threaded IRQ for igb_msix_other - -From: Wander Lairson Costa - -[ Upstream commit 338c4d3902feb5be49bfda530a72c7ab860e2c9f ] - -During testing of SR-IOV, Red Hat QE encountered an issue where the -ip link up command intermittently fails for the igbvf interfaces when -using the PREEMPT_RT variant. Investigation revealed that -e1000_write_posted_mbx returns an error due to the lack of an ACK -from e1000_poll_for_ack. - -The underlying issue arises from the fact that IRQs are threaded by -default under PREEMPT_RT. While the exact hardware details are not -available, it appears that the IRQ handled by igb_msix_other must -be processed before e1000_poll_for_ack times out. However, -e1000_write_posted_mbx is called with preemption disabled, leading -to a scenario where the IRQ is serviced only after the failure of -e1000_write_posted_mbx. - -To resolve this, we set IRQF_NO_THREAD for the affected interrupt, -ensuring that the kernel handles it immediately, thereby preventing -the aforementioned error. - -Reproducer: - - #!/bin/bash - - # echo 2 > /sys/class/net/ens14f0/device/sriov_numvfs - ipaddr_vlan=3 - nic_test=ens14f0 - vf=${nic_test}v0 - - while true; do - ip link set ${nic_test} mtu 1500 - ip link set ${vf} mtu 1500 - ip link set $vf up - ip link set ${nic_test} vf 0 vlan ${ipaddr_vlan} - ip addr add 172.30.${ipaddr_vlan}.1/24 dev ${vf} - ip addr add 2021:db8:${ipaddr_vlan}::1/64 dev ${vf} - if ! ip link show $vf | grep 'state UP'; then - echo 'Error found' - break - fi - ip link set $vf down - done - -Signed-off-by: Wander Lairson Costa -Fixes: 9d5c824399de ("igb: PCI-Express 82575 Gigabit Ethernet driver") -Reported-by: Yuying Ma -Reviewed-by: Przemek Kitszel -Tested-by: Rafal Romanowski -Signed-off-by: Jacob Keller -Reviewed-by: Simon Horman -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/intel/igb/igb_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c -index 1e9967657248a..ebe216647c495 100644 ---- a/drivers/net/ethernet/intel/igb/igb_main.c -+++ b/drivers/net/ethernet/intel/igb/igb_main.c -@@ -945,7 +945,7 @@ static int igb_request_msix(struct igb_adapter *adapter) - int i, err = 0, vector = 0, free_vector = 0; - - err = request_irq(adapter->msix_entries[vector].vector, -- igb_msix_other, 0, netdev->name, adapter); -+ igb_msix_other, IRQF_NO_THREAD, netdev->name, adapter); - if (err) - goto err_out; - --- -2.43.0 - diff --git a/queue-5.4/series b/queue-5.4/series index b09f38c8b06..8552b31d221 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -429,7 +429,6 @@ wifi-iwlwifi-mvm-disconnect-station-vifs-if-recovery.patch wifi-iwlwifi-mvm-fix-response-handling-in-iwl_mvm_se.patch asoc-cs42l51-fix-some-error-handling-paths-in-cs42l5.patch dt-bindings-gpu-convert-samsung-image-rotator-to-dt-.patch -igb-disable-threaded-irq-for-igb_msix_other.patch gtp-simplify-error-handling-code-in-gtp_encap_enable.patch gtp-allow-1-to-be-specified-as-file-description-from.patch net-sched-stop-qdisc_tree_reduce_backlog-on-tc_h_roo.patch diff --git a/queue-6.1/igb-disable-threaded-irq-for-igb_msix_other.patch b/queue-6.1/igb-disable-threaded-irq-for-igb_msix_other.patch deleted file mode 100644 index e1047f29428..00000000000 --- a/queue-6.1/igb-disable-threaded-irq-for-igb_msix_other.patch +++ /dev/null @@ -1,79 +0,0 @@ -From a8c23af23b1768c900d1b3ccbef110cfcf396992 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 21 Oct 2024 16:26:24 -0700 -Subject: igb: Disable threaded IRQ for igb_msix_other - -From: Wander Lairson Costa - -[ Upstream commit 338c4d3902feb5be49bfda530a72c7ab860e2c9f ] - -During testing of SR-IOV, Red Hat QE encountered an issue where the -ip link up command intermittently fails for the igbvf interfaces when -using the PREEMPT_RT variant. Investigation revealed that -e1000_write_posted_mbx returns an error due to the lack of an ACK -from e1000_poll_for_ack. - -The underlying issue arises from the fact that IRQs are threaded by -default under PREEMPT_RT. While the exact hardware details are not -available, it appears that the IRQ handled by igb_msix_other must -be processed before e1000_poll_for_ack times out. However, -e1000_write_posted_mbx is called with preemption disabled, leading -to a scenario where the IRQ is serviced only after the failure of -e1000_write_posted_mbx. - -To resolve this, we set IRQF_NO_THREAD for the affected interrupt, -ensuring that the kernel handles it immediately, thereby preventing -the aforementioned error. - -Reproducer: - - #!/bin/bash - - # echo 2 > /sys/class/net/ens14f0/device/sriov_numvfs - ipaddr_vlan=3 - nic_test=ens14f0 - vf=${nic_test}v0 - - while true; do - ip link set ${nic_test} mtu 1500 - ip link set ${vf} mtu 1500 - ip link set $vf up - ip link set ${nic_test} vf 0 vlan ${ipaddr_vlan} - ip addr add 172.30.${ipaddr_vlan}.1/24 dev ${vf} - ip addr add 2021:db8:${ipaddr_vlan}::1/64 dev ${vf} - if ! ip link show $vf | grep 'state UP'; then - echo 'Error found' - break - fi - ip link set $vf down - done - -Signed-off-by: Wander Lairson Costa -Fixes: 9d5c824399de ("igb: PCI-Express 82575 Gigabit Ethernet driver") -Reported-by: Yuying Ma -Reviewed-by: Przemek Kitszel -Tested-by: Rafal Romanowski -Signed-off-by: Jacob Keller -Reviewed-by: Simon Horman -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/intel/igb/igb_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c -index 2e2caf559d00a..4aaead29f2fe7 100644 ---- a/drivers/net/ethernet/intel/igb/igb_main.c -+++ b/drivers/net/ethernet/intel/igb/igb_main.c -@@ -935,7 +935,7 @@ static int igb_request_msix(struct igb_adapter *adapter) - int i, err = 0, vector = 0, free_vector = 0; - - err = request_irq(adapter->msix_entries[vector].vector, -- igb_msix_other, 0, netdev->name, adapter); -+ igb_msix_other, IRQF_NO_THREAD, netdev->name, adapter); - if (err) - goto err_out; - --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 22e5b7e99f3..915e64d918a 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -20,7 +20,6 @@ wifi-iwlwifi-mvm-fix-response-handling-in-iwl_mvm_se.patch asoc-cs42l51-fix-some-error-handling-paths-in-cs42l5.patch macsec-fix-use-after-free-while-sending-the-offloadi.patch net-stmmac-tso-fix-unbalanced-dma-map-unmap-for-non-.patch -igb-disable-threaded-irq-for-igb_msix_other.patch ipv4-ip_tunnel-fix-suspicious-rcu-usage-warning-in-i.patch gtp-allow-1-to-be-specified-as-file-description-from.patch net-sched-stop-qdisc_tree_reduce_backlog-on-tc_h_roo.patch diff --git a/queue-6.11/igb-disable-threaded-irq-for-igb_msix_other.patch b/queue-6.11/igb-disable-threaded-irq-for-igb_msix_other.patch deleted file mode 100644 index 7ef02ddae31..00000000000 --- a/queue-6.11/igb-disable-threaded-irq-for-igb_msix_other.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 052382490ee4f0f6d783ddce02fe6f2d15e134b5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 21 Oct 2024 16:26:24 -0700 -Subject: igb: Disable threaded IRQ for igb_msix_other - -From: Wander Lairson Costa - -[ Upstream commit 338c4d3902feb5be49bfda530a72c7ab860e2c9f ] - -During testing of SR-IOV, Red Hat QE encountered an issue where the -ip link up command intermittently fails for the igbvf interfaces when -using the PREEMPT_RT variant. Investigation revealed that -e1000_write_posted_mbx returns an error due to the lack of an ACK -from e1000_poll_for_ack. - -The underlying issue arises from the fact that IRQs are threaded by -default under PREEMPT_RT. While the exact hardware details are not -available, it appears that the IRQ handled by igb_msix_other must -be processed before e1000_poll_for_ack times out. However, -e1000_write_posted_mbx is called with preemption disabled, leading -to a scenario where the IRQ is serviced only after the failure of -e1000_write_posted_mbx. - -To resolve this, we set IRQF_NO_THREAD for the affected interrupt, -ensuring that the kernel handles it immediately, thereby preventing -the aforementioned error. - -Reproducer: - - #!/bin/bash - - # echo 2 > /sys/class/net/ens14f0/device/sriov_numvfs - ipaddr_vlan=3 - nic_test=ens14f0 - vf=${nic_test}v0 - - while true; do - ip link set ${nic_test} mtu 1500 - ip link set ${vf} mtu 1500 - ip link set $vf up - ip link set ${nic_test} vf 0 vlan ${ipaddr_vlan} - ip addr add 172.30.${ipaddr_vlan}.1/24 dev ${vf} - ip addr add 2021:db8:${ipaddr_vlan}::1/64 dev ${vf} - if ! ip link show $vf | grep 'state UP'; then - echo 'Error found' - break - fi - ip link set $vf down - done - -Signed-off-by: Wander Lairson Costa -Fixes: 9d5c824399de ("igb: PCI-Express 82575 Gigabit Ethernet driver") -Reported-by: Yuying Ma -Reviewed-by: Przemek Kitszel -Tested-by: Rafal Romanowski -Signed-off-by: Jacob Keller -Reviewed-by: Simon Horman -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/intel/igb/igb_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c -index f1d0881687233..b83df5f94b1f5 100644 ---- a/drivers/net/ethernet/intel/igb/igb_main.c -+++ b/drivers/net/ethernet/intel/igb/igb_main.c -@@ -907,7 +907,7 @@ static int igb_request_msix(struct igb_adapter *adapter) - int i, err = 0, vector = 0, free_vector = 0; - - err = request_irq(adapter->msix_entries[vector].vector, -- igb_msix_other, 0, netdev->name, adapter); -+ igb_msix_other, IRQF_NO_THREAD, netdev->name, adapter); - if (err) - goto err_out; - --- -2.43.0 - diff --git a/queue-6.11/series b/queue-6.11/series index 9d8d8efe5f1..bf8ec948e13 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -26,7 +26,6 @@ asoc-dapm-fix-bounds-checker-error-in-dapm_widget_li.patch sock_map-fix-a-null-pointer-dereference-in-sock_map_.patch net-stmmac-dwmac4-fix-high-address-display-by-updati.patch net-stmmac-tso-fix-unbalanced-dma-map-unmap-for-non-.patch -igb-disable-threaded-irq-for-igb_msix_other.patch dpll-add-embedded-sync-feature-for-a-pin.patch ice-add-callbacks-for-embedded-sync-enablement-on-dp.patch ice-fix-crash-on-probe-for-dpll-enabled-e810-lom.patch diff --git a/queue-6.6/igb-disable-threaded-irq-for-igb_msix_other.patch b/queue-6.6/igb-disable-threaded-irq-for-igb_msix_other.patch deleted file mode 100644 index 8dfc78a0bca..00000000000 --- a/queue-6.6/igb-disable-threaded-irq-for-igb_msix_other.patch +++ /dev/null @@ -1,79 +0,0 @@ -From bbf45ee8f0bb8e9102f17add747e4bee62006719 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 21 Oct 2024 16:26:24 -0700 -Subject: igb: Disable threaded IRQ for igb_msix_other - -From: Wander Lairson Costa - -[ Upstream commit 338c4d3902feb5be49bfda530a72c7ab860e2c9f ] - -During testing of SR-IOV, Red Hat QE encountered an issue where the -ip link up command intermittently fails for the igbvf interfaces when -using the PREEMPT_RT variant. Investigation revealed that -e1000_write_posted_mbx returns an error due to the lack of an ACK -from e1000_poll_for_ack. - -The underlying issue arises from the fact that IRQs are threaded by -default under PREEMPT_RT. While the exact hardware details are not -available, it appears that the IRQ handled by igb_msix_other must -be processed before e1000_poll_for_ack times out. However, -e1000_write_posted_mbx is called with preemption disabled, leading -to a scenario where the IRQ is serviced only after the failure of -e1000_write_posted_mbx. - -To resolve this, we set IRQF_NO_THREAD for the affected interrupt, -ensuring that the kernel handles it immediately, thereby preventing -the aforementioned error. - -Reproducer: - - #!/bin/bash - - # echo 2 > /sys/class/net/ens14f0/device/sriov_numvfs - ipaddr_vlan=3 - nic_test=ens14f0 - vf=${nic_test}v0 - - while true; do - ip link set ${nic_test} mtu 1500 - ip link set ${vf} mtu 1500 - ip link set $vf up - ip link set ${nic_test} vf 0 vlan ${ipaddr_vlan} - ip addr add 172.30.${ipaddr_vlan}.1/24 dev ${vf} - ip addr add 2021:db8:${ipaddr_vlan}::1/64 dev ${vf} - if ! ip link show $vf | grep 'state UP'; then - echo 'Error found' - break - fi - ip link set $vf down - done - -Signed-off-by: Wander Lairson Costa -Fixes: 9d5c824399de ("igb: PCI-Express 82575 Gigabit Ethernet driver") -Reported-by: Yuying Ma -Reviewed-by: Przemek Kitszel -Tested-by: Rafal Romanowski -Signed-off-by: Jacob Keller -Reviewed-by: Simon Horman -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/intel/igb/igb_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c -index 49b349fa22542..4c1673527361e 100644 ---- a/drivers/net/ethernet/intel/igb/igb_main.c -+++ b/drivers/net/ethernet/intel/igb/igb_main.c -@@ -935,7 +935,7 @@ static int igb_request_msix(struct igb_adapter *adapter) - int i, err = 0, vector = 0, free_vector = 0; - - err = request_irq(adapter->msix_entries[vector].vector, -- igb_msix_other, 0, netdev->name, adapter); -+ igb_msix_other, IRQF_NO_THREAD, netdev->name, adapter); - if (err) - goto err_out; - --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index a1be5146b15..b8e5b6f0ce8 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -21,7 +21,6 @@ asoc-cs42l51-fix-some-error-handling-paths-in-cs42l5.patch macsec-fix-use-after-free-while-sending-the-offloadi.patch net-stmmac-dwmac4-fix-high-address-display-by-updati.patch net-stmmac-tso-fix-unbalanced-dma-map-unmap-for-non-.patch -igb-disable-threaded-irq-for-igb_msix_other.patch ipv4-ip_tunnel-fix-suspicious-rcu-usage-warning-in-i.patch gtp-allow-1-to-be-specified-as-file-description-from.patch net-sched-stop-qdisc_tree_reduce_backlog-on-tc_h_roo.patch