[dpdk-dev] [PATCH 1/2] common/mlx5: align driver name logs across pmds

[dpdk-dev] [PATCH 1/2] common/mlx5: align driver name logs across pmds

[Michael Baum]

From: Asaf Penso <asafp@nvidia.com>

Some mlx5 pmds define the log prefix as "mlx5_pmd" while others as
"pmd_mlx5".
The patch aligns all pmds to use the "mlx5_pmd" format.

Signed-off-by: Asaf Penso <asafp@nvidia.com>
---
 drivers/common/mlx5/mlx5_common.h       | 4 ----
 drivers/common/mlx5/mlx5_common_utils.h | 2 +-
 drivers/net/mlx5/mlx5_utils.h           | 4 +++-
 drivers/regex/mlx5/mlx5_regex_utils.h   | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h
index 3855582..fc1ac75 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -65,10 +65,6 @@
 			RTE_FMT_HEAD(__VA_ARGS__,), \
 		RTE_FMT_TAIL(__VA_ARGS__,)))
 
-/*
- * When debugging is enabled (MLX5_DEBUG not defined), file, line and function
- * information replace the driver name (MLX5_DRIVER_NAME) in log messages.
- */
 #ifdef RTE_LIBRTE_MLX5_DEBUG
 
 #define PMD_DRV_LOG__(level, type, name, ...) \
diff --git a/drivers/common/mlx5/mlx5_common_utils.h b/drivers/common/mlx5/mlx5_common_utils.h
index 32c3adf..6cba39c 100644
--- a/drivers/common/mlx5/mlx5_common_utils.h
+++ b/drivers/common/mlx5/mlx5_common_utils.h
@@ -10,7 +10,7 @@
 
 extern int mlx5_common_logtype;
 
-#define MLX5_COMMON_LOG_PREFIX "common_mlx5"
+#define MLX5_COMMON_LOG_PREFIX "mlx5_common"
 /* Generic printf()-like logging macro with automatic line feed. */
 #define DRV_LOG(level, ...) \
 	PMD_DRV_LOG_(level, mlx5_common_logtype, MLX5_COMMON_LOG_PREFIX, \
diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h
index 7a62187..5088c95 100644
--- a/drivers/net/mlx5/mlx5_utils.h
+++ b/drivers/net/mlx5/mlx5_utils.h
@@ -29,9 +29,11 @@
 
 extern int mlx5_logtype;
 
+#define MLX5_NET_LOG_PREFIX "mlx5_net"
+
 /* Generic printf()-like logging macro with automatic line feed. */
 #define DRV_LOG(level, ...) \
-	PMD_DRV_LOG_(level, mlx5_logtype, MLX5_DRIVER_NAME, \
+	PMD_DRV_LOG_(level, mlx5_logtype, MLX5_NET_LOG_PREFIX, \
 		__VA_ARGS__ PMD_DRV_LOG_STRIP PMD_DRV_LOG_OPAREN, \
 		PMD_DRV_LOG_CPAREN)
 
diff --git a/drivers/regex/mlx5/mlx5_regex_utils.h b/drivers/regex/mlx5/mlx5_regex_utils.h
index adca846..104e794 100644
--- a/drivers/regex/mlx5/mlx5_regex_utils.h
+++ b/drivers/regex/mlx5/mlx5_regex_utils.h
@@ -9,7 +9,7 @@
 
 extern int mlx5_regex_logtype;
 
-#define MLX5_REGEX_LOG_PREFIX "regex_mlx5"
+#define MLX5_REGEX_LOG_PREFIX "mlx5_regex"
 /* Generic printf()-like logging macro with automatic line feed. */
 #define DRV_LOG(level, ...) \
 	PMD_DRV_LOG_(level, mlx5_regex_logtype, MLX5_REGEX_LOG_PREFIX, \
-- 
1.8.3.1

[dpdk-dev] [PATCH 2/2] common/mlx5: rename driver name to include PCI notation

[Michael Baum]

From: Asaf Penso <asafp@nvidia.com>

The current define for MLX5_DRIVER_NAME refers specially for the PCI
driver.

The define itself does not mention PCI and this is confusing.

Rename from MLX5_DRIVER_NAME to MLX5_PCI_DRIVER_NAME.

Signed-off-by: Asaf Penso <asafp@nvidia.com>
---
 drivers/common/mlx5/mlx5_common.h     | 2 +-
 drivers/common/mlx5/mlx5_common_pci.c | 2 +-
 drivers/net/mlx5/mlx5.c               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h
index fc1ac75..84c3960 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -19,7 +19,7 @@
 #include "mlx5_devx_cmds.h"
 
 /* Reported driver name. */
-#define MLX5_DRIVER_NAME "mlx5_pci"
+#define MLX5_PCI_DRIVER_NAME "mlx5_pci"
 
 /* Bit-field manipulation. */
 #define BITFIELD_DECLARE(bf, type, size) \
diff --git a/drivers/common/mlx5/mlx5_common_pci.c b/drivers/common/mlx5/mlx5_common_pci.c
index 2b65768..3783b0e 100644
--- a/drivers/common/mlx5/mlx5_common_pci.c
+++ b/drivers/common/mlx5/mlx5_common_pci.c
@@ -415,7 +415,7 @@ class_name_to_value(const char *class_name)
 
 static struct rte_pci_driver mlx5_pci_driver = {
 	.driver = {
-		.name = MLX5_DRIVER_NAME,
+		.name = MLX5_PCI_DRIVER_NAME,
 	},
 	.probe = mlx5_common_pci_probe,
 	.remove = mlx5_common_pci_remove,
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index abd7ff70..a22bbc9 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -2094,7 +2094,7 @@ struct mlx5_dev_ctx_shared *
 		    (dev->device == &pci_dev->device ||
 		     (dev->device->driver &&
 		     dev->device->driver->name &&
-		     !strcmp(dev->device->driver->name, MLX5_DRIVER_NAME))))
+		     !strcmp(dev->device->driver->name, MLX5_PCI_DRIVER_NAME))))
 			break;
 		port_id++;
 	}
@@ -2215,7 +2215,7 @@ struct mlx5_dev_ctx_shared *
 	.driver_class = MLX5_CLASS_NET,
 	.pci_driver = {
 		.driver = {
-			.name = MLX5_DRIVER_NAME,
+			.name = MLX5_PCI_DRIVER_NAME,
 		},
 		.id_table = mlx5_pci_id_map,
 		.probe = mlx5_os_pci_probe,
-- 
1.8.3.1

Re: [dpdk-dev] [PATCH 2/2] common/mlx5: rename driver name to include PCI notation

[Slava Ovsiienko]

> -----Original Message-----
> From: Michael Baum <michaelba@nvidia.com>
> Sent: Monday, March 15, 2021 23:06
> To: dev@dpdk.org
> Cc: NBU-Contact-Thomas Monjalon <thomas@monjalon.net>; Slava
> Ovsiienko <viacheslavo@nvidia.com>; Matan Azrad <matan@nvidia.com>;
> Raslan Darawsheh <rasland@nvidia.com>; Asaf Penso <asafp@nvidia.com>
> Subject: [PATCH 2/2] common/mlx5: rename driver name to include PCI
> notation
> 
> From: Asaf Penso <asafp@nvidia.com>
> 
> The current define for MLX5_DRIVER_NAME refers specially for the PCI
> driver.
> 
> The define itself does not mention PCI and this is confusing.
> 
> Rename from MLX5_DRIVER_NAME to MLX5_PCI_DRIVER_NAME.
> 
> Signed-off-by: Asaf Penso <asafp@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

Re: [dpdk-dev] [PATCH 1/2] common/mlx5: align driver name logs across pmds

[Slava Ovsiienko]

> -----Original Message-----
> From: Michael Baum <michaelba@nvidia.com>
> Sent: Monday, March 15, 2021 23:06
> To: dev@dpdk.org
> Cc: NBU-Contact-Thomas Monjalon <thomas@monjalon.net>; Slava
> Ovsiienko <viacheslavo@nvidia.com>; Matan Azrad <matan@nvidia.com>;
> Raslan Darawsheh <rasland@nvidia.com>; Asaf Penso <asafp@nvidia.com>
> Subject: [PATCH 1/2] common/mlx5: align driver name logs across pmds
> 
> From: Asaf Penso <asafp@nvidia.com>
> 
> Some mlx5 pmds define the log prefix as "mlx5_pmd" while others as
> "pmd_mlx5".
> The patch aligns all pmds to use the "mlx5_pmd" format.
> 
> Signed-off-by: Asaf Penso <asafp@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

Re: [dpdk-dev] [PATCH 1/2] common/mlx5: align driver name logs across pmds

[Raslan Darawsheh]

Hi,

> -----Original Message-----
> From: Michael Baum <michaelba@nvidia.com>
> Sent: Monday, March 15, 2021 11:06 PM
> To: dev@dpdk.org
> Cc: NBU-Contact-Thomas Monjalon <thomas@monjalon.net>; Slava
> Ovsiienko <viacheslavo@nvidia.com>; Matan Azrad <matan@nvidia.com>;
> Raslan Darawsheh <rasland@nvidia.com>; Asaf Penso <asafp@nvidia.com>
> Subject: [PATCH 1/2] common/mlx5: align driver name logs across pmds
> 
> From: Asaf Penso <asafp@nvidia.com>
> 
> Some mlx5 pmds define the log prefix as "mlx5_pmd" while others as
> "pmd_mlx5".
> The patch aligns all pmds to use the "mlx5_pmd" format.
> 
> Signed-off-by: Asaf Penso <asafp@nvidia.com>
> ---

Series applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh