On Thu, Oct 31, 2024 at 10:48:37PM +0100, Michal Schmidt wrote:
> On Mon, Oct 28, 2024 at 11:04 AM Michal Swiatkowski
> <michal.swiatkow...@linux.intel.com> wrote:
> >
> > Use generic devlink PF MSI-X parameter to allow user to change MSI-X
> > range.
> >
> > Add notes about this parameters into ice devlink documentation.
> >
> > Reviewed-by: Wojciech Drewek <wojciech.dre...@intel.com>
> > Signed-off-by: Michal Swiatkowski <michal.swiatkow...@linux.intel.com>
> > ---
> > Documentation/networking/devlink/ice.rst | 11 +++
> > .../net/ethernet/intel/ice/devlink/devlink.c | 83 ++++++++++++++++++-
> > drivers/net/ethernet/intel/ice/ice.h | 7 ++
> > drivers/net/ethernet/intel/ice/ice_irq.c | 7 ++
> > 4 files changed, 107 insertions(+), 1 deletion(-)
> >
> > diff --git a/Documentation/networking/devlink/ice.rst
> > b/Documentation/networking/devlink/ice.rst
> > index e3972d03cea0..792e9f8c846a 100644
> > --- a/Documentation/networking/devlink/ice.rst
> > +++ b/Documentation/networking/devlink/ice.rst
> > @@ -69,6 +69,17 @@ Parameters
> >
> > To verify that value has been set:
> > $ devlink dev param show pci/0000:16:00.0 name tx_scheduling_layers
> > + * - ``msix_vec_per_pf_max``
> > + - driverinit
> > + - Set the max MSI-X that can be used by the PF, rest can be utilized
> > for
> > + SRIOV. The range is from min value set in msix_vec_per_pf_min to
> > + 2k/number of ports.
> > + * - ``msix_vec_per_pf_min``
> > + - driverinit
> > + - Set the min MSI-X that will be used by the PF. This value inform
> > how many
> > + MSI-X will be allocated statically. The range is from 2 to value set
> > + in msix_vec_per_pf_max.
> > +
> > .. list-table:: Driver specific parameters implemented
> > :widths: 5 5 90
> >
> > diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink.c
> > b/drivers/net/ethernet/intel/ice/devlink/devlink.c
> > index d1b9ccec5e05..29c1fec4fa93 100644
> > --- a/drivers/net/ethernet/intel/ice/devlink/devlink.c
> > +++ b/drivers/net/ethernet/intel/ice/devlink/devlink.c
> > @@ -1198,6 +1198,25 @@ static int ice_devlink_set_parent(struct
> > devlink_rate *devlink_rate,
> > return status;
> > }
> >
> > +static void ice_set_min_max_msix(struct ice_pf *pf)
> > +{
> > + struct devlink *devlink = priv_to_devlink(pf);
> > + union devlink_param_value val;
> > + int err;
> > +
> > + err = devl_param_driverinit_value_get(devlink,
> > +
> > DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN,
> > + &val);
> > + if (!err)
> > + pf->msix.min = val.vu16;
> > +
> > + err = devl_param_driverinit_value_get(devlink,
> > +
> > DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MAX,
> > + &val);
> > + if (!err)
> > + pf->msix.max = val.vu16;
> > +}
> > +
> > /**
> > * ice_devlink_reinit_up - do reinit of the given PF
> > * @pf: pointer to the PF struct
> > @@ -1207,6 +1226,9 @@ static int ice_devlink_reinit_up(struct ice_pf *pf)
> > struct ice_vsi *vsi = ice_get_main_vsi(pf);
> > int err;
> >
> > + /* load MSI-X values */
> > + ice_set_min_max_msix(pf);
> > +
> > err = ice_init_hw(&pf->hw);
> > if (err) {
> > dev_err(ice_pf_to_dev(pf), "ice_init_hw failed: %d\n", err);
> > @@ -1526,6 +1548,37 @@ static int ice_devlink_local_fwd_validate(struct
> > devlink *devlink, u32 id,
> > 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)
> > +{
> > + struct ice_pf *pf = devlink_priv(devlink);
> > +
> > + if (val.vu16 > pf->hw.func_caps.common_cap.num_msix_vectors ||
> > + val.vu16 < pf->msix.min) {
> > + NL_SET_ERR_MSG_MOD(extack, "Value is invalid");
> > + return -EINVAL;
> > + }
> > +
> > + 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)
> > +{
> > + struct ice_pf *pf = devlink_priv(devlink);
> > +
> > + if (val.vu16 <= ICE_MIN_MSIX || val.vu16 > pf->msix.max) {
> > + NL_SET_ERR_MSG_MOD(extack, "Value is invalid");
> > + return -EINVAL;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > enum ice_param_id {
> > ICE_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX,
> > ICE_DEVLINK_PARAM_ID_TX_SCHED_LAYERS,
> > @@ -1543,6 +1596,15 @@ static const struct devlink_param
> > ice_dvl_rdma_params[] = {
> > ice_devlink_enable_iw_validate),
> > };
> >
> > +static const struct devlink_param ice_dvl_msix_params[] = {
> > + DEVLINK_PARAM_GENERIC(MSIX_VEC_PER_PF_MAX,
> > + BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),
> > + NULL, NULL, ice_devlink_msix_max_pf_validate),
> > + DEVLINK_PARAM_GENERIC(MSIX_VEC_PER_PF_MIN,
> > + BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),
> > + NULL, NULL, ice_devlink_msix_min_pf_validate),
> > +};
> > +
> > static const struct devlink_param ice_dvl_sched_params[] = {
> > DEVLINK_PARAM_DRIVER(ICE_DEVLINK_PARAM_ID_TX_SCHED_LAYERS,
> > "tx_scheduling_layers",
> > @@ -1644,6 +1706,7 @@ void ice_devlink_unregister(struct ice_pf *pf)
> > int ice_devlink_register_params(struct ice_pf *pf)
> > {
> > struct devlink *devlink = priv_to_devlink(pf);
> > + union devlink_param_value value;
> > struct ice_hw *hw = &pf->hw;
> > int status;
> >
> > @@ -1652,11 +1715,27 @@ int ice_devlink_register_params(struct ice_pf *pf)
> > if (status)
> > return status;
> >
> > + status = devl_params_register(devlink, ice_dvl_msix_params,
> > + ARRAY_SIZE(ice_dvl_msix_params));
> > + if (status)
> > + return status;
> > +
> > if (hw->func_caps.common_cap.tx_sched_topo_comp_mode_en)
> > status = devl_params_register(devlink, ice_dvl_sched_params,
> >
> > ARRAY_SIZE(ice_dvl_sched_params));
> > + if (status)
> > + return status;
> >
> > - return status;
> > + value.vu16 = pf->msix.max;
> > + devl_param_driverinit_value_set(devlink,
> > +
> > DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MAX,
> > + value);
> > + value.vu16 = pf->msix.min;
> > + devl_param_driverinit_value_set(devlink,
> > +
> > DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN,
> > + value);
> > +
> > + return 0;
> > }
>
>
> The type of the devlink parameters msix_vec_per_pf_{min,max} is
> specified as u32, so you must use value.vu32 everywhere you work with
> them, not vu16.
>
I will change it.
> Michal
>
