Andrew Lukoshko
b9d46fff46
Add the RHEL 211.17.1..211.18.1 backports (1162-1244) from centos-stream-10 and upstream, on top of 211.16.1. Includes the lpfc 14.4.0.x revert batch and the RHEL-only lpfc_nlp_get UAF guard. Bump to 211.18.1.
129 lines
4.5 KiB
Diff
129 lines
4.5 KiB
Diff
From 7e7d215f3f0eb53e12f2374ecc7cfe68abda3463 Mon Sep 17 00:00:00 2001
|
|
From: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com>
|
|
Date: Thu, 7 May 2026 09:35:57 +0000
|
|
Subject: [PATCH] ice: set max queues in alloc_etherdev_mqs()
|
|
|
|
JIRA: https://redhat.atlassian.net/browse/RHEL-172305
|
|
|
|
commit c7fcd269e1e07b2aa4bb37ffce7543c340796433
|
|
Author: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
|
|
Date: Mon Feb 23 13:51:57 2026 +0100
|
|
|
|
ice: set max queues in alloc_etherdev_mqs()
|
|
|
|
When allocating netdevice using alloc_etherdev_mqs() the maximum
|
|
supported queues number should be passed. The vsi->alloc_txq/rxq is
|
|
storing current number of queues, not the maximum ones.
|
|
|
|
Use the same function for getting max Tx and Rx queues which is used
|
|
during ethtool -l call to set maximum number of queues during netdev
|
|
allocation.
|
|
|
|
Reproduction steps:
|
|
$ethtool -l $pf # says current 16, max 64
|
|
$ethtool -S $pf # fine
|
|
$ethtool -L $pf combined 40 # crash
|
|
|
|
[491187.472594] Call Trace:
|
|
[491187.472829] <TASK>
|
|
[491187.473067] netif_set_xps_queue+0x26/0x40
|
|
[491187.473305] ice_vsi_cfg_txq+0x265/0x3d0 [ice]
|
|
[491187.473619] ice_vsi_cfg_lan_txqs+0x68/0xa0 [ice]
|
|
[491187.473918] ice_vsi_cfg_lan+0x2b/0xa0 [ice]
|
|
[491187.474202] ice_vsi_open+0x71/0x170 [ice]
|
|
[491187.474484] ice_vsi_recfg_qs+0x17f/0x230 [ice]
|
|
[491187.474759] ? dev_get_min_mp_channel_count+0xab/0xd0
|
|
[491187.474987] ice_set_channels+0x185/0x3d0 [ice]
|
|
[491187.475278] ethnl_set_channels+0x26f/0x340
|
|
|
|
Fixes: ee13aa1a2c5a ("ice: use netif_get_num_default_rss_queues()")
|
|
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
|
|
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
|
|
Tested-by: Alexander Nowlin <alexander.nowlin@intel.com>
|
|
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
|
|
|
|
Signed-off-by: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com>
|
|
|
|
diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
|
|
index 00f75d87c73f..ae1ebf507f29 100644
|
|
--- a/drivers/net/ethernet/intel/ice/ice.h
|
|
+++ b/drivers/net/ethernet/intel/ice/ice.h
|
|
@@ -839,6 +839,28 @@ static inline void ice_tx_xsk_pool(struct ice_vsi *vsi, u16 qid)
|
|
WRITE_ONCE(ring->xsk_pool, ice_get_xp_from_qid(vsi, qid));
|
|
}
|
|
|
|
+/**
|
|
+ * ice_get_max_txq - return the maximum number of Tx queues for in a PF
|
|
+ * @pf: PF structure
|
|
+ *
|
|
+ * Return: maximum number of Tx queues
|
|
+ */
|
|
+static inline int ice_get_max_txq(struct ice_pf *pf)
|
|
+{
|
|
+ return min(num_online_cpus(), pf->hw.func_caps.common_cap.num_txq);
|
|
+}
|
|
+
|
|
+/**
|
|
+ * ice_get_max_rxq - return the maximum number of Rx queues for in a PF
|
|
+ * @pf: PF structure
|
|
+ *
|
|
+ * Return: maximum number of Rx queues
|
|
+ */
|
|
+static inline int ice_get_max_rxq(struct ice_pf *pf)
|
|
+{
|
|
+ return min(num_online_cpus(), pf->hw.func_caps.common_cap.num_rxq);
|
|
+}
|
|
+
|
|
/**
|
|
* ice_get_main_vsi - Get the PF VSI
|
|
* @pf: PF instance
|
|
diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
|
|
index e9f2618950c8..33c818226565 100644
|
|
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
|
|
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
|
|
@@ -3756,24 +3756,6 @@ ice_get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *info)
|
|
return 0;
|
|
}
|
|
|
|
-/**
|
|
- * ice_get_max_txq - return the maximum number of Tx queues for in a PF
|
|
- * @pf: PF structure
|
|
- */
|
|
-static int ice_get_max_txq(struct ice_pf *pf)
|
|
-{
|
|
- return min(num_online_cpus(), pf->hw.func_caps.common_cap.num_txq);
|
|
-}
|
|
-
|
|
-/**
|
|
- * ice_get_max_rxq - return the maximum number of Rx queues for in a PF
|
|
- * @pf: PF structure
|
|
- */
|
|
-static int ice_get_max_rxq(struct ice_pf *pf)
|
|
-{
|
|
- return min(num_online_cpus(), pf->hw.func_caps.common_cap.num_rxq);
|
|
-}
|
|
-
|
|
/**
|
|
* ice_get_combined_cnt - return the current number of combined channels
|
|
* @vsi: PF VSI pointer
|
|
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
|
|
index 27c519918fb2..c77c95e4f5c6 100644
|
|
--- a/drivers/net/ethernet/intel/ice/ice_main.c
|
|
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
|
|
@@ -4699,8 +4699,8 @@ static int ice_cfg_netdev(struct ice_vsi *vsi)
|
|
struct net_device *netdev;
|
|
u8 mac_addr[ETH_ALEN];
|
|
|
|
- netdev = alloc_etherdev_mqs(sizeof(*np), vsi->alloc_txq,
|
|
- vsi->alloc_rxq);
|
|
+ netdev = alloc_etherdev_mqs(sizeof(*np), ice_get_max_txq(vsi->back),
|
|
+ ice_get_max_rxq(vsi->back));
|
|
if (!netdev)
|
|
return -ENOMEM;
|
|
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|