From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 014E24C754C for ; Fri, 9 Oct 2026 12:15:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.10 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791548129; cv=none; b=VB2jdVBpD33M+DHz3YEczL/yGtybzyXn45OMIP5B9pAVc5DjNd5itnkrYfwsyjOqvaMdFGmg485foWDEXfAdNPqu+eO+GsMGU7WIHKAQZv4JaW0WCEUHSENHeoKECPKjtKU3ESyeiAPWpSKCBR8Y7nktEFZav+8OVW8u1gIBcMs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791548129; c=relaxed/simple; bh=lrGh1SeNInxM82wcIDBIfhSMextgyOQuj5LXlzoOu0A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FqbKZNtNMIfyb+jI9Pd36qTdesI5UWtHjL9ZF96drSRAKi1gI/4IaizhWV3DgQTYTkNbOP52nskpRAv781xbQX5z78CRobglypTBALU8QQftA5uddKRBG7qMMXpz+/bsrDvX4xV+dHg6pMSt8PPWQJ2CDd3rgOQ3YwUX7CK189k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ky1jQU9P; arc=none smtp.client-ip=192.198.163.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ky1jQU9P" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1791548116; x=1823084116; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lrGh1SeNInxM82wcIDBIfhSMextgyOQuj5LXlzoOu0A=; b=ky1jQU9PkOiE/2AlKC0u2ST6ejIRcX9+eXilh/UPcRhsGWyi3Ygfxakv aV8eMPlhZ+kCxnQBSsxcwEcCOeo0Q26+GmLnIaSLKH+X4CUSwVOnnqJkF mM9OE+Q5QGKYfyfBsdHdgd4kkx1+gMJu53aOVL4oJf+DWYXBv2CMR9EqQ WOqx6I1TItTMGdixj0i3qUaKVzLpJDME1XG9KxfjxkFS1oSQgBTZxLA7u BB63S5AZ92cXFwcV3a5XlHs3SWCCN0HuZEa0eYHC5S1kitUEfloAkrJ0b EMJIRC/VCglbl6S5CRGEwdFqsAH/Y6nhoeBdRw3awUETXYoIlzAeLgcAL Q==; X-CSE-ConnectionGUID: 5WoVcBrjTHGiLksMdhJEyw== X-CSE-MsgGUID: 3HUxyMjeRA2/yLzxi3nW8A== X-IronPort-AV: E=McAfee;i="6800,10657,11929"; a="251155" X-IronPort-AV: E=Sophos;i="6.27,148,1787036400"; d="scan'208";a="251155" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2026 05:14:58 -0700 X-CSE-ConnectionGUID: zNruflQMST2cJYBKWQMPmw== X-CSE-MsgGUID: m6Y3oSCBSCyShW37SeU9nQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,148,1787036400"; d="scan'208";a="420439" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by fmviesa002.fm.intel.com with ESMTP; 09 Oct 2026 05:14:53 -0700 Received: from pkitszel-desk.tendawifi.com (unknown [10.245.245.238]) by irvmail002.ir.intel.com (Postfix) with ESMTP id 1C21D2FC46; Fri, 9 Oct 2026 13:14:50 +0100 (IST) From: Przemek Kitszel To: netdev@vger.kernel.org, Jakub Kicinski , Jiri Pirko Cc: Tony Nguyen , Aleksandr Loktionov , Michal Schmidt , intel-wired-lan@lists.osuosl.org, edumazet@kernel.org, horms@kernel.org, pabeni@redhat.com, davem@davemloft.net, Jonathan Corbet , skhan@linuxfoundation.org, rdunlap@infradead.org, andrew+netdev@lunn.ch, saeedm@nvidia.com, tariqt@nvidia.com, leon@kernel.org, mbloch@nvidia.com, jacob.e.keller@intel.com, jedrzej.jagielski@intel.com, anzaki@gmail.com, brett.creeley@amd.com, jtornosm@redhat.com, ohartoov@nvidia.com, Przemek Kitszel Subject: [PATCH net-next v2 06/14] ice: bump to 256qs for VF Date: Fri, 9 Oct 2026 14:04:17 +0200 Message-ID: <20261009121433.30347-7-przemyslaw.kitszel@intel.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20261009121433.30347-1-przemyslaw.kitszel@intel.com> References: <20261009121433.30347-1-przemyslaw.kitszel@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Adjust all bitmaps and arrays in ice to accept 256 VF queues. Extend struct ice_vf::num_req_qs width to allow 256 queues. Keep old/legacy size for virtchnl opcodes that were designed to accept only up to 16 queues. Raise also the limits for the default VF queue count and for VIRTCHNL_OP_REQUEST_QUEUES to 256. New virtchnl opcodes, needed to make use of more than 16 queues, are handled by subsequent commits of this series, the work is split for easier review. Reviewed-by: Jedrzej Jagielski Signed-off-by: Przemek Kitszel --- v2: * change ice_lag allocations to kvzalloc(), as they have grown to 66KB (Sashiko) * commit message: mention that the default and requested VF queue limits are raised already here, while more than 16 queues are enabled by subsequent commits Sashiko suggestions I don't want to apply: S: there is an existing error handling issue in ice_init_lag() me: pre-existing and unrelated, will be fixed separately --- drivers/net/ethernet/intel/ice/ice_lag.h | 2 +- drivers/net/ethernet/intel/ice/ice_vf_lib.h | 9 +++++---- drivers/net/ethernet/intel/ice/ice_lag.c | 6 +++--- drivers/net/ethernet/intel/ice/ice_lib.c | 2 +- drivers/net/ethernet/intel/ice/ice_sriov.c | 4 ++-- drivers/net/ethernet/intel/ice/ice_vf_lib.c | 8 ++++---- drivers/net/ethernet/intel/ice/virt/queues.c | 14 +++++++------- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_lag.h b/drivers/net/ethernet/intel/ice/ice_lag.h index 4bfffecbdc97..39f6a6cc844d 100644 --- a/drivers/net/ethernet/intel/ice/ice_lag.h +++ b/drivers/net/ethernet/intel/ice/ice_lag.h @@ -52,7 +52,7 @@ struct ice_lag { u8 bond_lport_sec; /* lport values for secondary PF */ /* q_home keeps track of which interface the q is currently on */ - u8 q_home[ICE_MAX_SRIOV_VFS][ICE_MAX_QS_PER_VF_VCV1]; + u8 q_home[ICE_MAX_SRIOV_VFS][ICE_MAX_QS_PER_VF]; /* placeholder VSI for hanging VF queues from on secondary interface */ struct ice_vsi *sec_vf[ICE_MAX_SRIOV_VFS]; diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.h b/drivers/net/ethernet/intel/ice/ice_vf_lib.h index 4959ecee0c21..a9e95c85bc98 100644 --- a/drivers/net/ethernet/intel/ice/ice_vf_lib.h +++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.h @@ -21,6 +21,7 @@ /* VF resource constraints */ /* for "old" virtchnl opcodes that accept up to 16 queues */ #define ICE_MAX_QS_PER_VF_VCV1 16 +#define ICE_MAX_QS_PER_VF 256 struct ice_pf; struct ice_vf; @@ -162,8 +163,8 @@ struct ice_vf { u8 dev_lan_addr[ETH_ALEN]; u8 hw_lan_addr[ETH_ALEN]; struct ice_time_mac legacy_last_added_umac; - DECLARE_BITMAP(txq_ena, ICE_MAX_QS_PER_VF_VCV1); - DECLARE_BITMAP(rxq_ena, ICE_MAX_QS_PER_VF_VCV1); + DECLARE_BITMAP(txq_ena, ICE_MAX_QS_PER_VF); + DECLARE_BITMAP(rxq_ena, ICE_MAX_QS_PER_VF); struct ice_vlan port_vlan_info; /* Port VLAN ID, QoS, and TPID */ struct virtchnl_vlan_caps vlan_v2_caps; struct ice_mbx_vf_info mbx_info; @@ -185,7 +186,7 @@ struct ice_vf { DECLARE_BITMAP(vf_states, ICE_VF_STATES_NBITS); /* VF runtime states */ unsigned long vf_caps; /* VF's adv. capabilities */ - u8 num_req_qs; /* num of queue pairs requested by VF */ + u16 num_req_qs; /* num of queue pairs requested by VF */ u16 num_mac; u16 num_mac_lldp; u16 num_vf_qs; /* num of queue configured per VF */ @@ -206,7 +207,7 @@ struct ice_vf { u16 lldp_recipe_id; u16 lldp_rule_id; - struct ice_vf_qs_bw qs_bw[ICE_MAX_QS_PER_VF_VCV1]; + struct ice_vf_qs_bw qs_bw[ICE_MAX_QS_PER_VF]; }; /* Flags for controlling behavior of ice_reset_vf */ diff --git a/drivers/net/ethernet/intel/ice/ice_lag.c b/drivers/net/ethernet/intel/ice/ice_lag.c index 08a17ded0ad5..e006311c18b6 100644 --- a/drivers/net/ethernet/intel/ice/ice_lag.c +++ b/drivers/net/ethernet/intel/ice/ice_lag.c @@ -2577,7 +2577,7 @@ int ice_init_lag(struct ice_pf *pf) if (!ice_is_feature_supported(pf, ICE_F_SRIOV_LAG)) return 0; - pf->lag = kzalloc_obj(*lag); + pf->lag = kvzalloc_obj(*lag); if (!pf->lag) return -ENOMEM; lag = pf->lag; @@ -2651,7 +2651,7 @@ int ice_init_lag(struct ice_pf *pf) ice_free_hw_res(&pf->hw, ICE_AQC_RES_TYPE_RECIPE, 1, &lag->pf_recipe); lag_error: - kfree(lag); + kvfree(lag); pf->lag = NULL; return err; } @@ -2680,7 +2680,7 @@ void ice_deinit_lag(struct ice_pf *pf) ice_free_hw_res(&pf->hw, ICE_AQC_RES_TYPE_RECIPE, 1, &pf->lag->lport_recipe); - kfree(lag); + kvfree(lag); pf->lag = NULL; } diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c index e18128bce959..f81b310a98c3 100644 --- a/drivers/net/ethernet/intel/ice/ice_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_lib.c @@ -1026,7 +1026,7 @@ static void ice_vsi_set_rss_params(struct ice_vsi *vsi) * For VSI_LUT, LUT size should be set to 64 bytes. */ vsi->rss_table_size = ICE_LUT_VSI_SIZE; - vsi->rss_size = ICE_MAX_QS_PER_VF_VCV1; + vsi->rss_size = ICE_MAX_QS_PER_VF; vsi->rss_lut_type = ICE_LUT_VSI; break; case ICE_VSI_LB: diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c index dcd6d48ea38d..d7c4a6540008 100644 --- a/drivers/net/ethernet/intel/ice/ice_sriov.c +++ b/drivers/net/ethernet/intel/ice/ice_sriov.c @@ -398,15 +398,15 @@ static int ice_set_per_vf_res(struct ice_pf *pf, u16 num_vfs) } num_txq = min_t(u16, num_msix_per_vf - ICE_NONQ_VECS_VF, - ICE_MAX_QS_PER_VF_VCV1); + ICE_MAX_QS_PER_VF); avail_qs = ice_get_avail_txq_count(pf) / num_vfs; if (!avail_qs) num_txq = 0; else if (num_txq > avail_qs) num_txq = rounddown_pow_of_two(avail_qs); num_rxq = min_t(u16, num_msix_per_vf - ICE_NONQ_VECS_VF, - ICE_MAX_QS_PER_VF_VCV1); + ICE_MAX_QS_PER_VF); avail_qs = ice_get_avail_rxq_count(pf) / num_vfs; if (!avail_qs) num_rxq = 0; diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c b/drivers/net/ethernet/intel/ice/ice_vf_lib.c index be87a83d2599..320b393ddaaf 100644 --- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c @@ -528,8 +528,8 @@ static void ice_vf_rebuild_host_cfg(struct ice_vf *vf) static void ice_set_vf_state_qs_dis(struct ice_vf *vf) { /* Clear Rx/Tx enabled queues flag */ - bitmap_zero(vf->txq_ena, ICE_MAX_QS_PER_VF_VCV1); - bitmap_zero(vf->rxq_ena, ICE_MAX_QS_PER_VF_VCV1); + bitmap_zero(vf->txq_ena, ICE_MAX_QS_PER_VF); + bitmap_zero(vf->rxq_ena, ICE_MAX_QS_PER_VF); clear_bit(ICE_VF_STATE_QS_ENA, vf->vf_states); } @@ -1243,8 +1243,8 @@ bool ice_is_vf_trusted(struct ice_vf *vf) */ bool ice_vf_has_no_qs_ena(struct ice_vf *vf) { - return bitmap_empty(vf->rxq_ena, ICE_MAX_QS_PER_VF_VCV1) && - bitmap_empty(vf->txq_ena, ICE_MAX_QS_PER_VF_VCV1); + return bitmap_empty(vf->rxq_ena, ICE_MAX_QS_PER_VF) && + bitmap_empty(vf->txq_ena, ICE_MAX_QS_PER_VF); } /** diff --git a/drivers/net/ethernet/intel/ice/virt/queues.c b/drivers/net/ethernet/intel/ice/virt/queues.c index 2667634e3c8c..61304493af34 100644 --- a/drivers/net/ethernet/intel/ice/virt/queues.c +++ b/drivers/net/ethernet/intel/ice/virt/queues.c @@ -681,7 +681,7 @@ int ice_vc_cfg_q_bw(struct ice_vf *vf, u8 *msg) goto err; } - if (qbw->num_queues > ICE_MAX_QS_PER_VF_VCV1 || + if (qbw->num_queues > ICE_MAX_QS_PER_VF || qbw->num_queues > min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)) { dev_err(ice_pf_to_dev(vf->pf), "VF-%d trying to configure more than allocated number of queues: %d\n", vf->vf_id, min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)); @@ -773,7 +773,7 @@ int ice_vc_cfg_q_quanta(struct ice_vf *vf, u8 *msg) goto err; } - if (end_qid > ICE_MAX_QS_PER_VF_VCV1 || + if (end_qid > ICE_MAX_QS_PER_VF || end_qid > min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)) { dev_err(ice_pf_to_dev(vf->pf), "VF-%d trying to configure more than allocated number of queues: %d\n", vf->vf_id, min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)); @@ -841,7 +841,7 @@ int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg) if (!vsi) goto error_param; - if (qci->num_queue_pairs > ICE_MAX_QS_PER_VF_VCV1 || + if (qci->num_queue_pairs > ICE_MAX_QS_PER_VF || qci->num_queue_pairs > min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)) { dev_err(ice_pf_to_dev(pf), "VF-%d requesting more than supported number of queues: %d\n", vf->vf_id, min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)); @@ -1019,16 +1019,16 @@ int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg) if (!req_queues) { dev_err(dev, "VF %d tried to request 0 queues. Ignoring.\n", vf->vf_id); - } else if (req_queues > ICE_MAX_QS_PER_VF_VCV1) { + } else if (req_queues > ICE_MAX_QS_PER_VF) { dev_err(dev, "VF %d tried to request more than %d queues.\n", - vf->vf_id, ICE_MAX_QS_PER_VF_VCV1); - vfres->num_queue_pairs = ICE_MAX_QS_PER_VF_VCV1; + vf->vf_id, ICE_MAX_QS_PER_VF); + vfres->num_queue_pairs = ICE_MAX_QS_PER_VF; } else if (req_queues > cur_queues && req_queues - cur_queues > tx_rx_queue_left) { dev_warn(dev, "VF %d requested %u more queues, but only %u left.\n", vf->vf_id, req_queues - cur_queues, tx_rx_queue_left); vfres->num_queue_pairs = min_t(u16, max_allowed_vf_queues, - ICE_MAX_QS_PER_VF_VCV1); + ICE_MAX_QS_PER_VF); } else { /* request is successful, then reset VF */ vf->num_req_qs = req_queues; -- 2.51.1