Received-SPF: pass (google.com: domain of linux-kernel+bounces-183947-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <8e1b9ae3-b533-4a13-aff7-9d62bd1f8f98@amd.com>
Date: Mon, 20 May 2024 09:02:31 -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, 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: <20240520102040.54745-1-ksundara@redhat.com>
 <20240520102040.54745-2-ksundara@redhat.com>
Content-Language: en-US
From: Brett Creeley <bcreeley@amd.com>
In-Reply-To: <20240520102040.54745-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?ZFVGamxNWWxtRFFxOWF4N1N0YlRPY1ZxZ0dpQU4xWTFwQ1Z1QXg0UlNiT2VV?=
 =?utf-8?B?aStxNUVHekZvaWd2Q1Fzd0NuekZFSnIyQkhlYVRaVVZJSXFnYnVHQVRxOTA2?=
 =?utf-8?B?RXE2RVJDRU4yVG5FUzhXd015Um50NEtnOFd1L2VjMDRpekdqMzExNi9jMGxR?=
 =?utf-8?B?NDJ1Y0hRay9iNGlWYmg2R3QwWXFmdjZQNXgzeFB3Ti9aMkZPSzdiUnJFNEd2?=
 =?utf-8?B?YlkxOHBTaTErdFhOQkFVL1BpYU9LaUhFaGJGT00wbkNYN0kvRVdrVlBOZnZV?=
 =?utf-8?B?UysyZWd5V0JOYzJxeFN6L0FGVEx2QVU3cjVkcDRWbkJSK1RRZDdSSTVNcFU1?=
 =?utf-8?B?K0N5ZG5jMXlpaGRvYXBYenZYbEhaekZZTklmS3BrNS85SEFqRVMzU0NvazhT?=
 =?utf-8?B?OEIyL2tveE5rUTB2NkdveDZFbXRkQnNYRjY2QTZVZWVaSTFBWlR1dldmVCtz?=
 =?utf-8?B?MW9yaXRoajNFc3RkbTJjN2Q2NFg4WU9rWmJ1NllKblRWeGF1UlcxaTZ1d1VK?=
 =?utf-8?B?SmJva0RlY0NWci91aENCOXVjbzY0UXROZjBUY0cxN0cwaWtwbTVndTdHQkdQ?=
 =?utf-8?B?NUtFbVlGZWFuZERMR3VpVE1nUVBkeDJkajJwS3lVZUEzYWVpTGsydEVUcXVL?=
 =?utf-8?B?Z1VxZjhYa0tVYVJDY2txVnVlRUR3NUMwVUcxSUc0blJzcFpnOTBOaUhBUGRa?=
 =?utf-8?B?dlJWVksyb3lySDI0UHZCN3dpR1QwWDVQSzEzbmY0bVMyRzFleG16YnlvQjY0?=
 =?utf-8?B?SFd2T0VIclRqcFZGUTJIQ0kwbkQvaEtMdGVXYnJOZ3UzcENXQVVTUEF5Z25n?=
 =?utf-8?B?bDZSaTZvc3NPb0NITXVFdFptMEl4YmRtMUovaWhTV0hZcWkxZFhIZjlVTVR0?=
 =?utf-8?B?WmNESGdKVnlIMFRvV1l5ZDdYeVlYcm5pWGVPd0ZNdFFBYUNrUjZyMEdPRnZ3?=
 =?utf-8?B?TFZHSUJtUWtwbU5ONUVsMkNQazhpOUJLbFhjSjJicHl3bDZvaEVSUy9uWjRO?=
 =?utf-8?B?aWZDYTlkWUJ2OVRMMjh6d3pvMTRXZlFHNHJIZzkyK2xNSXlYMm5pYlJoN2RD?=
 =?utf-8?B?V1pESWdrbXh3RGxvYUt5d0xSVGVyaklrakwxL3BHUjlJZURCaVJSZEVHVmJH?=
 =?utf-8?B?QkJ5eTBNOXlkVU9WQVRJd0JudlptQlFuNG40TEZCTXMweUgzblcyUjVBRlVV?=
 =?utf-8?B?c0VGNy9IdVhCbjYrdWNIc3ZqSmpyUTFDRzE4NGZ6OXFwUVdKRDQwMG9NYmIr?=
 =?utf-8?B?QU1ZanRabCtYOGRYQmt5bWtRcGcrWFprUmxVOXRXZ2pnR2kyaFRoU0dvTHZF?=
 =?utf-8?B?cDBOOWJRWWxkYXUvRXJSbVFQdFVPZGRuZTMzamJJMmpVb1QzOTRNT0xCRC9x?=
 =?utf-8?B?YUtwUGMrOC83NGFSRnozMk5teXA5Y3hyNzVTcTQxYktMbWxVK1ZaNXRHVHdL?=
 =?utf-8?B?ZzZqcy8xS2lxTHVLaHVOcjU4NE00NTNKSEpRL0VLRWVTV1NUWWJVNHFTWVFJ?=
 =?utf-8?B?WHFXK05mdzJ6eG01MndaQStBVld6QXIzRjRiWVRhcGw3QXBFNnVsTWkwRGtC?=
 =?utf-8?B?aFROdllJQkpZMG0wZUIva3hZMHVndXFCTUtLZ3dzdEx0eDRML3FldE9kNlhZ?=
 =?utf-8?B?UGpFMFppb1UvR2pEeWJuNXpVYmwvSXZXUzhVSG5oN0pCK1QwVHA2N0xSRlhr?=
 =?utf-8?B?SWs4TXRzT1ByZUFWTXNsOUUxU0hyaW5oSmR2ZW1MK2FjNnhTMithNWRwazJ3?=
 =?utf-8?B?b3pFbFhid3hUSGQ2Ym1DZCtSeGtBSi9rV2dnOHFsQldxTTY1WHNSRVRmN0JH?=
 =?utf-8?B?dVczenEvMC85QUtxWHpVYUE0ODFPK0RRV2VHQTVIaVVFNHI2cytzaVpPekh2?=
 =?utf-8?B?YWxlSElEYWNiRnVIR2R6WWt1VlNGeDJOSTh1a3hhcW41L3N6SXdRdjNJMmVo?=
 =?utf-8?B?OVlEOTRkRDlvblY3dE1uUUV1S0lVbGhOQ0ticWlrcncySWJnZXFqeGFNbGZG?=
 =?utf-8?B?YURrNnRiOUwydzVSNllaMjRsYnlzR0pUSG1RQUtmQWdMai9UOFYrYnRPSENF?=
 =?utf-8?B?R3F2d1U0YThFalcyZmt0cnRyV3Znajc3aWdRd2kvUDFjdHBVNkRzRCs5dFhW?=
 =?utf-8?Q?dkau6tTLeuajsTgsN3KD0x8Yk?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dc1051c0-a4b8-4e7f-72c1-08dc78e642dc
X-MS-Exchange-CrossTenant-AuthSource: PH0PR12MB7982.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2024 16:02:34.0988
 (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: k+P+Roz9rhccvcaVk8hvtweW0HzSIuoUyT6IemKhNvAEtnrCTOysPREdR8ZK7Csx2J+cAQf0qj7gRpTqMOWupg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7311


On 5/20/2024 3:20 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    | 32 +++++++---
>   drivers/net/ethernet/intel/ice/ice_sriov.h    |  8 +++
>   3 files changed, 89 insertions(+), 10 deletions(-)

LGTM.

Reviewed-by: Brett Creeley <brett.creeley@amd.com>

> 
> 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)
>   {
> -       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)
> --
> 2.39.3 (Apple Git-146)
>