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 E146CA0093 for ; Tue, 19 May 2020 15:07:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C62CC1D667; Tue, 19 May 2020 15:07:35 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id ECBB61D603 for ; Tue, 19 May 2020 15:07:34 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id e1so15847920wrt.5 for ; Tue, 19 May 2020 06:07:34 -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=0zTj0A2ezGZQ32BwCuXH1W85utU4QdwWUxaqpnz1jZs=; b=jq4GlLKwYfhDFRJKGuPNHh1M4IvR00J+kw7Gndwic5LiOrCNKKVva30EKyne9zvGhR Bvq4jFkh3UDK+6AHi09LIfCJ12TSeXHsuq33csS+SGpWs7Lo6RFk9eflb1lMgr+Wp8pa aK0a6nkISBJtHOVzAwm49v1DfP20Ovs6lSMirRBzcsklPd5Y/hpuFPVTxiaN36haWYYI LqIdg3oWZ13V+iGJAWBmUoa89NKXbGNJzRdvz6JuWfmyZGKAZCh0KLtG3Cw9To5xi7Wj KcgZkOZl/wChegdIoV0JN060oLZi1SlOVqz+38Ota7EArZsnrTm8cTInD8rVYBmPqRWR DaMA== 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=0zTj0A2ezGZQ32BwCuXH1W85utU4QdwWUxaqpnz1jZs=; b=hUpTkjNBdPCqKIPaBt1lq56M04zZ16lrFOEyEgUbZtLIB1fGRfDuoljy6qTqTDpZNs CONfHXaZRt5qRfYRvMsEJ3jeMawiDhutCh8Ksh44pwXutB4t51eEods5DxvUweJ9Ek1X ZLLj4y2z/dVTzTMc78v+tr+dFRVpiMDF9MnMLN4rhAiUidBopqUbDGzcA2Qd+GVPb/JQ HySol8xrGCtbvO3qHj/FaLzj2XISoYl07sQVMUE7S+6Shfin0gce5D9OlyZAuNYdM7YU C+qaYepXymwgSFuIzp4IoverMuihni87Cctx6RgZvV8cWmrnck79U0iTPUxvH0d5LOEk 0ZNg== X-Gm-Message-State: AOAM531LGKm4hWEqCutS8xhkXYPEwWDa4f8DWXozUkzmNbOYuetfv2iW lqN+IqMfw+8QjzpEQdLCdmg= X-Google-Smtp-Source: ABdhPJymb01JvI49w1zQR6N+JaCoqvH48eVRSSazIrXhuGXLv0oQgS8v2y2gNwC2bWqiB9xn2l+Spg== X-Received: by 2002:a5d:4651:: with SMTP id j17mr24273841wrs.50.1589893654717; Tue, 19 May 2020 06:07:34 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i6sm20702933wrw.97.2020.05.19.06.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:07:34 -0700 (PDT) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Tue, 19 May 2020 14:02:47 +0100 Message-Id: <20200519130549.112823-32-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/thunderx: use dynamic log type' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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 e7c5383a090899fda00b8d5b7fd09da519a5b680 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 2cf0ffe13b..26191586f7 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -496,9 +496,10 @@ nicvf_dev_reta_query(struct rte_eth_dev *dev, int ret, i, j; 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; } @@ -526,9 +527,9 @@ nicvf_dev_reta_update(struct rte_eth_dev *dev, int ret, i, j; 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; } @@ -569,8 +570,8 @@ 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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:45.902354689 +0100 +++ 0032-net-thunderx-use-dynamic-log-type.patch 2020-05-19 14:04:44.168647502 +0100 @@ -1,12 +1,13 @@ -From d801c39559b346f26e3d3a8e16a92bb19e0165b9 Mon Sep 17 00:00:00 2001 +From e7c5383a090899fda00b8d5b7fd09da519a5b680 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") -Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit @@ -15,7 +16,7 @@ 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c -index 6f43541a5d..bfda0ab0ed 100644 +index 2cf0ffe13b..26191586f7 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -496,9 +496,10 @@ nicvf_dev_reta_query(struct rte_eth_dev *dev,