Commit b38b7f2b authored by Salil Mehta's avatar Salil Mehta Committed by Tony Nguyen
Browse files

ice: Re-organizes reqstd/avail {R, T}XQ check/code for efficiency 



If user has explicitly requested the number of {R,T}XQs, then it is
unnecessary to get the count of already available {R,T}XQs from the
PF avail_{r,t}xqs bitmap. This value will get overridden by user specified
value in any case.

Re-organize this code for improving the flow, readability and efficiency.
This scope of improvement was found during the review of the ICE driver
code.

Fixes: 87324e74 ("ice: Implement ethtool ops for channels")
Cc: intel-wired-lan@lists.osuosl.org
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent fb361284

drivers/net/ethernet/intel/ice/ice_lib.c

+8 −6
Original line number Diff line number Diff line
@@ -163,12 +163,13 @@ static void ice_vsi_set_num_qs(struct ice_vsi *vsi, u16 vf_id) 


	switch (vsi->type) {

	case ICE_VSI_PF:

		vsi->alloc_txq = min3(pf->num_lan_msix,

				      ice_get_avail_txq_count(pf),

				      (u16)num_online_cpus());

		if (vsi->req_txq) {

			vsi->alloc_txq = vsi->req_txq;

			vsi->num_txq = vsi->req_txq;

		} else {

			vsi->alloc_txq = min3(pf->num_lan_msix,

					      ice_get_avail_txq_count(pf),

					      (u16)num_online_cpus());

		}



		pf->num_lan_tx = vsi->alloc_txq;
@@ -177,12 +178,13 @@ static void ice_vsi_set_num_qs(struct ice_vsi *vsi, u16 vf_id) 
		if (!test_bit(ICE_FLAG_RSS_ENA, pf->flags)) {

			vsi->alloc_rxq = 1;

		} else {

			vsi->alloc_rxq = min3(pf->num_lan_msix,

					      ice_get_avail_rxq_count(pf),

					      (u16)num_online_cpus());

			if (vsi->req_rxq) {

				vsi->alloc_rxq = vsi->req_rxq;

				vsi->num_rxq = vsi->req_rxq;

			} else {

				vsi->alloc_rxq = min3(pf->num_lan_msix,

						      ice_get_avail_rxq_count(pf),

						      (u16)num_online_cpus());

			}

		}