On Tue, Apr 09, 2024 at 10:34:27AM +0200, Mateusz Polchlopek wrote:
>
>
> On 4/8/2024 12:30 PM, Michal Swiatkowski wrote:
> > From: Piotr Raczynski <piotr.raczyn...@intel.com>
> >
> > Make devlink allocation function generic to use it for PF and for SF.
> >
> > Add function for SF devlink port creation. It will be used in next
> > patch.
> >
> > Signed-off-by: Piotr Raczynski <piotr.raczyn...@intel.com>
> > Signed-off-by: Michal Swiatkowski <michal.swiatkow...@linux.intel.com>
> > ---
> > .../net/ethernet/intel/ice/devlink/devlink.c | 39 ++++++++++++--
> > .../net/ethernet/intel/ice/devlink/devlink.h | 1 +
> > .../ethernet/intel/ice/devlink/devlink_port.c | 51 +++++++++++++++++++
> > .../ethernet/intel/ice/devlink/devlink_port.h | 3 ++
> > 4 files changed, 89 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink.c
> > b/drivers/net/ethernet/intel/ice/devlink/devlink.c
> > index 661af04c8eef..05a752fec316 100644
> > --- a/drivers/net/ethernet/intel/ice/devlink/devlink.c
> > +++ b/drivers/net/ethernet/intel/ice/devlink/devlink.c
> > @@ -10,6 +10,7 @@
> > #include "ice_eswitch.h"
> > #include "ice_fw_update.h"
> > #include "ice_dcb_lib.h"
> > +#include "ice_sf_eth.h"
> > /* context for devlink info version reporting */
> > struct ice_info_ctx {
> > @@ -1286,6 +1287,8 @@ static const struct devlink_ops ice_devlink_ops = {
> > .port_new = ice_devlink_port_new,
> > };
> > +static const struct devlink_ops ice_sf_devlink_ops;
> > +
> > static int
> > ice_devlink_enable_roce_get(struct devlink *devlink, u32 id,
> > struct devlink_param_gset_ctx *ctx)
> > @@ -1417,14 +1420,17 @@ static void ice_devlink_free(void *devlink_ptr)
> > }
> > /**
> > - * ice_allocate_pf - Allocate devlink and return PF structure pointer
> > + * ice_devlink_alloc - Allocate devlink and return devlink priv pointer
> > * @dev: the device to allocate for
> > + * @priv_size: size of the priv memory
> > + * @ops: pointer to devlink ops for this device
> > *
> > - * Allocate a devlink instance for this device and return the private area
> > as
> > - * the PF structure. The devlink memory is kept track of through devres by
> > - * adding an action to remove it when unwinding.
> > + * Allocate a devlink instance for this device and return the private
> > pointer
> > + * The devlink memory is kept track of through devres by adding an action
> > to
> > + * remove it when unwinding.
> > */
> > -struct ice_pf *ice_allocate_pf(struct device *dev)
> > +static void *ice_devlink_alloc(struct device *dev, size_t priv_size,
> > + const struct devlink_ops *ops)
>
> Why do we need priv_size and ops if those are not used in the function?
> Shouldn't it be line:
>
> devlink = devlink_alloc(&ice_devlink_ops, sizeof(struct ice_pf), dev);
>
> in ice_devlink_alloc changed to take the passed param?
>
>
Right, it is an error. I will fix it in v2. Thanks for pointing it.
Michal
> > {
> > struct devlink *devlink;
> > @@ -1439,6 +1445,29 @@ struct ice_pf *ice_allocate_pf(struct device *dev)
> > return devlink_priv(devlink);
> > }
> > +/**
> > + * ice_allocate_pf - Allocate devlink and return PF structure pointer
> > + * @dev: the device to allocate for
> > + *
> > + * Allocate a devlink instance for PF.
> > + */
> > +struct ice_pf *ice_allocate_pf(struct device *dev)
> > +{
> > + return ice_devlink_alloc(dev, sizeof(struct ice_pf), &ice_devlink_ops);
> > +}
> > +
> > +/**
> > + * ice_allocate_sf - Allocate devlink and return SF structure pointer
> > + * @dev: the device to allocate for
> > + *
> > + * Allocate a devlink instance for SF.
> > + */
> > +struct ice_sf_priv *ice_allocate_sf(struct device *dev)
> > +{
> > + return ice_devlink_alloc(dev, sizeof(struct ice_sf_priv),
> > + &ice_sf_devlink_ops);
> > +}
> > +
> > /**
> > * ice_devlink_register - Register devlink interface for this PF
> > * @pf: the PF to register the devlink for.
> > diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink.h
> > b/drivers/net/ethernet/intel/ice/devlink/devlink.h
> > index d291c0e2e17b..1b2a5980d5e8 100644
> > --- a/drivers/net/ethernet/intel/ice/devlink/devlink.h
> > +++ b/drivers/net/ethernet/intel/ice/devlink/devlink.h
> > @@ -5,6 +5,7 @@
> > #define _ICE_DEVLINK_H_
> > struct ice_pf *ice_allocate_pf(struct device *dev);
> > +struct ice_sf_priv *ice_allocate_sf(struct device *dev);
> > void ice_devlink_register(struct ice_pf *pf);
> > void ice_devlink_unregister(struct ice_pf *pf);
> > diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
> > b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
> > index f5e305a71bd0..1b933083f551 100644
> > --- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
> > +++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
> > @@ -432,6 +432,57 @@ void ice_devlink_destroy_vf_port(struct ice_vf *vf)
> > devlink_port_unregister(&vf->devlink_port);
> > }
> > +/**
> > + * ice_devlink_create_sf_dev_port - Register virtual port for a subfunction
> > + * @sf_dev: the subfunction device to create a devlink port for
> > + *
> > + * Register virtual flavour devlink port for the subfunction auxiliary
> > device
> > + * created after activating a dynamically added devlink port.
> > + *
> > + * Return: zero on success or an error code on failure.
> > + */
> > +int ice_devlink_create_sf_dev_port(struct ice_sf_dev *sf_dev)
> > +{
> > + struct devlink_port_attrs attrs = {};
> > + struct devlink_port *devlink_port;
> > + struct ice_dynamic_port *dyn_port;
> > + struct devlink *devlink;
> > + struct ice_vsi *vsi;
> > + struct device *dev;
> > + struct ice_pf *pf;
> > + int err;
> > +
> > + dyn_port = sf_dev->dyn_port;
> > + vsi = dyn_port->vsi;
> > + pf = dyn_port->pf;
> > + dev = ice_pf_to_dev(pf);
> > +
> > + devlink_port = &sf_dev->priv->devlink_port;
> > +
> > + attrs.flavour = DEVLINK_PORT_FLAVOUR_VIRTUAL;
> > +
> > + devlink_port_attrs_set(devlink_port, &attrs);
> > + devlink = priv_to_devlink(sf_dev->priv);
> > +
> > + err = devl_port_register(devlink, devlink_port, vsi->idx);
> > + if (err)
> > + dev_err(dev, "Failed to create virtual devlink port for
> > auxiliary subfunction device %d",
> > + vsi->idx);
> > +
> > + return err;
> > +}
> > +
> > +/**
> > + * ice_devlink_destroy_sf_dev_port - Destroy virtual port for a subfunction
> > + * @sf_dev: the subfunction device to create a devlink port for
> > + *
> > + * Unregisters the virtual port associated with this subfunction.
> > + */
> > +void ice_devlink_destroy_sf_dev_port(struct ice_sf_dev *sf_dev)
> > +{
> > + devl_port_unregister(&sf_dev->priv->devlink_port);
> > +}
> > +
> > /**
> > * ice_activate_dynamic_port - Activate a dynamic port
> > * @dyn_port: dynamic port instance to activate
> > diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
> > b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
> > index 30146fef64b9..1f66705e0261 100644
> > --- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
> > +++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
> > @@ -5,6 +5,7 @@
> > #define _DEVLINK_PORT_H_
> > #include "../ice.h"
> > +#include "ice_sf_eth.h"
> > /**
> > * struct ice_dynamic_port - Track dynamically added devlink port instance
> > @@ -30,6 +31,8 @@ int ice_devlink_create_pf_port(struct ice_pf *pf);
> > void ice_devlink_destroy_pf_port(struct ice_pf *pf);
> > int ice_devlink_create_vf_port(struct ice_vf *vf);
> > void ice_devlink_destroy_vf_port(struct ice_vf *vf);
> > +int ice_devlink_create_sf_dev_port(struct ice_sf_dev *sf_dev);
> > +void ice_devlink_destroy_sf_dev_port(struct ice_sf_dev *sf_dev);
> > #define ice_devlink_port_to_dyn(p) \
> > container_of(port, struct ice_dynamic_port, devlink_port)
