From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4365EA0518 for ; Fri, 24 Jul 2020 14:04:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3AEA91C039; Fri, 24 Jul 2020 14:04:47 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 76EA81C0AD for ; Fri, 24 Jul 2020 14:04:45 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id r12so8044342wrj.13 for ; Fri, 24 Jul 2020 05:04:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2LbyXZnmAL9KppDULWhyzvcW9TDq2n/GYRhXNT+U+24=; b=dJ5Vuzp1xrPinUUudPAbe0C2JY4CswdExY6GE3PehQ+dzdQupX/23JrYhDTO9n6WUZ gFUhbRylTbS6/SbLnth6ra1upm65hZ4IPcjGyUjt9bwhgrpLuFId6fUliZm1a4H71s0g bX/991GnxGOV+HF1fXdCnDLPujzTLGhKWxi74uEwPmoBeadoYSTvEgRDg4/vdbp0eXFS kedy223pIJMRwy9oX+a4Gjv6yfEZHGY23nxA3JdU3KDGII80eeE2ZBaTztxOkskh1M92 IQwkNBvrsmEjy/CAkS0HlayY3+TmmWkJTnivd6r3OCXjS+/2YDckuFxdOPQ3CmnfjX8d WrPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2LbyXZnmAL9KppDULWhyzvcW9TDq2n/GYRhXNT+U+24=; b=EQfNIB3QNcIAxLqbAsGAmcE774rpPi9YVSy53wHiIK306sckkCNCndxAve230uNPfU qI7AD+TZIwIG+tBA+2GSTjys9d4/wYAO3NXEDUgY2bQIiEGP46jWGnjTsUfYssk1qR/v WH767WoSkANmRDOJCjzwzBl4cYJdimib0wQq3PuALDOMQTLo/JjhR0pw5gVksiYThIpW u82QpiqF9k+5mabXbT2edO+YL8z/0X/Ly1eeNrF49gKzGV813c69EZlVNedyBbKhvGWu mCFFi+HJg3rOG+mqmGUfwD/hMiyV6vtHvF0trtHKVE4ab+q/vwTvtRi9QzB9DKzmt759 gVqQ== X-Gm-Message-State: AOAM532s5Oe5HeRLLpQsV7CsnFBL+tG+OpMqFHyUU5uDrw36N7fo9tr5 1WcZuhqtTZ/sTi9NOsaSF4kh4yHGOnz49w== X-Google-Smtp-Source: ABdhPJwnLSdCmFncICqmOp3TCaY55Xou4aW9fK+qJMlkZsRimuWtANtYRdpz3N+lcxJMLFHumF00hg== X-Received: by 2002:a5d:51c3:: with SMTP id n3mr8439654wrv.104.1595592285217; Fri, 24 Jul 2020 05:04:45 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p11sm1194909wre.32.2020.07.24.05.04.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:04:43 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Viacheslav Ovsiienko , Xiaoyu Min , dpdk stable Date: Fri, 24 Jul 2020 12:58:18 +0100 Message-Id: <20200724120030.1863487-60-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: remove redundant newline from logs' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From c429d2d7431630334f28e9bcc009f4985eb0c780 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 17 Jun 2020 15:53:24 +0200 Subject: [PATCH] net/mlx5: remove redundant newline from logs [ upstream commit 63783b0172476208d27999441880764d9ea1fedf ] 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") Signed-off-by: David Marchand Acked-by: Viacheslav Ovsiienko Acked-by: Xiaoyu Min --- 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 bb718f27f..ce76c96db 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -867,7 +867,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; } @@ -951,7 +951,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; @@ -959,7 +959,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 5d86615ea..c1c238941 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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:50.913763643 +0100 +++ 0060-net-mlx5-remove-redundant-newline-from-logs.patch 2020-07-24 12:53:48.283006385 +0100 @@ -1,43 +1,30 @@ -From 63783b0172476208d27999441880764d9ea1fedf Mon Sep 17 00:00:00 2001 +From c429d2d7431630334f28e9bcc009f4985eb0c780 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 17 Jun 2020 15:53:24 +0200 Subject: [PATCH] net/mlx5: remove redundant newline from logs +[ upstream commit 63783b0172476208d27999441880764d9ea1fedf ] + 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 Acked-by: Viacheslav Ovsiienko Acked-by: Xiaoyu Min --- - drivers/net/mlx5/linux/mlx5_os.c | 2 +- - drivers/net/mlx5/mlx5.c | 2 +- - drivers/net/mlx5/mlx5_utils.c | 6 +++--- - 3 files changed, 5 insertions(+), 5 deletions(-) + 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/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c -index b330cd553..797887319 100644 ---- a/drivers/net/mlx5/linux/mlx5_os.c -+++ b/drivers/net/mlx5/linux/mlx5_os.c -@@ -284,7 +284,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.c b/drivers/net/mlx5/mlx5.c -index 5c86f6fb9..c13e71608 100644 +index bb718f27f..ce76c96db 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c -@@ -882,7 +882,7 @@ mlx5_alloc_table_hash_list(struct mlx5_priv *priv) +@@ -867,7 +867,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) { @@ -46,8 +33,26 @@ err = ENOMEM; return err; } +@@ -951,7 +951,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; +@@ -959,7 +959,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 d29fbcbc8..6f3ba7ca4 100644 +index 5d86615ea..c1c238941 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)