Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Parav Pandit <parav@nvidia.com>
To:     Leon Romanovsky <leon@kernel.org>,
        Doug Ledford <dledford@redhat.com>,
        Jason Gunthorpe <jgg@nvidia.com>,
        gregkh <gregkh@linuxfoundation.org>
CC:     Leon Romanovsky <leonro@nvidia.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Jason Wang <jasowang@redhat.com>,
        "linux-rdma@vger.kernel.org" <linux-rdma@vger.kernel.org>,
        "Michael S. Tsirkin" <mst@redhat.com>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        Roi Dayan <roid@nvidia.com>,
        Saeed Mahameed <saeedm@nvidia.com>,
        "virtualization@lists.linux-foundation.org" 
        <virtualization@lists.linux-foundation.org>,
        "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
        "tiwai@suse.de" <tiwai@suse.de>,
        "broonie@kernel.org" <broonie@kernel.org>,
        "David S . Miller" <davem@davemloft.net>,
        "ranjani.sridharan@linux.intel.com" 
        <ranjani.sridharan@linux.intel.com>,
        "pierre-louis.bossart@linux.intel.com" 
        <pierre-louis.bossart@linux.intel.com>,
        "fred.oh@linux.intel.com" <fred.oh@linux.intel.com>,
        "shiraz.saleem@intel.com" <shiraz.saleem@intel.com>,
        "dan.j.williams@intel.com" <dan.j.williams@intel.com>,
        "kiran.patil@intel.com" <kiran.patil@intel.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH mlx5-next v1 03/11] net/mlx5_core: Clean driver version
 and name
Thread-Topic: [PATCH mlx5-next v1 03/11] net/mlx5_core: Clean driver version
 and name
Thread-Index: AQHWsIvhd8tdnUL6WE6lN2kDxOGLDKm0SkSw
Date:   Mon, 2 Nov 2020 05:07:59 +0000
Message-ID: <BY5PR12MB4322B244D7AEBDCED43B906EDC100@BY5PR12MB4322.namprd12.prod.outlook.com>
References: <20201101201542.2027568-1-leon@kernel.org>
 <20201101201542.2027568-4-leon@kernel.org>
In-Reply-To: <20201101201542.2027568-4-leon@kernel.org>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: fa711669-0c05-4449-c2cd-08d87eed44e6
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Nov 2020 05:07:59.9336
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: CBDLI9gkSltc2WrMFyUWG6tZTLUCmEiqhe0YdcGHlSblLkCQJcKqAc1erv3LplKrZPt+4O9ykyGLRB7RjpLPQQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3731
X-OriginatorOrg: Nvidia.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1;
        t=1604293696; bh=AS0mgjAGyKmcUK+IwlB2YbdMD5Ou6pcZZM9mLRKum5I=;
        h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:
         CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:
         In-Reply-To:Accept-Language:Content-Language:X-MS-Has-Attach:
         X-MS-TNEF-Correlator:authentication-results:x-originating-ip:
         x-ms-publictraffictype:x-ms-office365-filtering-correlation-id:
         x-ms-traffictypediagnostic:x-ms-exchange-transport-forked:
         x-microsoft-antispam-prvs:x-ms-oob-tlc-oobclassifiers:
         x-ms-exchange-senderadcheck:x-microsoft-antispam:
         x-microsoft-antispam-message-info:x-forefront-antispam-report:
         x-ms-exchange-antispam-messagedata:Content-Type:
         Content-Transfer-Encoding:MIME-Version:
         X-MS-Exchange-CrossTenant-AuthAs:
         X-MS-Exchange-CrossTenant-AuthSource:
         X-MS-Exchange-CrossTenant-Network-Message-Id:
         X-MS-Exchange-CrossTenant-originalarrivaltime:
         X-MS-Exchange-CrossTenant-fromentityheader:
         X-MS-Exchange-CrossTenant-id:X-MS-Exchange-CrossTenant-mailboxtype:
         X-MS-Exchange-CrossTenant-userprincipalname:
         X-MS-Exchange-Transport-CrossTenantHeadersStamped:X-OriginatorOrg;
        b=qaUsMU06nDer5z1fQcVq57Zscb+wbAwZL+e/q9aQ8bDXzC+5XRHiFBBxTzHlpoy7Z
         SPsV/z5zSxn4Tge3AMeb6FC6qtP6m7stGQAyb8E6VDcV8cMKwoj3yvVQO66OAEFP4R
         D9oiIv9TI1z+cLqkfuC9d6ofoGCcRIXsmH2X/z+3HvVgNMOL/YtP7v4EbefgF93aYz
         GWA7aHllsiq4plFzQTOqo+JlFv2KhU4g3a485SjhHQvdqaULtqPSzGPKV/MV33+Zj2
         CgxpfSUvo4ywkGYNJ5nyn1XN36bt3ZiiN31zRRD0AH+mZ+vdpp8pNp4Rgi8WVnNZ9G
         YAgY73sRdZsCA==
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> From: Leon Romanovsky <leon@kernel.org>
> Sent: Monday, November 2, 2020 1:46 AM
>=20
> From: Leon Romanovsky <leonro@nvidia.com>
>=20
> Remove exposed driver version as it was done in other drivers, so module
> version will work correctly by displaying the kernel version for which it=
 is
