Received-SPF: pass (google.com: domain of linux-kernel+bounces-93508-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <d490068e-ad6e-44a5-902a-b2166448b6bf@intel.com>
Date: Wed, 6 Mar 2024 09:34:16 +0100
User-Agent: Mozilla Thunderbird
Subject: Re: [Intel-wired-lan] [PATCH v5] ice: Add get/set hw address for VFs
 using devlink commands
To: Karthik Sundaravel <ksundara@redhat.com>, <jesse.brandeburg@intel.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>
CC: <pmenzel@molgen.mpg.de>, <aharivel@redhat.com>, <jiri@resnulli.us>,
	<cfontain@redhat.com>, <vchundur@redhat.com>,
	<michal.swiatkowski@linux.intel.com>, <rjarry@redhat.com>
References: <20240305152641.53489-1-ksundara@redhat.com>
Content-Language: en-US
From: Wojciech Drewek <wojciech.drewek@intel.com>
In-Reply-To: <20240305152641.53489-1-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?cDl3Y2tXZUs3S2Z0bHYzQmNDc1lGUGV6WTVib1ZvRk9LNmg3R01mTEk2RWlQ?=
 =?utf-8?B?blFaQkhQUWpFTU9oazZtQy9KSGhqRStCdEhVdmtwMTdzenFXaTlCWTRSTm9S?=
 =?utf-8?B?SmR0Qk5DU3JWdW11YkVzeW9xT3MxaHdFVDZZZXlVMklHUndMVE1pTXIyelhK?=
 =?utf-8?B?MVFNYjk5Y2I4Q0tXdS93MjR4a054SEJTSTdabGZNSU1NNjUxdGxJcDZJOFNH?=
 =?utf-8?B?d1ZoKzJhN2lYTjhxaTVrQTh4SS9mS242NVNaYzZONzNONXYyUWF1U1BlUUZx?=
 =?utf-8?B?TEZ6VStaS21VaTdad3I4SHFwbVlDZlNwbTlmM3B0TmtIVE03ZjVwQUxiSk9B?=
 =?utf-8?B?SDJmN0h2YVNFeXJLejdSeGZ2UERJNlppcm1zMjlFNHlpdEwvNmlYbTdLUndE?=
 =?utf-8?B?UlJublEvckFnVUo3RzVXb0xHbkNGYUk1R0R3SmtLY1hGVWxwMDQ2a0VxZ1M5?=
 =?utf-8?B?M1c2UldrcDNLN05QVjltS28vRkVEYW5vT3d4OXdNbWF4a2hXN2d2Wm9kUk5l?=
 =?utf-8?B?RGVkZklwbldxdUkwcndtU01tbUhiV09zSDRVemlZbVliRHBya01WQ3dTajNq?=
 =?utf-8?B?dm9iaWsyZzZlaTVrQUE0OURqWm0wV3I0bEM0dzFVYmp6UjQxNHQ0Rmk3aVNQ?=
 =?utf-8?B?TkUwQ0dEYjZiVDZNRjNrS0ZGeGlFSFlpLzkvS0VkTjZucnZZVGpQTktud1FO?=
 =?utf-8?B?YlZlSXlwUVhEbS9qQnpBa3dNUThOUlp1cHQ1YkRGeXVzRGlHL2VISjZtZVBa?=
 =?utf-8?B?dUtrVHZYQk4wWWFnaXRxZFhiU2FXZlhhcnZhekU3bjljbGpKRjlLU0c3S2FO?=
 =?utf-8?B?SE5VSlJWM1o5Z0xmOG9kUkdlVnlvMSt6YjRyUmZwUEhHc1JJb2l0YytoVTB4?=
 =?utf-8?B?WmR0WG9hWXBqMEdnL3RnQmhWdkkrK3h4K1lLVW5DamRvN2JKMG5BbkRtRmZl?=
 =?utf-8?B?a3c2Q01YME11V0lZR2xlaWNXTlRzQk1tOWx5dnJQeFM2MkQxVHU2a0I5dGRN?=
 =?utf-8?B?RTZGK2Rtb0FESGNkVUlxSzhqYUZHbWYyZHFJYmRCNVhnOU1BMXFnbXVVY0M4?=
 =?utf-8?B?MUhTNDJRWFBUTTJTYTcyT1k2bGlaUTQrR3FQRGhSOFJnNlZRUVlRaVNpRlhC?=
 =?utf-8?B?NFR0RlgyU3gvZVYzZVF1ZGJMVHFNRUJvdWZ0VkplZFVMZDFsd0pDb1RaTEw5?=
 =?utf-8?B?cG1qcmJrSjRtVGthTE0yR0xGMHlJVU1wakRCYndCMlVtYisxSTdkQkhaMi90?=
 =?utf-8?B?eTFrQ0xrMXVmd0lHeUpURUVQdzkwNDhUWTJscHUwUVVQQ1lFbnBlYnNXbUg2?=
 =?utf-8?B?Z0NvNEVsa2tiUjRaMFV0VUxzRnFPZUxOY2M0WFMzTWVDaW1XN2RYVXp6eU9S?=
 =?utf-8?B?Q2piWVFOc1krOFJFUTdrNHRKR2FnUTVHaG1JVEM2YWpNRmJyZThuQkY3SkdQ?=
 =?utf-8?B?L1QwZit0NWVObjBkR0NUMndOSkhuWktOQnpUVm1KNTRmZHFEMFlIM2tuSkg4?=
 =?utf-8?B?dTFGVGhWQ05QRUN4UitUZEN3ZFJUTWtiTUY0SFJXS2JYZUNRZDRMRFQwWVRM?=
 =?utf-8?B?K01mSHFWVWJwZFRIdDF3QkFMaDJ5S3NIaTREMi9lYURYaGZhWUxhQmpOYkF4?=
 =?utf-8?B?VXFHZVVKb1QwbllmMVJqTW0yV0IyajBnSWpDaFRlMk9PUlVxNHJRNUZtMDJQ?=
 =?utf-8?B?WWhLK1hxMXVsS1ZYQVFSVldHQm5WYldtYWdrbkNxMjhBUTNxbUhwbmNkY3pI?=
 =?utf-8?B?YVdTcnJIYmNFMStLTkdHZ25UWVlXazJkWmY0QUhHWmFUdjFuMExtYzN3dkdo?=
 =?utf-8?B?M01BbVd6TDArdXowSDRCcHlZODRRMmJTL3QyTVJjZFhYOHM0Syt0YWcwTW96?=
 =?utf-8?B?YjhWbXM3Mk5mVlFHZDduQmpiVS9jVEN2OURCZ3QxV3pDTkpoTTR1ckZET3Uz?=
 =?utf-8?B?dTIvUDdScENxTnBWcWdoK0dVRSt3ZW5ZcTJ0eUhBSUtZWW9kQlhoVGJTM0Yv?=
 =?utf-8?B?Ym1iRk9XYjNmdVdsejZLUXFxOHRLSThyWGtoWmNJUC94SVY1TkpIZTM5NStJ?=
 =?utf-8?B?Qks3YktMbzVEc21mS2Z4ZXJEaHRiZnMxd2JzWjRTODFYMmMrVjVjU1U4bFcr?=
 =?utf-8?B?WXdXNnRuVzg3RFcxZGdoNmo0bWM4U29LVjA2RmdlamRLN1hnbTAybTF5ZFFX?=
 =?utf-8?B?Qmc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 2680232f-4e4c-413c-2a64-08dc3db839f2
X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5776.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2024 08:34:23.7638
 (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: a3algK36EhDOq1KcwLI3uIh2bBmg5PBHnt7ZoWqkHWL01fsRywwNoBhw6bVHafbsGZV333r81btVxGTFRWRBq/iBJowky0I4lMlgI+BzHcM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB6896
X-OriginatorOrg: intel.com


On 05.03.2024 16:26, 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 | 78 +++++++++++++++++++-
>  drivers/net/ethernet/intel/ice/ice_sriov.c   | 62 ++++++++++++++++
>  drivers/net/ethernet/intel/ice/ice_sriov.h   |  8 ++
>  3 files changed, 147 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..39d4d79ac731 100644
> --- a/drivers/net/ethernet/intel/ice/ice_devlink.c
> +++ b/drivers/net/ethernet/intel/ice/ice_devlink.c
> @@ -1576,6 +1576,81 @@ void ice_devlink_destroy_pf_port(struct ice_pf *pf)
>  	devlink_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 devlink_port_attrs *attrs = &port->attrs;

You can get VF's pointer using container_of:
container_of(port, struct ice_vf, devlink_port)
You can even create helper function/macro: ice_devlink_port_to_vf

> +	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);
> +	pci_vf = &attrs->pci_vf;
> +	vf_id = pci_vf->vf;
> +
> +	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;
> +
> +	ice_put_vf(vf);
> +	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;
> +	u8 mac[ETH_ALEN];
> +	int vf_id;
> +
> +	pf = devlink_priv(devlink);
> +	pci_vf = &attrs->pci_vf;
> +	vf_id = pci_vf->vf;
> +
> +	ether_addr_copy(mac, hw_addr);
> +
> +	return ice_set_vf_fn_mac(pf, vf_id, mac);
> +}
> +
> +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
> @@ -1611,7 +1686,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);
> diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c
> index 31314e7540f8..73cf1d9e9daa 100644
> --- a/drivers/net/ethernet/intel/ice/ice_sriov.c
> +++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
> @@ -1216,6 +1216,68 @@ ice_get_vf_cfg(struct net_device *netdev, int vf_id, struct ifla_vf_info *ivi)
>  	return ret;
>  }
>  
> +/**
> + * ice_set_vf_fn_mac
> + * @pf: PF to be configure
> + * @vf_id: VF identifier
> + * @mac: MAC address
> + *
> + * program VF MAC address
> + */
> +int ice_set_vf_fn_mac(struct ice_pf *pf, int vf_id, u8 *mac)
> +{
> +	struct device *dev;
> +	struct ice_vf *vf;
> +	int ret;
> +
> +	dev = ice_pf_to_dev(pf);
> +	if (is_multicast_ether_addr(mac)) {
> +		dev_err(dev, "%pM not a valid unicast address\n", mac);
> +		return -EINVAL;
> +	}
> +
> +	vf = ice_get_vf_by_id(pf, vf_id);
> +	if (!vf)
> +		return -EINVAL;
> +
> +	/* nothing left to do, unicast MAC already set */
> +	if (ether_addr_equal(vf->dev_lan_addr, mac) &&
> +	    ether_addr_equal(vf->hw_lan_addr, mac)) {
> +		ret = 0;
> +		goto out_put_vf;
> +	}
> +
> +	ret = ice_check_vf_ready_for_cfg(vf);
> +	if (ret)
> +		goto out_put_vf;
> +
> +	mutex_lock(&vf->cfg_lock);
> +
> +	/* VF is notified of its new MAC via the PF's response to the
> +	 * VIRTCHNL_OP_GET_VF_RESOURCES message after the VF has been reset
> +	 */
> +	ether_addr_copy(vf->dev_lan_addr, mac);
> +	ether_addr_copy(vf->hw_lan_addr, mac);
> +	if (is_zero_ether_addr(mac)) {
> +		/* VF will send VIRTCHNL_OP_ADD_ETH_ADDR message with its MAC */
> +		vf->pf_set_mac = false;
> +		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;
> +		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);
> +	mutex_unlock(&vf->cfg_lock);
> +
> +out_put_vf:
> +	ice_put_vf(vf);
> +	return ret;
> +}
> +
>  /**
>   * ice_set_vf_mac
>   * @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 346cb2666f3a..a03be184a806 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_fn_mac(struct ice_pf *pf, int vf_id, 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);
> @@ -76,6 +77,13 @@ ice_sriov_configure(struct pci_dev __always_unused *pdev,
>  	return -EOPNOTSUPP;
>  }
>  
> +static inline int
> +ice_set_vf_fn_mac(struct ice_pf __always_unused *pf,
> +		  int __always_unused vf_id, 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)