From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 51B8AA034E for ; Mon, 21 Feb 2022 16:37:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D14D410F2; Mon, 21 Feb 2022 16:37:39 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 99269410F7 for ; Mon, 21 Feb 2022 16:37:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457858; 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=raQxuCY7C1472X6xh4VD88fxVXCAg+wHBzl70YmAWo4=; b=Jup7YxoSfZD4qezIQScCmTsCjqkh/7fAKsQFkBC/GGhIathM+W/dXojsFWpuK+si+Bwq9D 7wX67hsKOpk8GFgwCOm1V9fzAMUGgafA2Hv2Lweg97ZelPTsMrMxckan2mjshogmd3Rw7S la4bW0dXMJ2JG2doLCwS/xY1Q/GlLDA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-203-K9vgOlSZP3Oe_UJ3jbLeXw-1; Mon, 21 Feb 2022 10:37:34 -0500 X-MC-Unique: K9vgOlSZP3Oe_UJ3jbLeXw-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 B1040801ADA; Mon, 21 Feb 2022 15:37:33 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 830E57E131; Mon, 21 Feb 2022 15:37:32 +0000 (UTC) From: Kevin Traynor To: Anoob Joseph Cc: Kiran Kumar K , Akhil Goyal , dpdk stable Subject: patch 'crypto/cnxk: fix inflight count calculation' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:29 +0000 Message-Id: <20220221153625.152324-20-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.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 02/26/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/5977020bc34fc3619f7e6f89cfbfbb97ab83dce8 Thanks. Kevin --- >From 5977020bc34fc3619f7e6f89cfbfbb97ab83dce8 Mon Sep 17 00:00:00 2001 From: Anoob Joseph Date: Fri, 17 Dec 2021 14:50:01 +0530 Subject: [PATCH] crypto/cnxk: fix inflight count calculation [ upstream commit ec6ca0536e912d465a47d28ab90994d9ca576234 ] Inflight count calculation is updated to cover wrap around cases where head can become smaller than tail. Fixes: fd390896f4a3 ("crypto/cnxk: allow different cores in pending queue") Reported-by: Kiran Kumar K Signed-off-by: Anoob Joseph Acked-by: Akhil Goyal --- drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h index 0d363651ff..1d1b1fc94b 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h +++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h @@ -167,5 +167,9 @@ static __rte_always_inline uint64_t pending_queue_infl_cnt(uint64_t head, uint64_t tail, const uint64_t mask) { - return (head - tail) & mask; + /* + * Mask is nb_desc - 1. Add nb_desc to head and mask to account for + * cases when tail > head, which happens during wrap around. + */ + return ((head + mask + 1) - tail) & mask; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.101680112 +0000 +++ 0020-crypto-cnxk-fix-inflight-count-calculation.patch 2022-02-21 15:22:44.044704019 +0000 @@ -1 +1 @@ -From ec6ca0536e912d465a47d28ab90994d9ca576234 Mon Sep 17 00:00:00 2001 +From 5977020bc34fc3619f7e6f89cfbfbb97ab83dce8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ec6ca0536e912d465a47d28ab90994d9ca576234 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index ca363bba3a..0336ae102e 100644 +index 0d363651ff..1d1b1fc94b 100644 @@ -23 +24 @@ -@@ -157,5 +157,9 @@ static __rte_always_inline uint64_t +@@ -167,5 +167,9 @@ static __rte_always_inline uint64_t