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 BBEF345804 for ; Fri, 23 Aug 2024 18:21:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B2D324337A; Fri, 23 Aug 2024 18:21:59 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 9C5CF402BE for ; Fri, 23 Aug 2024 18:21:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430118; 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=qVk+WyiWUs0f74uI1UPYtkOOeUgxFaDfK8wBIVh/dl8=; b=dS0yVz6e1ca2MlwAg1Yh+0sYxtKVxS/7UmMZLApkNXVFL0PSfcHNdmNyT6ak1BAhoRWpEt EXzgg4ZI0wgWwxCgQVEE7BZ0DWwjH8B6SS9sGONxzQf2Vwgk0DHRuqwrKCHviKnYsUu4nV 2jMSUdep6JRB7TL6yiD7XHOHRLyTW1A= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-400-HOA5riSkMKuYVeKdwavhbQ-1; Fri, 23 Aug 2024 12:21:54 -0400 X-MC-Unique: HOA5riSkMKuYVeKdwavhbQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D24D319560B0; Fri, 23 Aug 2024 16:21:53 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 65C801956053; Fri, 23 Aug 2024 16:21:52 +0000 (UTC) From: Kevin Traynor To: Ganapati Kundapura Cc: Akhil Goyal , dpdk stable Subject: patch 'cryptodev: validate crypto callbacks from next node' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:11 +0100 Message-ID: <20240823161929.1004778-63-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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/6a46407ad764d7ef56d09d80899a4893b97e37c4 Thanks. Kevin --- >From 6a46407ad764d7ef56d09d80899a4893b97e37c4 Mon Sep 17 00:00:00 2001 From: Ganapati Kundapura Date: Thu, 27 Jun 2024 05:06:26 -0500 Subject: [PATCH] cryptodev: validate crypto callbacks from next node [ upstream commit e858d0c9612211ba43d6703cb7834697214a3fe1 ] Crypto callbacks are invoked on checking from head node which is always valid pointer. This patch checks next node from the head node if callbacks registered before invoking callbacks. Fixes: 1c3ffb95595e ("cryptodev: add enqueue and dequeue callbacks") Signed-off-by: Ganapati Kundapura Acked-by: Akhil Goyal --- lib/cryptodev/rte_cryptodev.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h index f40f8dd418..eead3d2bff 100644 --- a/lib/cryptodev/rte_cryptodev.h +++ b/lib/cryptodev/rte_cryptodev.h @@ -1852,5 +1852,5 @@ rte_cryptodev_dequeue_burst(uint8_t dev_id, uint16_t qp_id, #ifdef RTE_CRYPTO_CALLBACKS - if (unlikely(fp_ops->qp.deq_cb != NULL)) { + if (unlikely(fp_ops->qp.deq_cb[qp_id].next != NULL)) { struct rte_cryptodev_cb_rcu *list; struct rte_cryptodev_cb *cb; @@ -1919,5 +1919,5 @@ rte_cryptodev_enqueue_burst(uint8_t dev_id, uint16_t qp_id, qp = fp_ops->qp.data[qp_id]; #ifdef RTE_CRYPTO_CALLBACKS - if (unlikely(fp_ops->qp.enq_cb != NULL)) { + if (unlikely(fp_ops->qp.enq_cb[qp_id].next != NULL)) { struct rte_cryptodev_cb_rcu *list; struct rte_cryptodev_cb *cb; -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:11.726514105 +0100 +++ 0063-cryptodev-validate-crypto-callbacks-from-next-node.patch 2024-08-23 17:18:09.735430158 +0100 @@ -1 +1 @@ -From e858d0c9612211ba43d6703cb7834697214a3fe1 Mon Sep 17 00:00:00 2001 +From 6a46407ad764d7ef56d09d80899a4893b97e37c4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e858d0c9612211ba43d6703cb7834697214a3fe1 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index c946f747fc..bec947f6d5 100644 +index f40f8dd418..eead3d2bff 100644 @@ -25 +26 @@ -@@ -1911,5 +1911,5 @@ rte_cryptodev_dequeue_burst(uint8_t dev_id, uint16_t qp_id, +@@ -1852,5 +1852,5 @@ rte_cryptodev_dequeue_burst(uint8_t dev_id, uint16_t qp_id, @@ -32 +33 @@ -@@ -1978,5 +1978,5 @@ rte_cryptodev_enqueue_burst(uint8_t dev_id, uint16_t qp_id, +@@ -1919,5 +1919,5 @@ rte_cryptodev_enqueue_burst(uint8_t dev_id, uint16_t qp_id,