Received-SPF: pass (google.com: domain of linux-kernel+bounces-188049-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Message-ID: <aa6a5450-7e66-4da7-b396-1ce48837cd7e@intel.com>
Date: Thu, 23 May 2024 14:42:15 -0700
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH iwl-next v11] ice: Add get/set hw address for VFs using
 devlink commands
To: Karthik Sundaravel <ksundara@redhat.com>, <jesse.brandeburg@intel.com>,
	<wojciech.drewek@intel.com>, <sumang@marvell.com>,
	<anthony.l.nguyen@intel.com>, <davem@davemloft.net>, <edumazet@google.com>,
	<kuba@kernel.org>, <pabeni@redhat.com>, <intel-wired-lan@lists.osuosl.org>,
	<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <horms@kernel.org>
CC: <pmenzel@molgen.mpg.de>, <jiri@resnulli.us>,
	<michal.swiatkowski@linux.intel.com>, <bcreeley@amd.com>,
	<rjarry@redhat.com>, <aharivel@redhat.com>, <vchundur@redhat.com>,
	<cfontain@redhat.com>
References: <20240520102040.54745-1-ksundara@redhat.com>
 <20240520102040.54745-2-ksundara@redhat.com>
Content-Language: en-US
From: Jacob Keller <jacob.e.keller@intel.com>
In-Reply-To: <20240520102040.54745-2-ksundara@redhat.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WnY0cnE1OTFrSHBXZTVXV2FINGE5cndCTmdMQndPc3JDNUZDQVZLem9xS0x1?=
 =?utf-8?B?TkliaTlUMTFtTFQ5aHhuSzJOcW9SM0pXbk1xWDEzK2pUK3VFb0thWmZIbjBD?=
 =?utf-8?B?V1RNbmNiaWxBQXFlc1ZFalhmUmlFc2V5OVVSZkhPVnlKaWx2SGFqRlU5aEtK?=
 =?utf-8?B?NXZXWDFiRWxxdFpqdzRaZVF6dmNMQW5CQnhHbFNQanRnQWFkQmRBUC8wUFRU?=
 =?utf-8?B?VW03aXJwKzJzMFFOcEpBMmtwK3ZtMWpaZSs5SnR5b2RWMHdpMnJPblZZU0lN?=
 =?utf-8?B?ZzB6R1l1ZkVUWlQyNTZmdFpNcDUwOTdQY3lQdHJlTlhoRTEvTEczOC9halJY?=
 =?utf-8?B?L3FJZnZMRkF6ZENtQ09XOUtyYkM5UWttVGhmTnJHM3FxcHFqbUR0QTBSWGRr?=
 =?utf-8?B?TTk4dm1QNmhqdjdJaFJVMitEcW1oN0oxMmU0UmZBdm1lS3czemorKzlDODND?=
 =?utf-8?B?a2YrU3hhN3hISXN2QnVnT0pBdEFma25IZEFoVDF5M2dTekMrY3ZibW9JMkxs?=
 =?utf-8?B?TVJpSnFUQVpiaG1nTzh1WE9rWWNVUDlkOXQwMGRZYSs5MFN6bVVubW5FR1c4?=
 =?utf-8?B?VTBTR1dXWTNDQ05zbFlqK0IrOUZ6Y2RlQTRKWFNjOElQM09PelZQUU4xVFkz?=
 =?utf-8?B?N3dBTjl4NTBWbE1PRWhSUEcwNkdsQkt0MjU0cTBuK24yVHZObGxKK21CNCsw?=
 =?utf-8?B?SktIeGtncXlZMEFuUE5jOHdNTmNGc1pJdlVxQ2ZLUUw5QnA0dFErbVhWNVg1?=
 =?utf-8?B?b2MrOU15OGRBblFrakVFR0szOE5lUDNSWEY0WVZvUVA2TTNJM2xBMjNQZmww?=
 =?utf-8?B?d092ei9tRHMwMUJmeXp5TncyL2M5M3ZNeW5JSTk1UTE2V1JValN2a0RFVHZE?=
 =?utf-8?B?OFU4STMrNzM1dFF1VUhDWGxMMHVwTnowMXhyVHlpampmRGtDU2ZyMHhBS0JR?=
 =?utf-8?B?OVBhdU9FcG1LK2FkbmV4WGZDaDRMaUJ2YisyYTZIb0kwZTJCaFFzODNGMjRT?=
 =?utf-8?B?bm5Nb1pNSkpRR0Z4WmhPMjVpdU1SNlFoV2dNQ2lFUENlOEQ3K0RlTmhHRmRh?=
 =?utf-8?B?SWJyMTFtdGoyZ3Y4ZG1nazVSclJ0ZGkyend1QmZoUVdxNXZaaCtxRU4rRHdt?=
 =?utf-8?B?VGREVll1bW4xZHJJc085ZFlUcTlSbkdaZW8wQjN1Uy9oT0gySS9XZ01kZnJm?=
 =?utf-8?B?T1dUSU9QMFd2cUMrTFBoOEtZSUI0V09GVFBpNXBCQXBOK2JBZFBuMWdYbWJ1?=
 =?utf-8?B?NTZRUGN5QkNFMkdtSEloK0lTekFlb3V6S1VpeXgwR002eVJYVFA3SHpDdTR1?=
 =?utf-8?B?VDI1SFI5UUNucnA5UGVNZzhYdmFrZVBKai9zTXNNaThONjhIc0ovQUVMdm1C?=
 =?utf-8?B?SVZNeGRyeXhuMG5BaVVSczJJVGtoWTFUUEFTY0ZvR3RQVW9xTStFREF2Y2hy?=
 =?utf-8?B?OGRtQ21pVm0zWTdBQldZb0JTMUZ3QlNoYkFqOTN2ckdHZEErWkFsS0xPVEQ0?=
 =?utf-8?B?WXBucHNYcXRPSWZqZEg5ZmVDTHhURGpVd3RITzE3OWxjd01rSzNlWU5yWHEr?=
 =?utf-8?B?YUI5RUEzWGFvNTRGVkpEN3RZRHZKZExVb1ZzcWZzeDBOUHYwdXFKZVBjRzZV?=
 =?utf-8?B?QVppQkUyTnh4b0J2SzNDV3dIY3BuUWNDTWo4Z3cxTHQzc1lsR2lRVUNYT1Ra?=
 =?utf-8?B?MGFKZGQxMThHSHRaTU5GZVB0bEdrdktLWHR2YWZXN0NQd2N4SDgrdWJsRyt4?=
 =?utf-8?B?Y1BSNTlKSkdHb0VKaGUyZVhTdmF2bnFwK1NneUk0K3lZWWpHV2FGcDVwbTdJ?=
 =?utf-8?B?dkpYSm9aMlZMbGRUbUxUWjF2WTZiUHVnN1JSUW5iZFV1bnVQYjVzbTV5cUlq?=
 =?utf-8?B?amh3aDV1aG9VVFJqOStvakFFeTBZV1lmeVV6ZXhVa2VPWDlhSEordWZCQ0ZN?=
 =?utf-8?B?c1h3eXF0SVpjUzhQbEwvdUhBRGVvcVBDaDNWRkxVdmFYUkpTUmNEa3IzRzNP?=
 =?utf-8?B?eHZtV05rak91akZZeDFseHd4b2dLSmRlSEZUWmpZZCtrS2dmNDJUMjRkT3o3?=
 =?utf-8?B?Q1REYjIxQzhkQjJTWXp0UDlrc1JwT2FtUVc1akVZMWtDS1RHakpZWmsvajAw?=
 =?utf-8?B?THhzS1l3LzFncHZBTkxCU0NvQnhTQVNrMzEyemw3dVA4aHhSdnZQd2wvV3Ft?=
 =?utf-8?B?Tmc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: ae48fe96-2fa1-4286-0fcf-08dc7b713763
