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 CA800A0093 for ; Thu, 28 May 2020 18:25:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 447081DC32; Thu, 28 May 2020 18:25:33 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 9B1F91DC1A for ; Thu, 28 May 2020 18:25:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JkBW/VFwaAqFYVNol8G/x6d3aKRjY/phTvu0qfjP+hw=; b=a5prn5jXpY9GlGql3TBxYE8h2Zop2q4M++7t/tWOy6i+OpoB3oGcp3cDXJwa7txH08OczH 7BZBXcQHeQdGU1z+x3CrbDRr9WpDjpbraG1jsgXelT7hF29//ELIOi3e9vebEOlo+pmEHZ tAQG8Ed0LIOJ/BSzGKM1OyyWNydw1yI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-16-mLapihirM7ilQlKD130W8Q-1; Thu, 28 May 2020 12:25:25 -0400 X-MC-Unique: mLapihirM7ilQlKD130W8Q-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 14FA98005AA; Thu, 28 May 2020 16:25:24 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2EC7360C05; Thu, 28 May 2020 16:25:23 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Thu, 28 May 2020 17:22:38 +0100 Message-Id: <20200528162322.7863-51-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/thunderx: use dynamic log type' has been queued to LTS release 18.11.9 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 LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/989e1816ae51560bb07f60d42adb86cca98db845 Thanks. Kevin. --- >From 989e1816ae51560bb07f60d42adb86cca98db845 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 30 Mar 2020 21:41:56 -0700 Subject: [PATCH] net/thunderx: use dynamic log type [ upstream commit d801c39559b346f26e3d3a8e16a92bb19e0165b9 ] The PMD static logtype is original DPDK legacy and should not be used. Fixes: 43362c6a7647 ("net/thunderx: support RSS and RETA query and update") Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- drivers/net/thunderx/nicvf_ethdev.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c index ae5a33e3a1..d627a3bb70 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -489,7 +489,8 @@ nicvf_dev_reta_query(struct rte_eth_dev *dev, if (reta_size != NIC_MAX_RSS_IDR_TBL_SIZE) { - RTE_LOG(ERR, PMD, "The size of hash lookup table configured " - "(%d) doesn't match the number hardware can supported " - "(%d)", reta_size, NIC_MAX_RSS_IDR_TBL_SIZE); + PMD_DRV_LOG(ERR, + "The size of hash lookup table configured " + "(%u) doesn't match the number hardware can supported " + "(%u)", reta_size, NIC_MAX_RSS_IDR_TBL_SIZE); return -EINVAL; } @@ -519,7 +520,7 @@ nicvf_dev_reta_update(struct rte_eth_dev *dev, if (reta_size != NIC_MAX_RSS_IDR_TBL_SIZE) { - RTE_LOG(ERR, PMD, "The size of hash lookup table configured " - "(%d) doesn't match the number hardware can supported " - "(%d)", reta_size, NIC_MAX_RSS_IDR_TBL_SIZE); + PMD_DRV_LOG(ERR, "The size of hash lookup table configured " + "(%u) doesn't match the number hardware can supported " + "(%u)", reta_size, NIC_MAX_RSS_IDR_TBL_SIZE); return -EINVAL; } @@ -562,6 +563,6 @@ nicvf_dev_rss_hash_update(struct rte_eth_dev *dev, if (rss_conf->rss_key && rss_conf->rss_key_len != RSS_HASH_KEY_BYTE_SIZE) { - RTE_LOG(ERR, PMD, "Hash key size mismatch %d", - rss_conf->rss_key_len); + PMD_DRV_LOG(ERR, "Hash key size mismatch %u", + rss_conf->rss_key_len); return -EINVAL; } -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:01.767252438 +0100 +++ 0051-net-thunderx-use-dynamic-log-type.patch 2020-05-28 17:12:59.123555903 +0100 @@ -1 +1 @@ -From d801c39559b346f26e3d3a8e16a92bb19e0165b9 Mon Sep 17 00:00:00 2001 +From 989e1816ae51560bb07f60d42adb86cca98db845 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d801c39559b346f26e3d3a8e16a92bb19e0165b9 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 6f43541a5d..bfda0ab0ed 100644 +index ae5a33e3a1..d627a3bb70 100644 @@ -21 +22 @@ -@@ -497,7 +497,8 @@ nicvf_dev_reta_query(struct rte_eth_dev *dev, +@@ -489,7 +489,8 @@ nicvf_dev_reta_query(struct rte_eth_dev *dev, @@ -33 +34 @@ -@@ -527,7 +528,7 @@ nicvf_dev_reta_update(struct rte_eth_dev *dev, +@@ -519,7 +520,7 @@ nicvf_dev_reta_update(struct rte_eth_dev *dev, @@ -44 +45 @@ -@@ -570,6 +571,6 @@ nicvf_dev_rss_hash_update(struct rte_eth_dev *dev, +@@ -562,6 +563,6 @@ nicvf_dev_rss_hash_update(struct rte_eth_dev *dev,