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 288AFA034F for ; Tue, 1 Mar 2022 11:43:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 23617426DC; Tue, 1 Mar 2022 11:43:37 +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 9E8D9407FF for ; Tue, 1 Mar 2022 11:43:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131415; 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=a58cmH0ckJq6mFjg5uVQsvAyeSkaVQMdRTsClC98krM=; b=ctkzcHKy0hajZ9wdJeAZNY7mfxnxRktaJoPaFIU0zh5l61zYlvV92ljL+Qtyh72vAtd1wi SMlUIsOqEVHKlhCmDbRqeMubwgNFm0OR0nXQgMSa/gyZ91guMR7ILhsVSHy63tQWjBezrw R0yZ32gNyarhYZlZWafuXY8KMuKm5N0= 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-417-rI8D4MaYNbWh112U7olq1Q-1; Tue, 01 Mar 2022 05:43:30 -0500 X-MC-Unique: rI8D4MaYNbWh112U7olq1Q-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8B8B61091DA0; Tue, 1 Mar 2022 10:43:29 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19B2C752D3; Tue, 1 Mar 2022 10:43:27 +0000 (UTC) From: Kevin Traynor To: Brian Dooley Cc: Bruce Richardson , Chenbo Xia , Tyler Retzlaff , dpdk stable Subject: patch 'vhost: add missing C++ guards' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:41:26 +0000 Message-Id: <20220301104300.334382-10-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 03/06/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/362921a8e3e57d7c0175bd39932c42c639154362 Thanks. Kevin --- >From 362921a8e3e57d7c0175bd39932c42c639154362 Mon Sep 17 00:00:00 2001 From: Brian Dooley Date: Wed, 16 Feb 2022 15:14:54 +0000 Subject: [PATCH] vhost: add missing C++ guards [ upstream commit cedca4084a61e85323800022974c1fde5027cbb4 ] Some public header files were missing 'extern "C"' C++ guards, and couldn't be used by C++ applications. Add the missing guards. Fixes: d7280c9fffcb ("vhost: support selective datapath") Fixes: 78639d54563a ("vhost: introduce async enqueue registration API") Fixes: 3bb595ecd682 ("vhost/crypto: add request handler") Fixes: 94c16e89d779 ("vhost: mark vDPA driver API as internal") Signed-off-by: Brian Dooley Acked-by: Bruce Richardson Reviewed-by: Chenbo Xia Acked-by: Tyler Retzlaff --- lib/vhost/rte_vdpa.h | 9 +++++++++ lib/vhost/rte_vhost_async.h | 8 ++++++++ lib/vhost/rte_vhost_crypto.h | 8 ++++++++ lib/vhost/vdpa_driver.h | 8 ++++++++ 4 files changed, 33 insertions(+) diff --git a/lib/vhost/rte_vdpa.h b/lib/vhost/rte_vdpa.h index 1437f400bf..6ac85d1bbf 100644 --- a/lib/vhost/rte_vdpa.h +++ b/lib/vhost/rte_vdpa.h @@ -6,4 +6,8 @@ #define _RTE_VDPA_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** * @file @@ -184,3 +188,8 @@ rte_vdpa_get_stats(struct rte_vdpa_device *dev, uint16_t qid, int rte_vdpa_reset_stats(struct rte_vdpa_device *dev, uint16_t qid); + +#ifdef __cplusplus +} +#endif + #endif /* _RTE_VDPA_H_ */ diff --git a/lib/vhost/rte_vhost_async.h b/lib/vhost/rte_vhost_async.h index a87ea6ba37..d20152ca7a 100644 --- a/lib/vhost/rte_vhost_async.h +++ b/lib/vhost/rte_vhost_async.h @@ -6,4 +6,8 @@ #define _RTE_VHOST_ASYNC_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include "rte_vhost.h" @@ -243,3 +247,7 @@ uint16_t rte_vhost_clear_queue_thread_unsafe(int vid, uint16_t queue_id, struct rte_mbuf **pkts, uint16_t count); +#ifdef __cplusplus +} +#endif + #endif /* _RTE_VHOST_ASYNC_H_ */ diff --git a/lib/vhost/rte_vhost_crypto.h b/lib/vhost/rte_vhost_crypto.h index f54d731139..b49e389579 100644 --- a/lib/vhost/rte_vhost_crypto.h +++ b/lib/vhost/rte_vhost_crypto.h @@ -6,4 +6,8 @@ #define _VHOST_CRYPTO_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include @@ -133,3 +137,7 @@ rte_vhost_crypto_finalize_requests(struct rte_crypto_op **ops, uint16_t nb_ops, int *callfds, uint16_t *nb_callfds); +#ifdef __cplusplus +} +#endif + #endif /**< _VHOST_CRYPTO_H_ */ diff --git a/lib/vhost/vdpa_driver.h b/lib/vhost/vdpa_driver.h index fc2d6acedd..7ba9e28e57 100644 --- a/lib/vhost/vdpa_driver.h +++ b/lib/vhost/vdpa_driver.h @@ -6,4 +6,8 @@ #define _VDPA_DRIVER_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include @@ -142,3 +146,7 @@ int rte_vdpa_relay_vring_used(int vid, uint16_t qid, void *vring_m); +#ifdef __cplusplus +} +#endif + #endif /* _VDPA_DRIVER_H_ */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:01.708301988 +0000 +++ 0010-vhost-add-missing-C-guards.patch 2022-03-01 10:41:01.246244086 +0000 @@ -1 +1 @@ -From cedca4084a61e85323800022974c1fde5027cbb4 Mon Sep 17 00:00:00 2001 +From 362921a8e3e57d7c0175bd39932c42c639154362 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cedca4084a61e85323800022974c1fde5027cbb4 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -49 +50 @@ -index 838c4778cc..f1293c6a9d 100644 +index a87ea6ba37..d20152ca7a 100644 @@ -59 +60 @@ - #include + #include "rte_vhost.h" @@ -61,2 +62,2 @@ -@@ -184,3 +188,7 @@ __rte_experimental - int rte_vhost_async_dma_configure(int16_t dma_id, uint16_t vchan_id); +@@ -243,3 +247,7 @@ uint16_t rte_vhost_clear_queue_thread_unsafe(int vid, uint16_t queue_id, + struct rte_mbuf **pkts, uint16_t count); @@ -91 +92 @@ -index fddbd50652..88138be34a 100644 +index fc2d6acedd..7ba9e28e57 100644 @@ -103 +104 @@ -@@ -145,3 +149,7 @@ int +@@ -142,3 +146,7 @@ int