From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id EF5671B107 for ; Wed, 21 Nov 2018 17:50:54 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5C4C78F4FB; Wed, 21 Nov 2018 16:50:54 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A3F35C21E; Wed, 21 Nov 2018 16:50:53 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Stephen Hemminger , dpdk stable Date: Wed, 21 Nov 2018 16:48:11 +0000 Message-Id: <20181121164828.32249-57-ktraynor@redhat.com> In-Reply-To: <20181121164828.32249-1-ktraynor@redhat.com> References: <20181121164828.32249-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 21 Nov 2018 16:50:54 +0000 (UTC) Subject: [dpdk-stable] patch 'drivers/net: fix log type string' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Wed, 21 Nov 2018 16:50:55 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/27/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From c2852e95efbad035e5792aa12944b0552fcafcdb Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Tue, 9 Oct 2018 18:38:37 +0100 Subject: [PATCH] drivers/net: fix log type string [ upstream commit 9631253ffaa11386ba9d27387bb485b6edc107e6 ] Syntax for log type string is "pmd..[.]" Fixes: 3e92fd4e4ec0 ("net/bnxt: use dynamic log type") Fixes: d7f4562ab10a ("net/bonding: convert to dynamic logging") Fixes: 6086ab3bb3d2 ("net/vdev_netvsc: introduce Hyper-V platform driver") Fixes: 7db274b9ada2 ("doc: describe dynamic logging format") Fixes: a10a988a0ba6 ("net/dpaa2: support dynamic logging") Signed-off-by: Ferruh Yigit Acked-by: Stephen Hemminger --- doc/guides/contributing/coding_style.rst | 4 ++-- doc/guides/nics/dpaa2.rst | 2 +- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- drivers/net/vdev_netvsc/vdev_netvsc.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst index b1bf0d15c..19445c113 100644 --- a/doc/guides/contributing/coding_style.rst +++ b/doc/guides/contributing/coding_style.rst @@ -742,6 +742,6 @@ A specialization looks like this: A real world example is the i40e poll mode driver which exposes two -specializations, one for initialization ``pmd.i40e.init`` and the other for -the remaining driver logs ``pmd.i40e.driver``. +specializations, one for initialization ``pmd.net.i40e.init`` and the other for +the remaining driver logs ``pmd.net.i40e.driver``. Note that specializations have no formatting rules, but please follow diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst index 66c03e103..e2f385d42 100644 --- a/doc/guides/nics/dpaa2.rst +++ b/doc/guides/nics/dpaa2.rst @@ -559,5 +559,5 @@ which are lower than logging ``level``. --log-level=pmd.net.dpaa2: -- ... -Using ``pmd.dpaa2`` as log matching criteria, all PMD logs can be enabled +Using ``pmd.net.dpaa2`` as log matching criteria, all PMD logs can be enabled which are lower than logging ``level``. diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 91123edef..d2d619584 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3545,5 +3545,5 @@ bool is_bnxt_supported(struct rte_eth_dev *dev) RTE_INIT(bnxt_init_log) { - bnxt_logtype_driver = rte_log_register("pmd.bnxt.driver"); + bnxt_logtype_driver = rte_log_register("pmd.net.bnxt.driver"); if (bnxt_logtype_driver >= 0) rte_log_set_level(bnxt_logtype_driver, RTE_LOG_INFO); diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 5c2890f5f..0afc31bd6 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3581,5 +3581,5 @@ int bond_logtype; RTE_INIT(bond_init_log) { - bond_logtype = rte_log_register("pmd.net.bon"); + bond_logtype = rte_log_register("pmd.net.bond"); if (bond_logtype >= 0) rte_log_set_level(bond_logtype, RTE_LOG_NOTICE); diff --git a/drivers/net/vdev_netvsc/vdev_netvsc.c b/drivers/net/vdev_netvsc/vdev_netvsc.c index 48717f2f0..16303ef5e 100644 --- a/drivers/net/vdev_netvsc/vdev_netvsc.c +++ b/drivers/net/vdev_netvsc/vdev_netvsc.c @@ -790,5 +790,5 @@ RTE_PMD_REGISTER_PARAM_STRING(net_vdev_netvsc, RTE_INIT(vdev_netvsc_init_log) { - vdev_netvsc_logtype = rte_log_register("pmd.vdev_netvsc"); + vdev_netvsc_logtype = rte_log_register("pmd.net.vdev_netvsc"); if (vdev_netvsc_logtype >= 0) rte_log_set_level(vdev_netvsc_logtype, RTE_LOG_NOTICE); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-21 16:44:32.496580609 +0000 +++ 0057-drivers-net-fix-log-type-string.patch 2018-11-21 16:44:30.000000000 +0000 @@ -1,8 +1,10 @@ -From 9631253ffaa11386ba9d27387bb485b6edc107e6 Mon Sep 17 00:00:00 2001 +From c2852e95efbad035e5792aa12944b0552fcafcdb Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Tue, 9 Oct 2018 18:38:37 +0100 Subject: [PATCH] drivers/net: fix log type string +[ upstream commit 9631253ffaa11386ba9d27387bb485b6edc107e6 ] + Syntax for log type string is "pmd..[.]" Fixes: 3e92fd4e4ec0 ("net/bnxt: use dynamic log type") @@ -10,7 +12,6 @@ Fixes: 6086ab3bb3d2 ("net/vdev_netvsc: introduce Hyper-V platform driver") Fixes: 7db274b9ada2 ("doc: describe dynamic logging format") Fixes: a10a988a0ba6 ("net/dpaa2: support dynamic logging") -Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit Acked-by: Stephen Hemminger @@ -47,10 +48,10 @@ which are lower than logging ``level``. diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index 88e026c7d..858e65d00 100644 +index 91123edef..d2d619584 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -3570,5 +3570,5 @@ bool is_bnxt_supported(struct rte_eth_dev *dev) +@@ -3545,5 +3545,5 @@ bool is_bnxt_supported(struct rte_eth_dev *dev) RTE_INIT(bnxt_init_log) { - bnxt_logtype_driver = rte_log_register("pmd.bnxt.driver"); @@ -58,10 +59,10 @@ if (bnxt_logtype_driver >= 0) rte_log_set_level(bnxt_logtype_driver, RTE_LOG_INFO); diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c -index 1d6245aa5..31c83a286 100644 +index 5c2890f5f..0afc31bd6 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c -@@ -3599,5 +3599,5 @@ int bond_logtype; +@@ -3581,5 +3581,5 @@ int bond_logtype; RTE_INIT(bond_init_log) { - bond_logtype = rte_log_register("pmd.net.bon");