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 2E9C046211 for ; Thu, 13 Feb 2025 11:01:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B54742ED3; Thu, 13 Feb 2025 11:01:12 +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 5C98642ECA for ; Thu, 13 Feb 2025 11:01:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440870; 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=A3Q2f987fd0yWxD1lGxodmhO9OUAzgG4+flnVUTxIIE=; b=BOdcmhyve8oVlaqJ4EfIjMoSL7ZlL7zGvdyq8y0BqbuG8N2Rl/AI3YpKaRtXTgmYqUOmyk AYSZPcWjCBs7TIAz38FbhlESkLurhbIE8L2i2iBfMfqMlNcoID8q2dWmobU5cbMllS0YSB NJuhlnVatFACLkKh3Uzj6GXI+OOnA6w= Received: from mx-prod-mc-02.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-673-nVK45DG0PP6XsNytIrb9Uw-1; Thu, 13 Feb 2025 05:01:06 -0500 X-MC-Unique: nVK45DG0PP6XsNytIrb9Uw-1 X-Mimecast-MFC-AGG-ID: nVK45DG0PP6XsNytIrb9Uw Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0764318EB2C6; Thu, 13 Feb 2025 10:01:05 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E1A901800360; Thu, 13 Feb 2025 10:01:02 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: Zhigang Hu , David Marchand , =?UTF-8?q?Mattias=20R=C3=B6nnblom?= , dpdk stable Subject: patch 'cryptodev: fix C++ include' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:02 +0000 Message-ID: <20250213095933.362078-35-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 3ikcdcEGjrAOHCtQfVjeflv08TYcRLMWYhN1-wg28Tk_1739440865 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 24.11.2 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/17/25. 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/5d53e2600183649b4274e45c2ba421342a6c25e7 Thanks. Kevin --- >From 5d53e2600183649b4274e45c2ba421342a6c25e7 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Thu, 19 Dec 2024 14:30:50 +0100 Subject: [PATCH] cryptodev: fix C++ include MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 24d4d29b5f553e0bae42702b246ae97a812e8f45 ] Some cryptodev functions were not included in an extern "C" block. There are 2 blocks, the second one being fast path inline functions, preceded with an include of the required rte_cryptodev_core.h file. Fixes: 719834a6849e ("use C linkage where appropriate in headers") Reported-by: Zhigang Hu Signed-off-by: Thomas Monjalon Reviewed-by: David Marchand Reviewed-by: Mattias Rönnblom --- .mailmap | 1 + lib/cryptodev/rte_cryptodev.h | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 37e2087ec1..bd4b6778ec 100644 --- a/.mailmap +++ b/.mailmap @@ -1799,4 +1799,5 @@ Zhenning Xiao Zhe Tao Zhichao Zeng +Zhigang Hu Zhigang Lu Zhiguang He diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h index c64d2f83a0..071ff3dbdf 100644 --- a/lib/cryptodev/rte_cryptodev.h +++ b/lib/cryptodev/rte_cryptodev.h @@ -23,4 +23,8 @@ #include "rte_cryptodev_trace_fp.h" +#ifdef __cplusplus +extern "C" { +#endif + /** * @internal Logtype used for cryptodev related messages. @@ -1929,9 +1933,14 @@ int rte_cryptodev_remove_deq_callback(uint8_t dev_id, struct rte_cryptodev_cb *cb); -#include +#ifdef __cplusplus +} +#endif + +#include "rte_cryptodev_core.h" #ifdef __cplusplus extern "C" { #endif + /** * @@ -2126,5 +2135,4 @@ out: } - #ifdef __cplusplus } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:38.374167993 +0000 +++ 0035-cryptodev-fix-C-include.patch 2025-02-12 17:29:34.309945685 +0000 @@ -1 +1 @@ -From 24d4d29b5f553e0bae42702b246ae97a812e8f45 Mon Sep 17 00:00:00 2001 +From 5d53e2600183649b4274e45c2ba421342a6c25e7 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 24d4d29b5f553e0bae42702b246ae97a812e8f45 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index e428ed3dec..76f65e5114 100644 +index 37e2087ec1..bd4b6778ec 100644 @@ -30 +31 @@ -@@ -1801,4 +1801,5 @@ Zhenning Xiao +@@ -1799,4 +1799,5 @@ Zhenning Xiao