-----邮件原件----- 发件人: Greg Kroah-Hartman gregkh@linuxfoundation.org 发送时间: 2024年4月30日 18:38 收件人: stable@vger.kernel.org 抄送: Greg Kroah-Hartman gregkh@linuxfoundation.org; patches@lists.linux.dev; Duanqiang Wen duanqiangwen@net-swift.com; David S. Miller davem@davemloft.net; Sasha Levin sashal@kernel.org 主题: [PATCH 6.6 044/186] net: libwx: fix alloc msix vectors failed
6.6-stable review patch. If anyone has any objections, please let me
know.
From: Duanqiang Wen duanqiangwen@net-swift.com
[ Upstream commit 69197dfc64007b5292cc960581548f41ccd44828 ]
driver needs queue msix vectors and one misc irq vector, but only queue
vectors
need irq affinity. when num_online_cpus is less than chip max msix vectors, driver will
acquire
(num_online_cpus + 1) vecotrs, and call pci_alloc_irq_vectors_affinity
functions
with affinity params without setting pre_vectors or post_vectors, it will
cause
return error code -ENOSPC. Misc irq vector is vector 0, driver need to set affinity params
.pre_vectors = 1.
Fixes: 3f703186113f ("net: libwx: Add irq flow functions") Signed-off-by: Duanqiang Wen duanqiangwen@net-swift.com Signed-off-by: David S. Miller davem@davemloft.net Signed-off-by: Sasha Levin sashal@kernel.org
drivers/net/ethernet/wangxun/libwx/wx_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c index e078f4071dc23..be434c833c69c 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c @@ -1585,7 +1585,7 @@ static void wx_set_num_queues(struct wx *wx) */ static int wx_acquire_msix_vectors(struct wx *wx) {
- struct irq_affinity affd = {0, };
struct irq_affinity affd = { .pre_vectors = 1 }; int nvecs, i;
nvecs = min_t(int, num_online_cpus(), wx->mac.max_msix_vectors);
-- 2.43.0
This patch in kernel-6.6 and kernel 6.7 will cause problems. In kernel-6.6 and kernel 6.7, Wangxun txgbe & ngbe driver adjust misc irq to vector 0 not yet. How to revert it in kernel-6.6 and kernel-6.7 stable?