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 422D5A04B5 for ; Tue, 3 Dec 2019 19:28:36 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2612B1BF82; Tue, 3 Dec 2019 19:28:36 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id B15411BF82 for ; Tue, 3 Dec 2019 19:28:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397714; 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=DEFhLmFPXtnMU6uHybP7aKAnKSwe98e7PU/8rv16wLE=; b=L1juBDJXQYPn8FPLFSC+QIVWyaUl9kMiAvFZ1iuO/WouJyEuFU08tDeq2s066mCLCtqXZp 4BMJsaPIh4MAyZqMmRV8WQS+uJGJzEBM5CNfAMXA6nsE+4HTCi6xZwrzAJPoYu4sTieOU1 B4XnxmFROdTfGGeUUt3nEd1oUlZ7eN4= 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-98-Wso0rTTyMym4X8nlvZum-w-1; Tue, 03 Dec 2019 13:28:33 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3D1208017DF; Tue, 3 Dec 2019 18:28:32 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A36A5C3FA; Tue, 3 Dec 2019 18:28:28 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Rasesh Mody , dpdk stable Date: Tue, 3 Dec 2019 18:26:41 +0000 Message-Id: <20191203182714.17297-32-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: Wso0rTTyMym4X8nlvZum-w-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/qede: limit Rx ring index read for debug' has been queued to LTS release 18.11.6 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.6 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/10/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 rebasi= ng (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/c0384d31df0a725fc2= df7e8cfaf2ba32dc3082ec Thanks. Kevin. --- >From c0384d31df0a725fc2df7e8cfaf2ba32dc3082ec 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 ca1305f1b..52ebc8b8b 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c @@ -47,6 +47,4 @@ static inline int qede_alloc_rx_bulk_mbufs(struct qede_rx= _queue *rxq, int count) =09uint16_t idx; =20 -=09idx =3D rxq->sw_rx_prod & NUM_RX_BDS(rxq); - =09if (count > QEDE_MAX_BULK_ALLOC_COUNT) =09=09count =3D QEDE_MAX_BULK_ALLOC_COUNT; @@ -57,5 +55,7 @@ static inline int qede_alloc_rx_bulk_mbufs(struct qede_rx= _queue *rxq, int count) =09=09=09 "Failed to allocate %d rx buffers " =09=09=09 "sw_rx_prod %u sw_rx_cons %u mp entries %u free %u", -=09=09=09 count, idx, rxq->sw_rx_cons & NUM_RX_BDS(rxq), +=09=09=09 count, +=09=09=09 rxq->sw_rx_prod & NUM_RX_BDS(rxq), +=09=09=09 rxq->sw_rx_cons & NUM_RX_BDS(rxq), =09=09=09 rte_mempool_avail_count(rxq->mb_pool), =09=09=09 rte_mempool_in_use_count(rxq->mb_pool)); --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:53.681625068 +0000 +++ 0032-net-qede-limit-Rx-ring-index-read-for-debug.patch=092019-12-03 17:= 29:51.755749849 +0000 @@ -1 +1 @@ -From ff3555d6849748f84056ba2f517dc50ac5718974 Mon Sep 17 00:00:00 2001 +From c0384d31df0a725fc2df7e8cfaf2ba32dc3082ec Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ff3555d6849748f84056ba2f517dc50ac5718974 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index dbb74fc64..fffccf070 100644 +index ca1305f1b..52ebc8b8b 100644