X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5089.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2024 21:42:17.2346
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: NrUd5J+zLShPQ5hQKmjYrGdrMPyp9D8v5OXiknwnjwZ4lAFTj5Sz1GnMpl6Xsw/CvxcfjJO/5woZdvilBC5ifmX+X91Nc1WagYOtdSpmmo0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB6527
X-OriginatorOrg: intel.com


On 5/20/2024 3:20 AM, Karthik Sundaravel wrote:
> Changing the MAC address of the VFs is currently unsupported via devlink.
> Add the function handlers to set and get the HW address for the VFs.
> 
> Signed-off-by: Karthik Sundaravel <ksundara@redhat.com>
> ---
>  .../ethernet/intel/ice/devlink/devlink_port.c | 59 ++++++++++++++++++-
>  drivers/net/ethernet/intel/ice/ice_sriov.c    | 32 +++++++---
>  drivers/net/ethernet/intel/ice/ice_sriov.h    |  8 +++
>  3 files changed, 89 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
> index c9fbeebf7fb9..00fed5a61d62 100644
> --- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
> +++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
> @@ -372,6 +372,62 @@ void ice_devlink_destroy_pf_port(struct ice_pf *pf)
>  	devl_port_unregister(&pf->devlink_port);
>  }
>  
> +/**
> + * ice_devlink_port_get_vf_fn_mac - .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_fn_mac(struct devlink_port *port,
> +					  u8 *hw_addr, int *hw_addr_len,
> +					  struct netlink_ext_ack *extack)
> +{
> +	struct ice_vf *vf = container_of(port, struct ice_vf, devlink_port);
> +
> +	ether_addr_copy(hw_addr, vf->dev_lan_addr);
> +	*hw_addr_len = ETH_ALEN;
> +
> +	return 0;
> +}
> +
> +/**
> + * ice_devlink_port_set_vf_fn_mac - .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_fn_mac(struct devlink_port *port,
> +					  const 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;
> +	u16 vf_id;
> +
> +	pf = devlink_priv(devlink);
> +	pci_vf = &attrs->pci_vf;
> +	vf_id = pci_vf->vf;
> +
> +	return __ice_set_vf_mac(pf, vf_id, hw_addr);
> +}
> +
> +static const struct devlink_port_ops ice_devlink_vf_port_ops = {
> +	.port_fn_hw_addr_get = ice_devlink_port_get_vf_fn_mac,
> +	.port_fn_hw_addr_set = ice_devlink_port_set_vf_fn_mac,
> +};
> +
>  /**
>   * ice_devlink_create_vf_port - Create a devlink port for this VF
>   * @vf: the VF to create a port for
> @@ -407,7 +463,8 @@ int ice_devlink_create_vf_port(struct ice_vf *vf)
>  	devlink_port_attrs_set(devlink_port, &attrs);
>  	devlink = priv_to_devlink(pf);
>  
> -	err = devl_port_register(devlink, devlink_port, vsi->idx);
> +	err = devl_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);
> diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c
> index 067712f4923f..dd1583b0fd90 100644
> --- a/drivers/net/ethernet/intel/ice/ice_sriov.c
> +++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
> @@ -1416,21 +1416,22 @@ ice_get_vf_cfg(struct net_device *netdev, int vf_id, struct ifla_vf_info *ivi)
>  }
>  
>  /**
> - * ice_set_vf_mac
> - * @netdev: network interface device structure
> + * __ice_set_vf_mac
> + * @pf: PF to be configure
>   * @vf_id: VF identifier
>   * @mac: MAC address
>   *
>   * program VF MAC address
>   */
> -int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
> +int __ice_set_vf_mac(struct ice_pf *pf, u16 vf_id, const u8 *mac)
>  {

This has a couple of new kdoc warnings:


>  * __ice_set_vf_mac
> drivers/net/ethernet/intel/ice/ice_sriov.c:1427: warning: No description found for return value of '__ice_set_vf_mac'
> drivers/net/ethernet/intel/ice/ice_sriov.c:1481: warning: missing initial short description on line:

These aren't the fault of this patch, but merely new due to renaming.
Since these are not fundamentally new issues, I am going to apply this
as-is.

For this alone, I do not think a v12 is necessary. However, if you need
to do a v12 for another reason, I would request that you fix the kdoc
warnings. Otherwise, the patch will fail our initial automated checks.

Thanks,
Jake

> -	struct ice_pf *pf = ice_netdev_to_pf(netdev);
> +	struct device *dev;
>  	struct ice_vf *vf;
>  	int ret;
>  
> +	dev = ice_pf_to_dev(pf);
>  	if (is_multicast_ether_addr(mac)) {
> -		netdev_err(netdev, "%pM not a valid unicast address\n", mac);
> +		dev_err(dev, "%pM not a valid unicast address\n", mac);
>  		return -EINVAL;
>  	}
>  
> @@ -1459,13 +1460,13 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
>  	if (is_zero_ether_addr(mac)) {
>  		/* VF will send VIRTCHNL_OP_ADD_ETH_ADDR message with its MAC */
>  		vf->pf_set_mac = false;
> -		netdev_info(netdev, "Removing MAC on VF %d. VF driver will be reinitialized\n",
> -			    vf->vf_id);
> +		dev_info(dev, "Removing MAC on VF %d. VF driver will be reinitialized\n",
> +			 vf->vf_id);
>  	} else {
>  		/* PF will add MAC rule for the VF */
>  		vf->pf_set_mac = true;
> -		netdev_info(netdev, "Setting MAC %pM on VF %d. VF driver will be reinitialized\n",
> -			    mac, vf_id);
> +		dev_info(dev, "Setting MAC %pM on VF %d. VF driver will be reinitialized\n",
> +			 mac, vf_id);
>  	}
>  
>  	ice_reset_vf(vf, ICE_VF_RESET_NOTIFY);
> @@ -1476,6 +1477,19 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
>  	return ret;
>  }
>  
> +/**
> + * ice_set_vf_mac
> + * @netdev: network interface device structure
> + * @vf_id: VF identifier
> + * @mac: MAC address
> + *
> + * program VF MAC address
> + */
> +int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
> +{
> +	return __ice_set_vf_mac(ice_netdev_to_pf(netdev), vf_id, mac);
> +}
> +
>  /**
>   * ice_set_vf_trust
>   * @netdev: network interface device structure
> diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.h b/drivers/net/ethernet/intel/ice/ice_sriov.h
> index 8f22313474d6..96549ca5c52c 100644
> --- a/drivers/net/ethernet/intel/ice/ice_sriov.h
> +++ b/drivers/net/ethernet/intel/ice/ice_sriov.h
> @@ -28,6 +28,7 @@
>  #ifdef CONFIG_PCI_IOV
>  void ice_process_vflr_event(struct ice_pf *pf);
>  int ice_sriov_configure(struct pci_dev *pdev, int num_vfs);
> +int __ice_set_vf_mac(struct ice_pf *pf, u16 vf_id, const u8 *mac);
>  int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac);
>  int
>  ice_get_vf_cfg(struct net_device *netdev, int vf_id, struct ifla_vf_info *ivi);
> @@ -80,6 +81,13 @@ ice_sriov_configure(struct pci_dev __always_unused *pdev,
>  	return -EOPNOTSUPP;
>  }
>  
> +static inline int
> +__ice_set_vf_mac(struct ice_pf __always_unused *pf,
> +		 u16 __always_unused vf_id, const u8 __always_unused *mac)
> +{
> +	return -EOPNOTSUPP;
> +}
> +
>  static inline int
>  ice_set_vf_mac(struct net_device __always_unused *netdev,
>  	       int __always_unused vf_id, u8 __always_unused *mac)