| Message ID | 20240209100912.82473-1-ksundara@redhat.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v3] ice: Add get/set hw address for VFs using devlink commands | expand |
On Fri, Feb 09, 2024 at 03:39:12PM +0530, Karthik Sundaravel wrote: > Changing the MAC address of the VFs are not available > via devlink. Add the function handlers to set and get > the HW address for the VFs. > > Signed-off-by: Karthik Sundaravel <ksundara@redhat.com> > --- > drivers/net/ethernet/intel/ice/ice_devlink.c | 86 +++++++++++++++++++- > 1 file changed, 85 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.c b/drivers/net/ethernet/intel/ice/ice_devlink.c > index 80dc5445b50d..7ed61b10312c 100644 > --- a/drivers/net/ethernet/intel/ice/ice_devlink.c > +++ b/drivers/net/ethernet/intel/ice/ice_devlink.c > @@ -1576,6 +1576,89 @@ void ice_devlink_destroy_pf_port(struct ice_pf *pf) > devlink_port_unregister(&pf->devlink_port); > } > > +/** > + * ice_devlink_port_get_vf_mac_address - .port_fn_hw_addr_get devlink handler > + * @port: devlink port structure > + * @hw_addr: MAC address of the port > + * @hw_addr_len: length of MAC address > + * @extack: extended netdev ack structure > + * > + * Callback for the devlink .port_fn_hw_addr_get operation > + * Return: zero on success or an error code on failure. > + */ > + > +static int ice_devlink_port_get_vf_mac_address(struct devlink_port *port, > + u8 *hw_addr, int *hw_addr_len, > + struct netlink_ext_ack *extack) > +{ > + struct devlink_port_attrs *attrs = &port->attrs; > + struct devlink_port_pci_vf_attrs *pci_vf; > + struct devlink *devlink = port->devlink; > + struct ice_pf *pf; > + struct ice_vf *vf; > + int vf_id; > + > + pf = devlink_priv(devlink); > + if (attrs->flavour == DEVLINK_PORT_FLAVOUR_PCI_VF) { > + pci_vf = &attrs->pci_vf; > + vf_id = pci_vf->vf; > + } else { > + NL_SET_ERR_MSG_MOD(extack, "Unable to get the vf id"); > + return -EADDRNOTAVAIL; > + } > + vf = ice_get_vf_by_id(pf, vf_id); You need to call ice_put_vf(vf); when you finish with vf. This way to get vf pointer is fine, I wonder if it can be done using container_of on port variable. Jake, what do you think? CC: Jacob Keller > + if (!vf) { > + NL_SET_ERR_MSG_MOD(extack, "Unable to get the vf"); > + return -EINVAL; > + } > + ether_addr_copy(hw_addr, vf->dev_lan_addr); > + *hw_addr_len = ETH_ALEN; > + return 0; > +} > + > +/** > + * ice_devlink_port_set_vf_mac_address - .port_fn_hw_addr_set devlink handler > + * @port: devlink port structure > + * @hw_addr: MAC address of the port > + * @hw_addr_len: length of MAC address > + * @extack: extended netdev ack structure > + * > + * Callback for the devlink .port_fn_hw_addr_set operation > + * Return: zero on success or an error code on failure. > + */ > +static int ice_devlink_port_set_vf_mac_address(struct devlink_port *port, > + const u8 *hw_addr, > + int hw_addr_len, > + struct netlink_ext_ack *extack) > +{ > + struct net_device *netdev = port->type_eth.netdev; Is it PF netdev? > + struct devlink_port_attrs *attrs = &port->attrs; > + struct devlink_port_pci_vf_attrs *pci_vf; > + u8 mac[ETH_ALEN]; > + int vf_id; > + > + if (attrs->flavour == DEVLINK_PORT_FLAVOUR_PCI_VF) { > + pci_vf = &attrs->pci_vf; > + vf_id = pci_vf->vf; > + } else { > + NL_SET_ERR_MSG_MOD(extack, "Unable to get the vf id"); > + return -EADDRNOTAVAIL; > + } > + > + if (!netdev) { > + NL_SET_ERR_MSG_MOD(extack, "Unable to get the netdev"); > + return -EADDRNOTAVAIL; > + } > + ether_addr_copy(mac, hw_addr); > + > + return ice_set_vf_mac(netdev, vf_id, mac); > +} > + > +static const struct devlink_port_ops ice_devlink_vf_port_ops = { > + .port_fn_hw_addr_get = ice_devlink_port_get_vf_mac_address, > + .port_fn_hw_addr_set = ice_devlink_port_set_vf_mac_address, > +}; > + > /** > * ice_devlink_create_vf_port - Create a devlink port for this VF > * @vf: the VF to create a port for > @@ -1611,7 +1694,8 @@ int ice_devlink_create_vf_port(struct ice_vf *vf) > devlink_port_attrs_set(devlink_port, &attrs); > devlink = priv_to_devlink(pf); > > - err = devlink_port_register(devlink, devlink_port, vsi->idx); > + err = devlink_port_register_with_ops(devlink, devlink_port, > + vsi->idx, &ice_devlink_vf_port_ops); > if (err) { > dev_err(dev, "Failed to create devlink port for VF %d, error %d\n", > vf->vf_id, err); > -- > 2.39.3 (Apple Git-145) >
On Tue, Feb 13, 2024 at 6:21 PM Michal Swiatkowski <michal.swiatkowski@linux.intel.com> wrote: > > On Fri, Feb 09, 2024 at 03:39:12PM +0530, Karthik Sundaravel wrote: > > Changing the MAC address of the VFs are not available > > via devlink. Add the function handlers to set and get > > the HW address for the VFs. > > > > Signed-off-by: Karthik Sundaravel <ksundara@redhat.com> > > --- > > drivers/net/ethernet/intel/ice/ice_devlink.c | 86 +++++++++++++++++++- > > 1 file changed, 85 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.c b/drivers/net/ethernet/intel/ice/ice_devlink.c > > index 80dc5445b50d..7ed61b10312c 100644 > > --- a/drivers/net/ethernet/intel/ice/ice_devlink.c > > +++ b/drivers/net/ethernet/intel/ice/ice_devlink.c > > @@ -1576,6 +1576,89 @@ void ice_devlink_destroy_pf_port(struct ice_pf *pf) > > devlink_port_unregister(&pf->devlink_port); > > } > > > > +/** > > + * ice_devlink_port_get_vf_mac_address - .port_fn_hw_addr_get devlink handler > > + * @port: devlink port structure > > + * @hw_addr: MAC address of the port > > + * @hw_addr_len: length of MAC address > > + * @extack: extended netdev ack structure > > + * > > + * Callback for the devlink .port_fn_hw_addr_get operation > > + * Return: zero on success or an error code on failure. > > + */ > > + > > +static int ice_devlink_port_get_vf_mac_address(struct devlink_port *port, > > + u8 *hw_addr, int *hw_addr_len, > > + struct netlink_ext_ack *extack) > > +{ > > + struct devlink_port_attrs *attrs = &port->attrs; > > + struct devlink_port_pci_vf_attrs *pci_vf; > > + struct devlink *devlink = port->devlink; > > + struct ice_pf *pf; > > + struct ice_vf *vf; > > + int vf_id; > > + > > + pf = devlink_priv(devlink); > > + if (attrs->flavour == DEVLINK_PORT_FLAVOUR_PCI_VF) { > > + pci_vf = &attrs->pci_vf; > > + vf_id = pci_vf->vf; > > + } else { > > + NL_SET_ERR_MSG_MOD(extack, "Unable to get the vf id"); > > + return -EADDRNOTAVAIL; > > + } > > + vf = ice_get_vf_by_id(pf, vf_id); > You need to call ice_put_vf(vf); when you finish with vf. > > This way to get vf pointer is fine, I wonder if it can be done using > container_of on port variable. Jake, what do you think? > CC: Jacob Keller > > > + if (!vf) { > > + NL_SET_ERR_MSG_MOD(extack, "Unable to get the vf"); > > + return -EINVAL; > > + } > > + ether_addr_copy(hw_addr, vf->dev_lan_addr); > > + *hw_addr_len = ETH_ALEN; > > + return 0; > > +} > > + > > +/** > > + * ice_devlink_port_set_vf_mac_address - .port_fn_hw_addr_set devlink handler > > + * @port: devlink port structure > > + * @hw_addr: MAC address of the port > > + * @hw_addr_len: length of MAC address > > + * @extack: extended netdev ack structure > > + * > > + * Callback for the devlink .port_fn_hw_addr_set operation > > + * Return: zero on success or an error code on failure. > > + */ > > +static int ice_devlink_port_set_vf_mac_address(struct devlink_port *port, > > + const u8 *hw_addr, > > + int hw_addr_len, > > + struct netlink_ext_ack *extack) > > +{ > > + struct net_device *netdev = port->type_eth.netdev; > Is it PF netdev? Its VF netdev > > > + struct devlink_port_attrs *attrs = &port->attrs; > > + struct devlink_port_pci_vf_attrs *pci_vf; > > + u8 mac[ETH_ALEN]; > > + int vf_id; > > + > > + if (attrs->flavour == DEVLINK_PORT_FLAVOUR_PCI_VF) { > > + pci_vf = &attrs->pci_vf; > > + vf_id = pci_vf->vf; > > + } else { > > + NL_SET_ERR_MSG_MOD(extack, "Unable to get the vf id"); > > + return -EADDRNOTAVAIL; > > + } > > + > > + if (!netdev) { > > + NL_SET_ERR_MSG_MOD(extack, "Unable to get the netdev"); > > + return -EADDRNOTAVAIL; > > + } > > + ether_addr_copy(mac, hw_addr); > > + > > + return ice_set_vf_mac(netdev, vf_id, mac); > > +} > > + > > +static const struct devlink_port_ops ice_devlink_vf_port_ops = { > > + .port_fn_hw_addr_get = ice_devlink_port_get_vf_mac_address, > > + .port_fn_hw_addr_set = ice_devlink_port_set_vf_mac_address, > > +}; > > + > > /** > > * ice_devlink_create_vf_port - Create a devlink port for this VF > > * @vf: the VF to create a port for > > @@ -1611,7 +1694,8 @@ int ice_devlink_create_vf_port(struct ice_vf *vf) > > devlink_port_attrs_set(devlink_port, &attrs); > > devlink = priv_to_devlink(pf); > > > > - err = devlink_port_register(devlink, devlink_port, vsi->idx); > > + err = devlink_port_register_with_ops(devlink, devlink_port, > > + vsi->idx, &ice_devlink_vf_port_ops); > > if (err) { > > dev_err(dev, "Failed to create devlink port for VF %d, error %d\n", > > vf->vf_id, err); > > -- > > 2.39.3 (Apple Git-145) > > >
diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.c b/drivers/net/ethernet/intel/ice/ice_devlink.c index 80dc5445b50d..7ed61b10312c 100644 --- a/drivers/net/ethernet/intel/ice/ice_devlink.c +++ b/drivers/net/ethernet/intel/ice/ice_devlink.c @@ -1576,6 +1576,89 @@ void ice_devlink_destroy_pf_port(struct ice_pf *pf) devlink_port_unregister(&pf->devlink_port); } +/** + * ice_devlink_port_get_vf_mac_address - .port_fn_hw_addr_get devlink handler + * @port: devlink port structure + * @hw_addr: MAC address of the port + * @hw_addr_len: length of MAC address + * @extack: extended netdev ack structure + * + * Callback for the devlink .port_fn_hw_addr_get operation + * Return: zero on success or an error code on failure. + */ + +static int ice_devlink_port_get_vf_mac_address(struct devlink_port *port, + u8 *hw_addr, int *hw_addr_len, + struct netlink_ext_ack *extack) +{ + struct devlink_port_attrs *attrs = &port->attrs; + struct devlink_port_pci_vf_attrs *pci_vf; + struct devlink *devlink = port->devlink; + struct ice_pf *pf; + struct ice_vf *vf; + int vf_id; + + pf = devlink_priv(devlink); + if (attrs->flavour == DEVLINK_PORT_FLAVOUR_PCI_VF) { + pci_vf = &attrs->pci_vf; + vf_id = pci_vf->vf; + } else { + NL_SET_ERR_MSG_MOD(extack, "Unable to get the vf id"); + return -EADDRNOTAVAIL; + } + vf = ice_get_vf_by_id(pf, vf_id); + if (!vf) { + NL_SET_ERR_MSG_MOD(extack, "Unable to get the vf"); + return -EINVAL; + } + ether_addr_copy(hw_addr, vf->dev_lan_addr); + *hw_addr_len = ETH_ALEN; + return 0; +} + +/** + * ice_devlink_port_set_vf_mac_address - .port_fn_hw_addr_set devlink handler + * @port: devlink port structure + * @hw_addr: MAC address of the port + * @hw_addr_len: length of MAC address + * @extack: extended netdev ack structure + * + * Callback for the devlink .port_fn_hw_addr_set operation + * Return: zero on success or an error code on failure. + */ +static int ice_devlink_port_set_vf_mac_address(struct devlink_port *port, + const u8 *hw_addr, + int hw_addr_len, + struct netlink_ext_ack *extack) +{ + struct net_device *netdev = port->type_eth.netdev; + struct devlink_port_attrs *attrs = &port->attrs; + struct devlink_port_pci_vf_attrs *pci_vf; + u8 mac[ETH_ALEN]; + int vf_id; + + if (attrs->flavour == DEVLINK_PORT_FLAVOUR_PCI_VF) { + pci_vf = &attrs->pci_vf; + vf_id = pci_vf->vf; + } else { + NL_SET_ERR_MSG_MOD(extack, "Unable to get the vf id"); + return -EADDRNOTAVAIL; + } + + if (!netdev) { + NL_SET_ERR_MSG_MOD(extack, "Unable to get the netdev"); + return -EADDRNOTAVAIL; + } + ether_addr_copy(mac, hw_addr); + + return ice_set_vf_mac(netdev, vf_id, mac); +} + +static const struct devlink_port_ops ice_devlink_vf_port_ops = { + .port_fn_hw_addr_get = ice_devlink_port_get_vf_mac_address, + .port_fn_hw_addr_set = ice_devlink_port_set_vf_mac_address, +}; + /** * ice_devlink_create_vf_port - Create a devlink port for this VF * @vf: the VF to create a port for @@ -1611,7 +1694,8 @@ int ice_devlink_create_vf_port(struct ice_vf *vf) devlink_port_attrs_set(devlink_port, &attrs); devlink = priv_to_devlink(pf); - err = devlink_port_register(devlink, devlink_port, vsi->idx); + err = devlink_port_register_with_ops(devlink, devlink_port, + vsi->idx, &ice_devlink_vf_port_ops); if (err) { dev_err(dev, "Failed to create devlink port for VF %d, error %d\n", vf->vf_id, err);
Changing the MAC address of the VFs are not available via devlink. Add the function handlers to set and get the HW address for the VFs. Signed-off-by: Karthik Sundaravel <ksundara@redhat.com> --- drivers/net/ethernet/intel/ice/ice_devlink.c | 86 +++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-)