> compiled.
>=20
> And move mlx5_core module name to general include, so auxiliary drivers
> will be able to use it as a basis for a name in their device ID tables.
>=20
> Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
> ---
>  drivers/net/ethernet/mellanox/mlx5/core/devlink.c     |  2 +-
>  drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c  |  4 +---
>  drivers/net/ethernet/mellanox/mlx5/core/en_rep.c      |  1 -
>  .../net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c   |  2 +-
>  drivers/net/ethernet/mellanox/mlx5/core/main.c        | 11 +++++++----
>  drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h   |  3 ---
>  include/linux/mlx5/driver.h                           |  2 ++
>  7 files changed, 12 insertions(+), 13 deletions(-)
>=20
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
> b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
> index a28f95df2901..1a351e2f6ace 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
> @@ -52,7 +52,7 @@ mlx5_devlink_info_get(struct devlink *devlink, struct
> devlink_info_req *req,
>  	u32 running_fw, stored_fw;
>  	int err;
>=20
> -	err =3D devlink_info_driver_name_put(req, DRIVER_NAME);
> +	err =3D devlink_info_driver_name_put(req, KBUILD_MODNAME);
>  	if (err)
>  		return err;
>=20
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
> b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
> index d25a56ec6876..bcff18a87bcd 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
> @@ -40,9 +40,7 @@ void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv
> *priv,  {
>  	struct mlx5_core_dev *mdev =3D priv->mdev;
>=20
> -	strlcpy(drvinfo->driver, DRIVER_NAME, sizeof(drvinfo->driver));
> -	strlcpy(drvinfo->version, DRIVER_VERSION,
> -		sizeof(drvinfo->version));
> +	strlcpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo-
> >driver));
>  	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
>  		 "%d.%d.%04d (%.16s)",
>  		 fw_rev_maj(mdev), fw_rev_min(mdev),
> fw_rev_sub(mdev), diff --git
> a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> index 67247c33b9fd..ef2f8889ba0f 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
> @@ -64,7 +64,6 @@ static void mlx5e_rep_get_drvinfo(struct net_device
> *dev,
>=20
>  	strlcpy(drvinfo->driver, mlx5e_rep_driver_name,
>  		sizeof(drvinfo->driver));
> -	strlcpy(drvinfo->version, UTS_RELEASE, sizeof(drvinfo->version));
>  	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
>  		 "%d.%d.%04d (%.16s)",
>  		 fw_rev_maj(mdev), fw_rev_min(mdev),
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
> b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
> index cac8f085b16d..97d96fc38a65 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
> @@ -39,7 +39,7 @@ static void mlx5i_get_drvinfo(struct net_device *dev,
>  	struct mlx5e_priv *priv =3D mlx5i_epriv(dev);
>=20
>  	mlx5e_ethtool_get_drvinfo(priv, drvinfo);
> -	strlcpy(drvinfo->driver, DRIVER_NAME "[ib_ipoib]",
> +	strlcpy(drvinfo->driver, KBUILD_MODNAME "[ib_ipoib]",
>  		sizeof(drvinfo->driver));
>  }
>=20
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c
> b/drivers/net/ethernet/mellanox/mlx5/core/main.c
> index 71e210f22f69..9827127cb674 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
> @@ -77,7 +77,6 @@
>  MODULE_AUTHOR("Eli Cohen <eli@mellanox.com>");
> MODULE_DESCRIPTION("Mellanox 5th generation network adapters
> (ConnectX series) core driver");  MODULE_LICENSE("Dual BSD/GPL"); -
> MODULE_VERSION(DRIVER_VERSION);
>=20
>  unsigned int mlx5_core_debug_mask;
>  module_param_named(debug_mask, mlx5_core_debug_mask, uint, 0644);
> @@ -228,7 +227,7 @@ static void mlx5_set_driver_version(struct
> mlx5_core_dev *dev)
>  	strncat(string, ",", remaining_size);
>=20
>  	remaining_size =3D max_t(int, 0, driver_ver_sz - strlen(string));
> -	strncat(string, DRIVER_NAME, remaining_size);
> +	strncat(string, KBUILD_MODNAME, remaining_size);
>=20
>  	remaining_size =3D max_t(int, 0, driver_ver_sz - strlen(string));
>  	strncat(string, ",", remaining_size);
> @@ -313,7 +312,7 @@ static int request_bar(struct pci_dev *pdev)
>  		return -ENODEV;
>  	}
>=20
> -	err =3D pci_request_regions(pdev, DRIVER_NAME);
> +	err =3D pci_request_regions(pdev, KBUILD_MODNAME);
>  	if (err)
>  		dev_err(&pdev->dev, "Couldn't get PCI resources,
> aborting\n");
>=20
> @@ -1617,7 +1616,7 @@ void mlx5_recover_device(struct mlx5_core_dev
> *dev)  }
>=20
>  static struct pci_driver mlx5_core_driver =3D {
> -	.name           =3D DRIVER_NAME,
> +	.name           =3D KBUILD_MODNAME,
>  	.id_table       =3D mlx5_core_pci_table,
>  	.probe          =3D init_one,
>  	.remove         =3D remove_one,
> @@ -1643,6 +1642,10 @@ static int __init init(void)  {
>  	int err;
>=20
> +	WARN_ONCE(strcmp(MLX5_ADEV_NAME, KBUILD_MODNAME) ||
> +		  strlen(MLX5_ADEV_NAME) !=3D strlen(KBUILD_MODNAME),
> +		  "mlx5_core name not in sync with kernel module name");
> +
In which case, both the strings are same but their length not?
You likely don't need the string length check.

>  	get_random_bytes(&sw_owner_id, sizeof(sw_owner_id));
>=20
>  	mlx5_core_verify_params();
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
> b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
> index 8cec85ab419d..b285f1515e4e 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
> @@ -42,9 +42,6 @@
>  #include <linux/mlx5/fs.h>
>  #include <linux/mlx5/driver.h>
>=20
> -#define DRIVER_NAME "mlx5_core"
> -#define DRIVER_VERSION "5.0-0"
> -
>  extern uint mlx5_core_debug_mask;
>=20
>  #define mlx5_core_dbg(__dev, format, ...)				\
> diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h in=
dex
> 317257f8e0ad..ed1d030658d2 100644
> --- a/include/linux/mlx5/driver.h
> +++ b/include/linux/mlx5/driver.h
> @@ -56,6 +56,8 @@
>  #include <linux/ptp_clock_kernel.h>
>  #include <net/devlink.h>
>=20
> +#define MLX5_ADEV_NAME "mlx5_core"
> +
>  enum {
>  	MLX5_BOARD_ID_LEN =3D 64,
>  };
> --
> 2.28.0


Other than strlen removal check,
Reviewed-by: Parav Pandit <parav@nvidia.com>