net/mlx5: remove redundant newline
PATCH 1/1 net/mlx5: remove redundant newline
The DRV_LOG macro already appends a newline.
--- drivers/net/mlx5/mlx5.c | 6 +++--- drivers/net/mlx5/mlx5_utils.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/net/mlx5/mlx5.c +3 -3
@@ -1062,7 +1062,7 @@ mlx5_alloc_table_hash_list(struct mlx5_priv *priv)snprintf (s,sizeof (s),"%s_flow_table" , priv->sh->ibdev_name); sh->flow_tbls =mlx5_hlist_create (s,MLX5_FLOW_TABLE_HLIST_ARRAY_SIZE );if (!sh->flow_tbls) { -DRV_LOG (ERR ,"flow tables with hash creation failed.\n" ); +DRV_LOG (ERR ,"flow tables with hash creation failed." ); err =ENOMEM ;return err; }
@@ -1146,7 +1146,7 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)if (!sh->flow_tbls) err =mlx5_alloc_table_hash_list (priv);else -DRV_LOG (DEBUG ,"sh->flow_tbls[%p] already created, reuse\n" , +DRV_LOG (DEBUG ,"sh->flow_tbls[%p] already created, reuse" , (void *)sh->flow_tbls);if (err)return err;
@@ -1154,7 +1154,7 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)snprintf (s,sizeof (s),"%s_tags" , sh->ibdev_name); sh->tag_table =mlx5_hlist_create (s,MLX5_TAGS_HLIST_ARRAY_SIZE );if (!sh->tag_table) { -DRV_LOG (ERR ,"tags with hash creation failed.\n" ); +DRV_LOG (ERR ,"tags with hash creation failed." ); err =ENOMEM ; goto error; }
drivers/net/mlx5/mlx5_utils.c +3 -3
@@ -20,7 +20,7 @@ mlx5_hlist_create(const char *name, uint32_t size)if (!rte_is_power_of_2 (size)) { act_size =rte_align32pow2 (size);DRV_LOG (WARNING ,"Size 0x%" PRIX32 " is not power of 2, will " -"be aligned to 0x%" PRIX32 ".\n" , size, act_size); +"be aligned to 0x%" PRIX32 "." , size, act_size); }else { act_size = size; }
@@ -29,7 +29,7 @@ mlx5_hlist_create(const char *name, uint32_t size)/* Using zmalloc, then no need to initialize the heads. */ h =rte_zmalloc (name, alloc_size,RTE_CACHE_LINE_SIZE );if (!h) { -DRV_LOG (ERR ,"No memory for hash list %s creation\n" , +DRV_LOG (ERR ,"No memory for hash list %s creation" , name ? name :"None" );return NULL ; }
@@ -37,7 +37,7 @@ mlx5_hlist_create(const char *name, uint32_t size)snprintf (h->name,MLX5_HLIST_NAMESIZE ,"%s" , name); h->table_sz = act_size; h->mask = act_size -1 ; -DRV_LOG (DEBUG ,"Hash list with %s size 0x%" PRIX32 " is created.\n" , +DRV_LOG (DEBUG ,"Hash list with %s size 0x%" PRIX32 " is created." , h->name, act_size);return h; }
Signature · 1 line
2.23.0
Yes, the newline should be removed.
Many thanks.
BR. Bing
Quoted 102 lines
-----Original Message-----
From: David Marchand <[email protected]>
Sent: Wednesday, June 17, 2020 9:53 PM
To: [email protected]
Cc: [email protected]; Matan Azrad <[email protected]>; Shahaf Shuler <[email protected]>; Slava Ovsiienko <[email protected]>; Bing Zhao <[email protected]>; Jack Min <[email protected]>
Subject: [PATCH] net/mlx5: remove redundant newlineThe
DRV_LOGmacro already appends a newline.Fixes 46287eacc1b1 ("net/mlx5: introduce hash list")Fixes 860897d2895a ("net/mlx5: reorganize flow tables with hash list")Fixes e484e4032332 ("net/mlx5: optimize tag traversal with hash list")Fixes 6801116688fe ("net/mlx5: fix multiple flow table hash list")Signed-off-by David Marchand <[email protected]>--- drivers/net/mlx5/mlx5.c | 6 +++--- drivers/net/mlx5/mlx5_utils.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/net/mlx5/mlx5.c index renamed from drivers/net/mlx5/mlx5.c +0
-0
95a0f337fe..fe7ed4899a100644drivers/net/mlx5/mlx5.c +1
-1@@ -1062,7 +1062,7 @@ mlx5_alloc_table_hash_list(struct mlx5_priv *priv)snprintf (s,sizeof (s),"%s_flow_table" , priv->sh->ibdev_name); sh->flow_tbls =mlx5_hlist_create (s,MLX5_FLOW_TABLE_HLIST_ARRAY_SIZE );if (!sh->flow_tbls) { - DRV_LOG(ERR, "flow tables with hash creation failed.\n"); +DRV_LOG (ERR ,"flow tables with hash creation failed." );drivers/net/mlx5/mlx5.c +1
-1err =ENOMEM ;return err; }@@ -1146,7 +1146,7 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)if (!sh->flow_tbls) err =mlx5_alloc_table_hash_list (priv);else -DRV_LOG (DEBUG ,"sh->flow_tbls[%p] already created, reuse\n", +DRV_LOG (DEBUG ,"sh->flow_tbls[%p] already created, reuse", (void *)sh->flow_tbls);drivers/net/mlx5/mlx5.c +1
-1if (err)return err;@@ -1154,7 +1154,7 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)snprintf (s,sizeof (s),"%s_tags" , sh->ibdev_name); sh->tag_table =mlx5_hlist_create (s,MLX5_TAGS_HLIST_ARRAY_SIZE );if (!sh->tag_table) { -DRV_LOG (ERR ,"tags with hash creation failed.\n" ); +DRV_LOG (ERR ,"tags with hash creation failed." ); err =ENOMEM ; goto error;drivers/net/mlx5/mlx5.c +0
-0}(quoted diff) +0
-0
b/drivers/net/mlx5/mlx5_utils.cindexd29fbcbc83..6f3ba7ca49100644drivers/net/mlx5/mlx5_utils.c +0
-0@@ -20,7 +20,7 @@ mlx5_hlist_create(const char *name, uint32_t size) if (!rte_is_power_of_2(size)) { act_size = rte_align32pow2(size); DRV_LOG(WARNING, "Size 0x%" PRIX32 " is not powerof 2, will "
drivers/net/mlx5/mlx5_utils.c +2
-2- "be aligned to 0x%" PRIX32 ".\n", size, act_size); + "be aligned to 0x%" PRIX32 ".", size, act_size); }else { act_size = size; }@@ -29,7 +29,7 @@ mlx5_hlist_create(const char *name, uint32_t size)/* Using zmalloc, then no need to initialize the heads. */ h =rte_zmalloc (name, alloc_size,RTE_CACHE_LINE_SIZE );if (!h) { -DRV_LOG (ERR ,"No memory for hash list %s creation\n", + DRV_LOG(ERR, "No memory for hash list %s creation", name ? name : "None");drivers/net/mlx5/mlx5_utils.c +1
-1return NULL ; }@@ -37,7 +37,7 @@ mlx5_hlist_create(const char *name, uint32_t size) snprintf(h->name, MLX5_HLIST_NAMESIZE, "%s",name ); h->table_sz = act_size; h->mask = act_size -1 ; - DRV_LOG(DEBUG, "Hash list with %s size 0x%" PRIX32 " is created.\n", + DRV_LOG(DEBUG, "Hash list with %s size 0x%" PRIX32 " iscreated.",
drivers/net/mlx5/mlx5_utils.c +0
-1h->name, act_size);return h; } --2.23.0
Quoted 11 lines
-----Original Message-----
From: David Marchand <[email protected]>
Sent: Wednesday, June 17, 2020 16:53
To: [email protected]
Cc: [email protected]; Matan Azrad <[email protected]>; Shahaf Shuler <[email protected]>; Slava Ovsiienko <[email protected]>; Bing Zhao <[email protected]>; Jack Min <[email protected]>
Subject: [PATCH] net/mlx5: remove redundant newlineThe
DRV_LOGmacro already appends a newline.
Quoted 7 lines
Fixes 46287eacc1b1 ("net/mlx5: introduce hash list")Fixes 860897d2895a ("net/mlx5: reorganize flow tables with hash list")Fixes e484e4032332 ("net/mlx5: optimize tag traversal with hash list")Fixes 6801116688fe ("net/mlx5: fix multiple flow table hash list")Signed-off-by David Marchand <[email protected]>
Quoted 75 lines
--- drivers/net/mlx5/mlx5.c | 6 +++--- drivers/net/mlx5/mlx5_utils.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/net/mlx5/mlx5.c index renamed from drivers/net/mlx5/mlx5.c +0
-0
95a0f337fe..fe7ed4899a100644drivers/net/mlx5/mlx5.c +1
-1@@ -1062,7 +1062,7 @@ mlx5_alloc_table_hash_list(struct mlx5_priv *priv)snprintf (s,sizeof (s),"%s_flow_table" , priv->sh->ibdev_name); sh->flow_tbls =mlx5_hlist_create (s,MLX5_FLOW_TABLE_HLIST_ARRAY_SIZE );if (!sh->flow_tbls) { -DRV_LOG (ERR ,"flow tables with hash creation failed.\n" ); +DRV_LOG (ERR ,"flow tables with hash creation failed." ); err =ENOMEM ;return err;drivers/net/mlx5/mlx5.c +1
-1}@@ -1146,7 +1146,7 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)if (!sh->flow_tbls) err =mlx5_alloc_table_hash_list (priv);else -DRV_LOG (DEBUG ,"sh->flow_tbls[%p] already created, reuse\n", +DRV_LOG (DEBUG ,"sh->flow_tbls[%p] already created, reuse", (void *)sh->flow_tbls);drivers/net/mlx5/mlx5.c +1
-1if (err)return err;@@ -1154,7 +1154,7 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)snprintf (s,sizeof (s),"%s_tags" , sh->ibdev_name); sh->tag_table =mlx5_hlist_create (s,MLX5_TAGS_HLIST_ARRAY_SIZE );if (!sh->tag_table) { -DRV_LOG (ERR ,"tags with hash creation failed.\n" ); +DRV_LOG (ERR ,"tags with hash creation failed." ); err =ENOMEM ; goto error;drivers/net/mlx5/mlx5.c +0
-0}drivers/net/mlx5/mlx5_utils.c +0
-0@@ -20,7 +20,7 @@ mlx5_hlist_create(const char *name, uint32_t size) if (!rte_is_power_of_2(size)) { act_size = rte_align32pow2(size); DRV_LOG(WARNING, "Size 0x%" PRIX32 " is not power of 2,will "
drivers/net/mlx5/mlx5_utils.c +3
-3- "be aligned to 0x%" PRIX32 ".\n", size, act_size); + "be aligned to 0x%" PRIX32 ".", size, act_size); }else { act_size = size; }@@ -29,7 +29,7 @@ mlx5_hlist_create(const char *name, uint32_t size)/* Using zmalloc, then no need to initialize the heads. */ h =rte_zmalloc (name, alloc_size,RTE_CACHE_LINE_SIZE );if (!h) { -DRV_LOG (ERR ,"No memory for hash list %s creation\n" , +DRV_LOG (ERR ,"No memory for hash list %s creation" , name ? name :"None" );return NULL ; }@@ -37,7 +37,7 @@ mlx5_hlist_create(const char *name, uint32_t size)snprintf (h->name,MLX5_HLIST_NAMESIZE ,"%s" , name); h->table_sz = act_size; h->mask = act_size -1 ; - DRV_LOG(DEBUG, "Hash list with %s size 0x%" PRIX32 " is created.\n", +DRV_LOG (DEBUG ,"Hash list with %s size 0x%" PRIX32 " is created." , h->name, act_size);return h;}
--
2.23.0
Quoted 9 lines · David Marchand
The
DRV_LOGmacro already appends a newline.Fixes 46287eacc1b1 ("net/mlx5: introduce hash list")Fixes 860897d2895a ("net/mlx5: reorganize flow tables with hash list")Fixes e484e4032332 ("net/mlx5: optimize tag traversal with hash list")Fixes 6801116688fe ("net/mlx5: fix multiple flow table hash list")Signed-off-by David Marchand <[email protected]>
Quoted 70 lines
--- drivers/net/mlx5/mlx5.c | 6 +++--- drivers/net/mlx5/mlx5_utils.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/net/mlx5/mlx5.c +3
-3@@ -1062,7 +1062,7 @@ mlx5_alloc_table_hash_list(struct mlx5_priv *priv)snprintf (s,sizeof (s),"%s_flow_table" , priv->sh->ibdev_name); sh->flow_tbls =mlx5_hlist_create (s,MLX5_FLOW_TABLE_HLIST_ARRAY_SIZE );if (!sh->flow_tbls) { -DRV_LOG (ERR ,"flow tables with hash creation failed.\n" ); +DRV_LOG (ERR ,"flow tables with hash creation failed." ); err =ENOMEM ;return err; }@@ -1146,7 +1146,7 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)if (!sh->flow_tbls) err =mlx5_alloc_table_hash_list (priv);else -DRV_LOG (DEBUG ,"sh->flow_tbls[%p] already created, reuse\n" , +DRV_LOG (DEBUG ,"sh->flow_tbls[%p] already created, reuse" , (void *)sh->flow_tbls);if (err)return err;@@ -1154,7 +1154,7 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)snprintf (s,sizeof (s),"%s_tags" , sh->ibdev_name); sh->tag_table =mlx5_hlist_create (s,MLX5_TAGS_HLIST_ARRAY_SIZE );if (!sh->tag_table) { -DRV_LOG (ERR ,"tags with hash creation failed.\n" ); +DRV_LOG (ERR ,"tags with hash creation failed." ); err =ENOMEM ; goto error; }drivers/net/mlx5/mlx5_utils.c +3
-3@@ -20,7 +20,7 @@ mlx5_hlist_create(const char *name, uint32_t size)if (!rte_is_power_of_2 (size)) { act_size =rte_align32pow2 (size);DRV_LOG (WARNING ,"Size 0x%" PRIX32 " is not power of 2, will " -"be aligned to 0x%" PRIX32 ".\n" , size, act_size); +"be aligned to 0x%" PRIX32 "." , size, act_size); }else { act_size = size; }@@ -29,7 +29,7 @@ mlx5_hlist_create(const char *name, uint32_t size)/* Using zmalloc, then no need to initialize the heads. */ h =rte_zmalloc (name, alloc_size,RTE_CACHE_LINE_SIZE );if (!h) { -DRV_LOG (ERR ,"No memory for hash list %s creation\n" , +DRV_LOG (ERR ,"No memory for hash list %s creation" , name ? name :"None" );return NULL ; }@@ -37,7 +37,7 @@ mlx5_hlist_create(const char *name, uint32_t size)snprintf (h->name,MLX5_HLIST_NAMESIZE ,"%s" , name); h->table_sz = act_size; h->mask = act_size -1 ; -DRV_LOG (DEBUG ,"Hash list with %s size 0x%" PRIX32 " is created.\n" , +DRV_LOG (DEBUG ,"Hash list with %s size 0x%" PRIX32 " is created." , h->name, act_size);return h; }Signature · 1 line
2.23.0
Hi,
Quoted 90 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of David Marchand
Sent: Wednesday, June 17, 2020 4:53 PM
To: [email protected]
Cc: [email protected]; Matan Azrad <[email protected]>; Shahaf Shuler <[email protected]>; Slava Ovsiienko <[email protected]>; Bing Zhao <[email protected]>; Jack Min <[email protected]>
Subject: [dpdk-dev] [PATCH] net/mlx5: remove redundant newlineThe
DRV_LOGmacro already appends a newline.Fixes 46287eacc1b1 ("net/mlx5: introduce hash list")Fixes 860897d2895a ("net/mlx5: reorganize flow tables with hash list")Fixes e484e4032332 ("net/mlx5: optimize tag traversal with hash list")Fixes 6801116688fe ("net/mlx5: fix multiple flow table hash list")Signed-off-by David Marchand <[email protected]>--- drivers/net/mlx5/mlx5.c | 6 +++--- drivers/net/mlx5/mlx5_utils.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/net/mlx5/mlx5.c +1
-1@@ -1062,7 +1062,7 @@ mlx5_alloc_table_hash_list(struct mlx5_priv *priv)snprintf (s,sizeof (s),"%s_flow_table" , priv->sh->ibdev_name); sh->flow_tbls =mlx5_hlist_create (s,MLX5_FLOW_TABLE_HLIST_ARRAY_SIZE );if (!sh->flow_tbls) { -DRV_LOG (ERR ,"flow tables with hash creation failed.\n" ); +DRV_LOG (ERR ,"flow tables with hash creation failed." ); err =ENOMEM ;return err;drivers/net/mlx5/mlx5.c +1
-1}@@ -1146,7 +1146,7 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)if (!sh->flow_tbls) err =mlx5_alloc_table_hash_list (priv);else -DRV_LOG (DEBUG ,"sh->flow_tbls[%p] already created, reuse\n", +DRV_LOG (DEBUG ,"sh->flow_tbls[%p] already created, reuse", (void *)sh->flow_tbls);drivers/net/mlx5/mlx5.c +1
-1if (err)return err;@@ -1154,7 +1154,7 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)snprintf (s,sizeof (s),"%s_tags" , sh->ibdev_name); sh->tag_table =mlx5_hlist_create (s,MLX5_TAGS_HLIST_ARRAY_SIZE );if (!sh->tag_table) { -DRV_LOG (ERR ,"tags with hash creation failed.\n" ); +DRV_LOG (ERR ,"tags with hash creation failed." ); err =ENOMEM ; goto error;drivers/net/mlx5/mlx5.c +0
-0}drivers/net/mlx5/mlx5_utils.c +0
-0@@ -20,7 +20,7 @@ mlx5_hlist_create(const char *name, uint32_t size) if (!rte_is_power_of_2(size)) { act_size = rte_align32pow2(size); DRV_LOG(WARNING, "Size 0x%" PRIX32 " is not power of 2,will "
drivers/net/mlx5/mlx5_utils.c +3
-3- "be aligned to 0x%" PRIX32 ".\n", size, act_size); + "be aligned to 0x%" PRIX32 ".", size, act_size); }else { act_size = size; }@@ -29,7 +29,7 @@ mlx5_hlist_create(const char *name, uint32_t size)/* Using zmalloc, then no need to initialize the heads. */ h =rte_zmalloc (name, alloc_size,RTE_CACHE_LINE_SIZE );if (!h) { -DRV_LOG (ERR ,"No memory for hash list %s creation\n" , +DRV_LOG (ERR ,"No memory for hash list %s creation" , name ? name :"None" );return NULL ; }@@ -37,7 +37,7 @@ mlx5_hlist_create(const char *name, uint32_t size)snprintf (h->name,MLX5_HLIST_NAMESIZE ,"%s" , name); h->table_sz = act_size; h->mask = act_size -1 ; - DRV_LOG(DEBUG, "Hash list with %s size 0x%" PRIX32 " is created.\n", +DRV_LOG (DEBUG ,"Hash list with %s size 0x%" PRIX32 " is created." , h->name, act_size);return h;
Quoted 3 lines
}
--
2.23.0
Patch rebased and applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh