The DRV_LOG macro 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") Cc: stable@dpdk.org Signed-off-by: David Marchand <david.marchand@redhat.com> --- drivers/net/mlx5/mlx5.c | 6 +++--- drivers/net/mlx5/mlx5_utils.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 95a0f337fe..fe7ed4899a 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -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; } diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c index d29fbcbc83..6f3ba7ca49 100644 --- a/drivers/net/mlx5/mlx5_utils.c +++ b/drivers/net/mlx5/mlx5_utils.c @@ -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; } -- 2.23.0
Yes, the newline should be removed.
Many thanks.
BR. Bing
> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Wednesday, June 17, 2020 9:53 PM
> To: dev@dpdk.org
> Cc: stable@dpdk.org; Matan Azrad <matan@mellanox.com>; Shahaf
> Shuler <shahafs@mellanox.com>; Slava Ovsiienko
> <viacheslavo@mellanox.com>; Bing Zhao <bingz@mellanox.com>;
> Jack Min <jackmin@mellanox.com>
> Subject: [PATCH] net/mlx5: remove redundant newline
>
> The DRV_LOG macro 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")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> drivers/net/mlx5/mlx5.c | 6 +++---
> drivers/net/mlx5/mlx5_utils.c | 6 +++---
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index
> 95a0f337fe..fe7ed4899a 100644
> --- a/drivers/net/mlx5/mlx5.c
> +++ b/drivers/net/mlx5/mlx5.c
> @@ -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;
> }
> diff --git a/drivers/net/mlx5/mlx5_utils.c
> b/drivers/net/mlx5/mlx5_utils.c index d29fbcbc83..6f3ba7ca49 100644
> --- a/drivers/net/mlx5/mlx5_utils.c
> +++ b/drivers/net/mlx5/mlx5_utils.c
> @@ -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;
> }
> --
> 2.23.0
> -----Original Message----- > From: David Marchand <david.marchand@redhat.com> > Sent: Wednesday, June 17, 2020 16:53 > To: dev@dpdk.org > Cc: stable@dpdk.org; Matan Azrad <matan@mellanox.com>; Shahaf Shuler > <shahafs@mellanox.com>; Slava Ovsiienko <viacheslavo@mellanox.com>; > Bing Zhao <bingz@mellanox.com>; Jack Min <jackmin@mellanox.com> > Subject: [PATCH] net/mlx5: remove redundant newline > > The DRV_LOG macro 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") > Cc: stable@dpdk.org > > Signed-off-by: David Marchand <david.marchand@redhat.com> Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com> > --- > drivers/net/mlx5/mlx5.c | 6 +++--- > drivers/net/mlx5/mlx5_utils.c | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index > 95a0f337fe..fe7ed4899a 100644 > --- a/drivers/net/mlx5/mlx5.c > +++ b/drivers/net/mlx5/mlx5.c > @@ -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; > } > diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c > index d29fbcbc83..6f3ba7ca49 100644 > --- a/drivers/net/mlx5/mlx5_utils.c > +++ b/drivers/net/mlx5/mlx5_utils.c > @@ -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; > } > -- > 2.23.0
On Wed, 20-06-17, 15:53, David Marchand wrote: > The DRV_LOG macro 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") > Cc: stable@dpdk.org > > Signed-off-by: David Marchand <david.marchand@redhat.com> Acked-by: Xiaoyu Min <jackmin@mellanox.com> > --- > drivers/net/mlx5/mlx5.c | 6 +++--- > drivers/net/mlx5/mlx5_utils.c | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c > index 95a0f337fe..fe7ed4899a 100644 > --- a/drivers/net/mlx5/mlx5.c > +++ b/drivers/net/mlx5/mlx5.c > @@ -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; > } > diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c > index d29fbcbc83..6f3ba7ca49 100644 > --- a/drivers/net/mlx5/mlx5_utils.c > +++ b/drivers/net/mlx5/mlx5_utils.c > @@ -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; > } > -- > 2.23.0 >
Hi,
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of David Marchand
> Sent: Wednesday, June 17, 2020 4:53 PM
> To: dev@dpdk.org
> Cc: stable@dpdk.org; Matan Azrad <matan@mellanox.com>; Shahaf Shuler
> <shahafs@mellanox.com>; Slava Ovsiienko <viacheslavo@mellanox.com>;
> Bing Zhao <bingz@mellanox.com>; Jack Min <jackmin@mellanox.com>
> Subject: [dpdk-dev] [PATCH] net/mlx5: remove redundant newline
>
> The DRV_LOG macro 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")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> drivers/net/mlx5/mlx5.c | 6 +++---
> drivers/net/mlx5/mlx5_utils.c | 6 +++---
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
> index 95a0f337fe..fe7ed4899a 100644
> --- a/drivers/net/mlx5/mlx5.c
> +++ b/drivers/net/mlx5/mlx5.c
> @@ -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;
> }
> diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c
> index d29fbcbc83..6f3ba7ca49 100644
> --- a/drivers/net/mlx5/mlx5_utils.c
> +++ b/drivers/net/mlx5/mlx5_utils.c
> @@ -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;
> }
> --
> 2.23.0
Patch rebased and applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh