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 00964A04F3 for ; Thu, 19 Dec 2019 15:37:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E18571BF80; Thu, 19 Dec 2019 15:37:00 +0100 (CET) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id CF6CA1BF80 for ; Thu, 19 Dec 2019 15:36:59 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id 20so5735557wmj.4 for ; Thu, 19 Dec 2019 06:36:59 -0800 (PST) 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=1G8aATYz/uyqVueiQ5G5aUUsftPJjzuLuUfJHL/GYuo=; b=DvBi43WZ4r4zHjMlxXprjV3NKi1IMYOdS1EMZ5PpNyRMiQqeQmnioxXZPjATEepXJU J1hojMga5ZBnAbjrQvJnSLnafq68ZzGZlacCrN5iSH5speGlVeuqqOoeoHvW1gBpo4fo elV2hcWNbBNH0PIKtX7wAMuDlv9H96EaE6tLTEq98SOmrvg1+qzTqyc2Op8NbPjnty/7 9x3Y2TD5dLXJ3rs8BkEBB3Wb+9hApzjAQA8hMS/SWRTMLX2Gz6ls0p8vO+sy/JS34ZqW +id8qtAnJv06xjEjB60hcHk8rQBoeAViTP0RFPgRacd23OrhhaDM8k3K8bWDoUAdGuWK jTQg== 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=1G8aATYz/uyqVueiQ5G5aUUsftPJjzuLuUfJHL/GYuo=; b=n+Q+O3NjWG718w1RzgP501wc5aGAkL8mh5VVddZo5ZZcCnIKpD/7oTNfEpi6oTG0hG NzEt42dv9xi0AxNvbG2A0UHuQsu7Suva686rwJYSPwEEp7oMWzd9ZzN5+O/uoXvSwNjL LLRIQthZU4K6c6mFAs5cvevYINcaAwtVIlodzEkLJ8fB4/vLgRTxgvuPMKJBp75UG5rd pbDXqh/ASrKHmGblvLU89vYaCFlI51zCrBphaUOVBQYDFej1rz9Gb3TX22xGsUil/Cr1 uM81OizSQSMWoJGGTPjRUmz64JfCMon+x3JrMxPO4TvBBgjDbJ7amG/0MJ46jj7oKxXI ldeQ== X-Gm-Message-State: APjAAAVkVrvWq0ldupLJhLpnlF7WRmb6CmjnWfNvBnAnvvHViTT7QYyH hD7rVoHHw8Zr3a4v8uqSSrqXQ2QzAWI= X-Google-Smtp-Source: APXvYqyRu4wktcYutqiYZ/T367YEgvo46IWn2rw8i9IxzspRL92Ttfy0KpgyN+xcuJiKk18TaP/sYA== X-Received: by 2002:a05:600c:2254:: with SMTP id a20mr10492347wmm.97.1576766219578; Thu, 19 Dec 2019 06:36:59 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h17sm6781686wrs.18.2019.12.19.06.36.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:36:59 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Rasesh Mody , dpdk stable Date: Thu, 19 Dec 2019 14:33:14 +0000 Message-Id: <20191219143447.21506-47-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/qede: limit Rx ring index read for debug' has been queued to LTS release 17.11.10 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 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/19. 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 aa51baced878cdbbeb7579925da4fc8367dbb3da Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 27 Sep 2019 13:28:49 +0200 Subject: [PATCH] net/qede: limit Rx ring index read for debug [ upstream commit ff3555d6849748f84056ba2f517dc50ac5718974 ] Caught by clang, this idx value is only used for a debug message when the mbufs allocation fails. No need to use idx as a temporary storage. Fixes: 8f2312474529 ("net/qede: fix performance bottleneck in Rx path") Signed-off-by: David Marchand Acked-by: Rasesh Mody --- drivers/net/qede/qede_rxtx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c index 358a8ef72b..dd88c50ea2 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c @@ -48,8 +48,6 @@ static inline int qede_alloc_rx_bulk_mbufs(struct qede_rx_queue *rxq, int count) int i, ret = 0; uint16_t idx; - idx = rxq->sw_rx_prod & NUM_RX_BDS(rxq); - if (count > QEDE_MAX_BULK_ALLOC_COUNT) count = QEDE_MAX_BULK_ALLOC_COUNT; @@ -58,7 +56,9 @@ static inline int qede_alloc_rx_bulk_mbufs(struct qede_rx_queue *rxq, int count) PMD_RX_LOG(ERR, rxq, "Failed to allocate %d rx buffers " "sw_rx_prod %u sw_rx_cons %u mp entries %u free %u", - count, idx, rxq->sw_rx_cons & NUM_RX_BDS(rxq), + count, + rxq->sw_rx_prod & NUM_RX_BDS(rxq), + rxq->sw_rx_cons & NUM_RX_BDS(rxq), rte_mempool_avail_count(rxq->mb_pool), rte_mempool_in_use_count(rxq->mb_pool)); return -ENOMEM; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:28.220342375 +0000 +++ 0047-net-qede-limit-Rx-ring-index-read-for-debug.patch 2019-12-19 14:32:26.017296080 +0000 @@ -1,14 +1,15 @@ -From ff3555d6849748f84056ba2f517dc50ac5718974 Mon Sep 17 00:00:00 2001 +From aa51baced878cdbbeb7579925da4fc8367dbb3da Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 27 Sep 2019 13:28:49 +0200 Subject: [PATCH] net/qede: limit Rx ring index read for debug +[ upstream commit ff3555d6849748f84056ba2f517dc50ac5718974 ] + Caught by clang, this idx value is only used for a debug message when the mbufs allocation fails. No need to use idx as a temporary storage. Fixes: 8f2312474529 ("net/qede: fix performance bottleneck in Rx path") -Cc: stable@dpdk.org Signed-off-by: David Marchand Acked-by: Rasesh Mody @@ -17,10 +18,10 @@ 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c -index dbb74fc64e..fffccf0702 100644 +index 358a8ef72b..dd88c50ea2 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c -@@ -46,8 +46,6 @@ static inline int qede_alloc_rx_bulk_mbufs(struct qede_rx_queue *rxq, int count) +@@ -48,8 +48,6 @@ static inline int qede_alloc_rx_bulk_mbufs(struct qede_rx_queue *rxq, int count) int i, ret = 0; uint16_t idx; @@ -29,7 +30,7 @@ if (count > QEDE_MAX_BULK_ALLOC_COUNT) count = QEDE_MAX_BULK_ALLOC_COUNT; -@@ -56,7 +54,9 @@ static inline int qede_alloc_rx_bulk_mbufs(struct qede_rx_queue *rxq, int count) +@@ -58,7 +56,9 @@ static inline int qede_alloc_rx_bulk_mbufs(struct qede_rx_queue *rxq, int count) PMD_RX_LOG(ERR, rxq, "Failed to allocate %d rx buffers " "sw_rx_prod %u sw_rx_cons %u mp entries %u free %u",