Commit 943b881e authored by Brett Creeley's avatar Brett Creeley Committed by Tony Nguyen

ice: Don't allow more channels than LAN MSI-X available

Currently users could create more channels than LAN MSI-X available.
This is happening because there is no check against pf->num_lan_msix
when checking the max allowed channels and will cause performance issues
if multiple Tx and Rx queues are tied to a single MSI-X. Fix this by not
allowing more channels than LAN MSI-X available in pf->num_lan_msix.

Fixes: 87324e74 ("ice: Implement ethtool ops for channels")
Signed-off-by: default avatarBrett Creeley <brett.creeley@intel.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 13ed5e8a
...@@ -3258,8 +3258,8 @@ ice_set_rxfh(struct net_device *netdev, const u32 *indir, const u8 *key, ...@@ -3258,8 +3258,8 @@ ice_set_rxfh(struct net_device *netdev, const u32 *indir, const u8 *key,
*/ */
static int ice_get_max_txq(struct ice_pf *pf) static int ice_get_max_txq(struct ice_pf *pf)
{ {
return min_t(int, num_online_cpus(), return min3(pf->num_lan_msix, (u16)num_online_cpus(),
pf->hw.func_caps.common_cap.num_txq); (u16)pf->hw.func_caps.common_cap.num_txq);
} }
/** /**
...@@ -3268,8 +3268,8 @@ static int ice_get_max_txq(struct ice_pf *pf) ...@@ -3268,8 +3268,8 @@ static int ice_get_max_txq(struct ice_pf *pf)
*/ */
static int ice_get_max_rxq(struct ice_pf *pf) static int ice_get_max_rxq(struct ice_pf *pf)
{ {
return min_t(int, num_online_cpus(), return min3(pf->num_lan_msix, (u16)num_online_cpus(),
pf->hw.func_caps.common_cap.num_rxq); (u16)pf->hw.func_caps.common_cap.num_rxq);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment