Received-SPF: pass (google.com: domain of linux-kernel+bounces-213420-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: "Romanowski, Rafal" <rafal.romanowski@intel.com>
To: Karthik Sundaravel <ksundara@redhat.com>, "Brandeburg, Jesse"
	<jesse.brandeburg@intel.com>, "Drewek, Wojciech" <wojciech.drewek@intel.com>,
	"sumang@marvell.com" <sumang@marvell.com>, "Keller, Jacob E"
	<jacob.e.keller@intel.com>, "Nguyen, Anthony L" <anthony.l.nguyen@intel.com>,
	"davem@davemloft.net" <davem@davemloft.net>, "edumazet@google.com"
	<edumazet@google.com>, "kuba@kernel.org" <kuba@kernel.org>,
	"pabeni@redhat.com" <pabeni@redhat.com>, "intel-wired-lan@lists.osuosl.org"
	<intel-wired-lan@lists.osuosl.org>, "netdev@vger.kernel.org"
	<netdev@vger.kernel.org>, "linux-kernel@vger.kernel.org"
	<linux-kernel@vger.kernel.org>, "horms@kernel.org" <horms@kernel.org>
CC: "pmenzel@molgen.mpg.de" <pmenzel@molgen.mpg.de>, "aharivel@redhat.com"
	<aharivel@redhat.com>, "jiri@resnulli.us" <jiri@resnulli.us>,
	"cfontain@redhat.com" <cfontain@redhat.com>, "vchundur@redhat.com"
	<vchundur@redhat.com>, "michal.swiatkowski@linux.intel.com"
	<michal.swiatkowski@linux.intel.com>, "bcreeley@amd.com" <bcreeley@amd.com>,
	"rjarry@redhat.com" <rjarry@redhat.com>
Subject: RE: [Intel-wired-lan] [PATCH iwl-next v12] ice: Add get/set hw
 address for VFs using devlink commands
Thread-Topic: [Intel-wired-lan] [PATCH iwl-next v12] ice: Add get/set hw
 address for VFs using devlink commands
Thread-Index: AQHasRBGNFWYoEs7ckCc8YW5q7YvxbHF2deA
Date: Thu, 13 Jun 2024 14:29:15 +0000
Message-ID: <SJ0PR11MB5865343B3F6627340F8B9BF88FC12@SJ0PR11MB5865.namprd11.prod.outlook.com>
References: <20240528150213.16771-1-ksundara@redhat.com>
 <20240528150213.16771-2-ksundara@redhat.com>
In-Reply-To: <20240528150213.16771-2-ksundara@redhat.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?d/9NL9a+lzkRw+0OSg1OtDw1ylYjzP3z5Dq0jfB/v1PX5Fu5Joosjm+y0w+T?=
 =?us-ascii?Q?smRttWsdZfzK/93tqMvHdNCvoq31d+U9HrUBDNoVx0tqfPptVugTz608AcLN?=
 =?us-ascii?Q?v6u1fJ4n/k9LhtqBB11Nzu1uLZUd/ABwFquWZN7qFlnBK8ofXSfT7/kJ/hUz?=
 =?us-ascii?Q?oaRM3n6OZtDOdesTYZ881ptlGOjyGIpobVmQ/7MCd8OadPurRQ9OhTYFNkS1?=
 =?us-ascii?Q?vVDib7J6NcFdmNyeul2MnatSO6/iVJfO3erJyoae4rfaKHHd475/9BA/pwV/?=
 =?us-ascii?Q?E1vs7/G18RYLgNWZ6FfC92VZ/f4xInvMsU52MBR1eJi+1NdP2Id3D9/skAs9?=
 =?us-ascii?Q?6v/g9TawP/ZKH+YIK5KCm1PUpw92RCTvpXocZscDWcZIlL5yV/gWlvDZzf6r?=
 =?us-ascii?Q?I6udyn8gCOzT/IslcW3NVGFVc8pdttvr9uE6VBEJCq0DrgI6IVLKmVhstutl?=
 =?us-ascii?Q?1SZrZ2okXrcK610t6Dr2WhxSXhhNQ57iRSiyIH6Ben39p7KnICc6kU174dRh?=
 =?us-ascii?Q?G3mnb5AY4Nt4h3/sosS374TvU025MgLkcNnEbJ6faNiTtIy6H0VtIxLXGdmf?=
 =?us-ascii?Q?vdDZqR2SYn+iRwp0BEez5mrQUg/+OHOOVQIYdu2SszV7kZJLwcULat6VJ+xO?=
 =?us-ascii?Q?FvZb/23pYh0CrOb5Ibo+AnD/CDSbBv2S7VOS9bhU3HZGtTIbqktFPmKw/aLK?=
 =?us-ascii?Q?mG7SZBqTFblDY79xiYDPn2H1EiJ85KhjW0DnZzBSikOT2haiPHczdNA5Bf2O?=
 =?us-ascii?Q?BAVQdDh+esm5ELhvHauc3GGmhytzcYFR0/n/4mifLmBo+h0qXdVGUoCkN3nb?=
 =?us-ascii?Q?S9koyMXdfPy0CJ7J8zzeGnjpRJNenPPnGdYJ78idlm9NuDl+YP+cdLhojkem?=
 =?us-ascii?Q?1D+eEH3wtz1KhHpvJOjRh6TwztNcHsUGocsh/gTP5Sh5NP8uTC/11JZFRhRY?=
 =?us-ascii?Q?yYT+ar2D2o0JMN7i0TuqJ9Fd1cwqqW3SFmUx4NaM1W0ZtMzPFshmzDdDw+V1?=
 =?us-ascii?Q?TN5sPKAk5epKuP5s6gidlTRJIGahKdjkYsSHmMhFCJqUJmUrKCNAzRtavQmp?=
 =?us-ascii?Q?8PkdkXYwcY6xDOXL4YnHbHAcZr3LsvSZ4EMfdkmog5ScqJJyRdCXJa0aRSMp?=
 =?us-ascii?Q?mHubPY/53ECyZCzvLi1WxK2ext1lKx3900Ry4cLbsvGj1mkhwjqmpW7+OkEm?=
 =?us-ascii?Q?5oNUxabHmJkgFpmTgpauuggXEjRFqoBJrdE+002FSqwm9zqJwe/Mp2BaXmj9?=
 =?us-ascii?Q?4geBCNJeerEKjRWkNs5I2kkg4cW++YRfcj629mVz3kSRIHkWbuRzD/QlHbYK?=
 =?us-ascii?Q?MHWHpYLgRGcy1yA5lyN1G8HexoETi6m67JvzUwrp0POJUREp/SdxHrkgcU4E?=
 =?us-ascii?Q?1o1ubtr9LErwDR+x2GLvaLeSZ3C4TH/jMuPfYo1EzpA0rN2cryEJ/nVIX4Lm?=
 =?us-ascii?Q?B96tWsYv5AlkO0OBbnpJvPR8eomWsBvXR9ggUB6pQrX8qlSf85cym0XoF58W?=
 =?us-ascii?Q?yGiL2OQcbj/WUsh1yLQk4CFSAEb+ccgB0d3ztai+Y4eTIue6wXfY6rREYrre?=
 =?us-ascii?Q?uIm18mRlrCZ92jLPI4HSXNj8Ukf37AuUhP4TrxaMVfYLmnAeGQFJJjS/ZdnZ?=
 =?us-ascii?Q?XA=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5865.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 63604311-2550-4421-b0d6-08dc8bb5339c
X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Jun 2024 14:29:15.0603
 (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: PuCwHOFj/yWNRgDM1TlF7txenIMmP9K5GZEVizWlDlIZWYOLra27s4HWTN7rMvuMIztZZ+5CC+RMl7sbP7PwsOgh/ruwFeJM8YxKAfk0APA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4807
X-OriginatorOrg: intel.com

> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of
> Karthik Sundaravel
> Sent: Tuesday, May 28, 2024 5:02 PM
> To: Brandeburg, Jesse <jesse.brandeburg@intel.com>; Drewek, Wojciech
> <wojciech.drewek@intel.com>; sumang@marvell.com; Keller, Jacob E
> <jacob.e.keller@intel.com>; Nguyen, Anthony L <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.o=
rg;
> linux-kernel@vger.kernel.org; horms@kernel.org
> Cc: pmenzel@molgen.mpg.de; aharivel@redhat.com; jiri@resnulli.us;
> cfontain@redhat.com; vchundur@redhat.com; ksundara@redhat.com;
> michal.swiatkowski@linux.intel.com; bcreeley@amd.com; rjarry@redhat.com
> Subject: [Intel-wired-lan] [PATCH iwl-next v12] ice: Add get/set hw addre=
ss for
> VFs using devlink commands
>=20
> 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.
>=20
> Signed-off-by: Karthik Sundaravel <ksundara@redhat.com>
> ---
>  .../ethernet/intel/ice/devlink/devlink_port.c | 59 ++++++++++++++++++-
>  drivers/net/ethernet/intel/ice/ice_sriov.c    | 34 ++++++++---
>  drivers/net/ethernet/intel/ice/ice_sriov.h    |  8 +++
>  3 files changed, 91 insertions(+), 10 deletions(-)
>=20
> 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);
>  }
>=20
> +/**
> + * 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 =3D container_of(port, struct ice_vf, devlink_port);
> +
> +	ether_addr_copy(hw_addr, vf->dev_lan_addr);
> +	*hw_addr_len =3D 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 =3D &port->attrs;
> +	struct devlink_port_pci_vf_attrs *pci_vf;
> +	struct devlink *devlink =3D port->devlink;
> +	struct ice_pf *pf;
> +	u16 vf_id;
> +
> +	pf =3D devlink_priv(devlink);
> +	pci_vf =3D &attrs->pci_vf;
> +	vf_id =3D pci_vf->vf;
> +
> +	return __ice_set_vf_mac(pf, vf_id, hw_addr); }
> +
> +static const struct devlink_port_ops ice_devlink_vf_port_ops =3D {
> +	.port_fn_hw_addr_get =3D ice_devlink_port_get_vf_fn_mac,
> +	.port_fn_hw_addr_set =3D 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 =3D priv_to_devlink(pf);
>=20
> -	err =3D devl_port_register(devlink, devlink_port, vsi->idx);
> +	err =3D 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..55ef33208456 100644
> --- a/drivers/net/ethernet/intel/ice/ice_sriov.c
> +++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
> @@ -1416,21 +1416,23 @@ ice_get_vf_cfg(struct net_device *netdev, int vf_=
id,
> struct ifla_vf_info *ivi)  }
>=20
>  /**
> - * ice_set_vf_mac
> - * @netdev: network interface device structure
> + * __ice_set_vf_mac - program VF MAC address
> + * @pf: PF to be configure
>   * @vf_id: VF identifier
>   * @mac: MAC address
>   *
>   * program VF MAC address
> + * Return: zero on success or an error code on failure
>   */
> -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 =3D ice_netdev_to_pf(netdev);
> +	struct device *dev;
>  	struct ice_vf *vf;
>  	int ret;
>=20
> +	dev =3D 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;
>  	}
>=20
> @@ -1459,13 +1461,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 =3D 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 =3D 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);
>  	}
>=20
>  	ice_reset_vf(vf, ICE_VF_RESET_NOTIFY); @@ -1476,6 +1478,20 @@ int
> ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
>  	return ret;
>  }
>=20
> +/**
> + * ice_set_vf_mac - .ndo_set_vf_mac handler
> + * @netdev: network interface device structure
> + * @vf_id: VF identifier
> + * @mac: MAC address
> + *
> + * program VF MAC address
> + * Return: zero on success or an error code on failure  */ 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;
>  }
>=20
> +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)


Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>