Re: [iwl-next v1 1/7] ice: devlink PF MSI-X max and min parameter

[Jiri Pirko <jiri@resnulli.us>]

Tue, Feb 13, 2024 at 08:35:03AM CET, michal.swiatkowski@linux.intel.com wrote:
>Use generic devlink PF MSI-X parameter to allow user to change MSI-X
>range.
>
>Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
>Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
>---
> drivers/net/ethernet/intel/ice/ice.h         |  8 ++
> drivers/net/ethernet/intel/ice/ice_devlink.c | 82 ++++++++++++++++++++
> drivers/net/ethernet/intel/ice/ice_irq.c     |  6 ++
> 3 files changed, 96 insertions(+)
>
>diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
>index c4127d5f2be3..24085f3c0966 100644
>--- a/drivers/net/ethernet/intel/ice/ice.h
>+++ b/drivers/net/ethernet/intel/ice/ice.h
>@@ -94,6 +94,7 @@
> #define ICE_MIN_LAN_TXRX_MSIX	1
> #define ICE_MIN_LAN_OICR_MSIX	1
> #define ICE_MIN_MSIX		(ICE_MIN_LAN_TXRX_MSIX + ICE_MIN_LAN_OICR_MSIX)
>+#define ICE_MAX_MSIX		256
> #define ICE_FDIR_MSIX		2
> #define ICE_RDMA_NUM_AEQ_MSIX	4
> #define ICE_MIN_RDMA_MSIX	2
>@@ -535,6 +536,12 @@ struct ice_agg_node {
> 	u8 valid;
> };
> 
>+struct ice_pf_msix {
>+	u16 cur;
>+	u16 min;
>+	u16 max;
>+};
>+
> struct ice_pf {
> 	struct pci_dev *pdev;
> 
>@@ -604,6 +611,7 @@ struct ice_pf {
> 	struct msi_map ll_ts_irq;	/* LL_TS interrupt MSIX vector */
> 	u16 max_pf_txqs;	/* Total Tx queues PF wide */
> 	u16 max_pf_rxqs;	/* Total Rx queues PF wide */
>+	struct ice_pf_msix msix;
> 	u16 num_lan_msix;	/* Total MSIX vectors for base driver */
> 	u16 num_lan_tx;		/* num LAN Tx queues setup */
> 	u16 num_lan_rx;		/* num LAN Rx queues setup */
>diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.c b/drivers/net/ethernet/intel/ice/ice_devlink.c
>index cc717175178b..b82ff9556a4b 100644
>--- a/drivers/net/ethernet/intel/ice/ice_devlink.c
>+++ b/drivers/net/ethernet/intel/ice/ice_devlink.c
>@@ -1603,6 +1603,78 @@ enum ice_param_id {
> 	ICE_DEVLINK_PARAM_ID_LOOPBACK,
> };
> 
>+static int
>+ice_devlink_msix_max_pf_get(struct devlink *devlink, u32 id,
>+			    struct devlink_param_gset_ctx *ctx)
>+{
>+	struct ice_pf *pf = devlink_priv(devlink);
>+
>+	ctx->val.vu16 = pf->msix.max;
>+
>+	return 0;
>+}
>+
>+static int
>+ice_devlink_msix_max_pf_set(struct devlink *devlink, u32 id,
>+			    struct devlink_param_gset_ctx *ctx)
>+{
>+	struct ice_pf *pf = devlink_priv(devlink);
>+	u16 max = ctx->val.vu16;
>+
>+	pf->msix.max = max;

What's permanent about this exactly?


>+
>+	return 0;
>+}
>+
>+static int
>+ice_devlink_msix_max_pf_validate(struct devlink *devlink, u32 id,
>+				 union devlink_param_value val,
>+				 struct netlink_ext_ack *extack)
>+{
>+	if (val.vu16 > ICE_MAX_MSIX) {
>+		NL_SET_ERR_MSG_MOD(extack, "PF max MSI-X is too high");
>+		return -EINVAL;
>+	}
>+
>+	return 0;
>+}
>+
>+static int
>+ice_devlink_msix_min_pf_get(struct devlink *devlink, u32 id,
>+			    struct devlink_param_gset_ctx *ctx)
>+{
>+	struct ice_pf *pf = devlink_priv(devlink);
>+
>+	ctx->val.vu16 = pf->msix.min;
>+
>+	return 0;
>+}
>+
>+static int
>+ice_devlink_msix_min_pf_set(struct devlink *devlink, u32 id,
>+			    struct devlink_param_gset_ctx *ctx)
>+{
>+	struct ice_pf *pf = devlink_priv(devlink);
>+	u16 min = ctx->val.vu16;
>+
>+	pf->msix.min = min;

What's permanent about this exactly?


>+
>+	return 0;
>+}
>+
>+static int
>+ice_devlink_msix_min_pf_validate(struct devlink *devlink, u32 id,
>+				 union devlink_param_value val,
>+				 struct netlink_ext_ack *extack)
>+{
>+	if (val.vu16 <= ICE_MIN_MSIX) {
>+		NL_SET_ERR_MSG_MOD(extack, "PF min MSI-X is too low");
>+		return -EINVAL;
>+	}
>+
>+	return 0;
>+}
>+
> static const struct devlink_param ice_devlink_params[] = {
> 	DEVLINK_PARAM_GENERIC(ENABLE_ROCE, BIT(DEVLINK_PARAM_CMODE_RUNTIME),
> 			      ice_devlink_enable_roce_get,
>@@ -1618,6 +1690,16 @@ static const struct devlink_param ice_devlink_params[] = {
> 			     ice_devlink_loopback_get,
> 			     ice_devlink_loopback_set,
> 			     ice_devlink_loopback_validate),
>+	DEVLINK_PARAM_GENERIC(MSIX_VEC_PER_PF_MAX,
>+			      BIT(DEVLINK_PARAM_CMODE_PERMANENT),
>+			      ice_devlink_msix_max_pf_get,
>+			      ice_devlink_msix_max_pf_set,
>+			      ice_devlink_msix_max_pf_validate),
>+	DEVLINK_PARAM_GENERIC(MSIX_VEC_PER_PF_MIN,
>+			      BIT(DEVLINK_PARAM_CMODE_PERMANENT),

....


pw-bot: cr


>+			      ice_devlink_msix_min_pf_get,
>+			      ice_devlink_msix_min_pf_set,
>+			      ice_devlink_msix_min_pf_validate),
> };
> 
> static void ice_devlink_free(void *devlink_ptr)
>diff --git a/drivers/net/ethernet/intel/ice/ice_irq.c b/drivers/net/ethernet/intel/ice/ice_irq.c
>index ad82ff7d1995..fa7178a68b94 100644
>--- a/drivers/net/ethernet/intel/ice/ice_irq.c
>+++ b/drivers/net/ethernet/intel/ice/ice_irq.c
>@@ -254,6 +254,12 @@ int ice_init_interrupt_scheme(struct ice_pf *pf)
> 	int total_vectors = pf->hw.func_caps.common_cap.num_msix_vectors;
> 	int vectors, max_vectors;
> 
>+	/* load default PF MSI-X range */
>+	if (!pf->msix.min)
>+		pf->msix.min = ICE_MIN_MSIX;
>+	if (!pf->msix.max)
>+		pf->msix.max = total_vectors / 2;
>+
> 	vectors = ice_ena_msix_range(pf);
> 
> 	if (vectors < 0)
>-- 
>2.42.0
>
>