Received-SPF: pass (google.com: domain of linux-kernel+bounces-180170-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <26b64d11-9cd2-4e60-b7ce-be2dea0f2caa@amd.com>
Date: Wed, 15 May 2024 09:52:33 -0700
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH iwl-next v9] 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, jacob.e.keller@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, horms@kernel.org
Cc: pmenzel@molgen.mpg.de, jiri@resnulli.us,
 michal.swiatkowski@linux.intel.com, rjarry@redhat.com, aharivel@redhat.com,
 vchundur@redhat.com, cfontain@redhat.com
References: <20240515142207.27369-1-ksundara@redhat.com>
 <20240515142207.27369-2-ksundara@redhat.com>
Content-Language: en-US
From: Brett Creeley <bcreeley@amd.com>
In-Reply-To: <20240515142207.27369-2-ksundara@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
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?cmcrcU1VYUI0bzNGdy85dVdXVDRBc05OTmlaN2FpdWU1d3JkWlVrQ2ZSNCtS?=
 =?utf-8?B?aFRhOEkzaitkK1pkdkM0clVtcmZ0eUJraThGRE1jQ0htaGpWQnBZOVRGUDUz?=
 =?utf-8?B?dFFqcXJLT21xWjRuSmpBSm1xd3lBSlRBc3FqRW9QS240eWIrOXF0bzFkdVR3?=
 =?utf-8?B?cHE1ZUcrVitaa0FLZG5OZ1NpeWxvaHVTUUpoZHVqdVdsbm1UMHY1a2wyeUNU?=
 =?utf-8?B?K0FqNFdSSG0wVDhqaC9LbTVXK3ljSVJjYmxKaUJPSVpuOGI1b1hkNFhHTExm?=
 =?utf-8?B?OFVJZk1TMFRLWi9hMWs1WnNwaEF2V0JTWmR2a3ZWclh5SWg0SlR4cXhGbHds?=
 =?utf-8?B?L2gzSW1IU2Q0eE1GNWl2QUJXZG1hZDNpOXlDNmo3SmErMVhoQ0NsdGtrdzRC?=
 =?utf-8?B?NnFrSTlFdzJPNTdVOGYvTXpYaW5HRW4rd3U4eGZzTi96Sy9NcmVRaHJoc3Fl?=
 =?utf-8?B?a2hxbllmYUhMbnBzakVYOS9jWW1RdWtxU2lQODBWYnZZcE85STN2NmFud1hO?=
 =?utf-8?B?U2pEOTB3T05YVTRhUERjdEdrY3krQm0xUzVBZWFIcStUYzA3MzNzM0lSWDQ5?=
 =?utf-8?B?dmpMdWZsdEtOMXhXajFwblU2TFVhaksrVnZUdmcxR2g2TTRSdmw1VXdzYkJv?=
 =?utf-8?B?TUE2L25MVDNXeFBqVWNTMWxSem93Sy94NnRnRVFxL1NaZmgydmNuWmYyVlhZ?=
 =?utf-8?B?Qm1mSjRaMWljSmhNSjdCVDNQS1dodVkzWlZhMUhUV0ZTUndaeDNlVmNUbDJa?=
 =?utf-8?B?OGVOL0x2Z2psT2E3QWRObi8rZ29ybFR5TTZsQnZySzVBNE8yWXArYTcrUGww?=
 =?utf-8?B?MnlwbjZIcGdDWXU4VkNvV0xBOU1wM2F3NGYyV3hNSkxUTzUvRUV5QWxNdnhF?=
 =?utf-8?B?cXlxRWF5eml0a3ZiQUZxS0MzbnQ1YmdmeWFpMGNmWWJ3ckUwZkJMeEZqMDM2?=
 =?utf-8?B?cFpuaVFzWFpjYzh2Y05oR0dvM2lDSGZMTzdsdStQalFTblFRZE5uUEdpd2NV?=
 =?utf-8?B?Y1EvdDVzRDF3dmovSk1GT0krN1dibHI5MVF6Qk9EeFVUK2VFOG9lamwrSXpZ?=
 =?utf-8?B?Z0Z1eUgzUUd3RFpOb1VwUkIwclN4L0lGQTYrTmhYYi9vbU5tSkhVMWZjajRZ?=
 =?utf-8?B?WTZSbFluRmdSWkxGUTFQZjdvZGlsQVc5N05Eamc2MndrS3d4eVFIeW56NzV1?=
 =?utf-8?B?UWhSOGJyNTUzM2U5cFFRdms0V1BxSDA4Tlh3d0Rvb3A0a2s1d2tFdTIxZEpR?=
 =?utf-8?B?VmgzdGFWWmh0Y04zdFFoTDFGa0JkNWVGNWhYZ1piZFJvZnk3U2RBYlFQVnZh?=
 =?utf-8?B?dkxCNTZ0ZVRpR3N2ZzF3OHlUVW03N3kzN3duZ1pwamRxZGN0WC84UStNSmU1?=
 =?utf-8?B?cXBKK2k0S01rQ3lFRVFMUDQ1L0Z3aHlRVXVRZjlmb0JoZHBhdWtCRWt0ZG13?=
 =?utf-8?B?b0N2RG9OcnVvdDdybFFxTmx4dWJ4Z3dMczZSemFIdTRyaU4xNlFMZzFnck5q?=
 =?utf-8?B?YVhFVzYvRW1XRXdkOGlKT0xEVWpIK0Z5Rm9iTkxYNkJmWnFTcDV0VmtrL1or?=
 =?utf-8?B?Y243Z2FKcDJINS9SdFUyZkNKaXNzazZ5L1dYeFUzbG4wUDdVOS95U3BzWmta?=
 =?utf-8?B?bzNzVkZGTkZsSzJkN1UvSkgwUFlqdUZNUWdRanJmQnQ0UFBmTzAyRDBHaTlD?=
 =?utf-8?B?bFZ1UEk5Y05YN0J6ZXYyT0xoeldtRXpuTHpLSVpMQTVjR0tYaFhyNDJ4TFFu?=
 =?utf-8?B?eGRDY1gyTk1aKzVkZG5ud0JBY2VMeTdwQ2svdkpWOVpHeEVPRFJ1NjlQRGw1?=
 =?utf-8?B?RE1ONERDZWo2TjdWZ3VJc2hwZ1ZITHBaVEVBYTBBY2tKUjYwMWxNS3YyaXha?=
 =?utf-8?B?NWhZMkczc3NXWFpPYmJkbnZEbXQvaW0wVEF2ZEphTjIrY05FM2gvbi9EN3JO?=
 =?utf-8?B?dWpkekFSRUgvVlpBelduVWhOMmJnakZ5ZHJ0ZG9Xb2dpa2JvSmxFQTN4endt?=
 =?utf-8?B?VFA4OEcrYUNLek5Xa2I0R1piWFB2NXlpYjBYOHliSkEvOWVlT016TFhpVUth?=
 =?utf-8?B?dnBybm1XTWQxM0U4dld5enNaQ0VvZzNXRm5lVTB5bWNGdjBtbldFZ1ltZFRM?=
 =?utf-8?Q?IwgY1/GENCwiEawt/GL47WL1O?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8a9caf4a-7c75-4d94-5a01-08dc74ff6c5b
X-MS-Exchange-CrossTenant-AuthSource: PH0PR12MB7982.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2024 16:52:36.4590
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 6rdPhc/Cj8j3vr5d5LVTf3rpnyzs7kte7no2qxmoEw/1sAJvTQJuHHx5522zoZFKoRDdMpxyh43m98dNlBbv5w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4317


On 5/15/2024 7:22 AM, Karthik Sundaravel wrote:
> Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.
> 
> 
> 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    | 62 +++++++++++++++++++
>   drivers/net/ethernet/intel/ice/ice_sriov.h    |  8 +++
>   3 files changed, 128 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
> index c9fbeebf7fb9..6ff7cba3f630 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_fn_mac(pf, vf_id, hw_addr);

Instead of creating a duplicate function, it seems like you can do the 
following instead:

pf = devlink_priv(devlink);
vsi = ice_get_main_vsi(pf);
if (!vsi)
	return -ENODEV;

[...]

return ice_set_vf_mac(vsi->netdev, 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..dc40be741be0 100644
> --- a/drivers/net/ethernet/intel/ice/ice_sriov.c
> +++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
> @@ -1415,6 +1415,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, u16 vf_id, const 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;
> +}

This is almost an exact copy of ice_set_vf_mac(). The only difference 
being the function arguments.

Was there any reason to not use ice_set_vf_mac()? Why can't you pass the 
PF's netdev?

> +
>   /**
>    * 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 8f22313474d6..2ecbacfa8cfc 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, 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_fn_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)
> --
> 2.39.3 (Apple Git-146)
> 
>