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 78B74A034F for ; Tue, 1 Mar 2022 11:43:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 17F61426D9; Tue, 1 Mar 2022 11:43:26 +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 386BE40DF6 for ; Tue, 1 Mar 2022 11:43:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131403; 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=oASOFq2PwUVM22TJH9C4fbnQF2NO+/8Jl1NsoaRXrk0=; b=gyei4NG5lbn1aXIS4jSeAGX8p5+/jnscD/JV7Re74dzhvwGCGdDNO8fHM9G1ONBIkaeKIg UO411EKrUgySVASOkqXhblwI4XVJ2nrDiiq04HMMd25aIJZqNmghJavg2tDHuvH+I83zu4 AgrfMYduOLuylB4HuROcGV0UfHhb0ZQ= 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-65-28yUWUsMNTSCbCOJJTLAIA-1; Tue, 01 Mar 2022 05:43:15 -0500 X-MC-Unique: 28yUWUsMNTSCbCOJJTLAIA-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 947A41091DA1; Tue, 1 Mar 2022 10:43:14 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25A626FB02; Tue, 1 Mar 2022 10:43:12 +0000 (UTC) From: Kevin Traynor To: Brian Dooley Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'eal: add missing C++ guards' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:41:18 +0000 Message-Id: <20220301104300.334382-2-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/b2f85a808aef62fee67300f7b37307f92183dc0c Thanks. Kevin --- >From b2f85a808aef62fee67300f7b37307f92183dc0c Mon Sep 17 00:00:00 2001 From: Brian Dooley Date: Wed, 16 Feb 2022 15:14:46 +0000 Subject: [PATCH] eal: add missing C++ guards [ upstream commit d7e9c02ccad8928b6b804049ced9a3ce6172d81e ] Some public header files were missing 'extern "C"' C++ guards, and couldn't be used by C++ applications. Add the missing guards. Fixes: af75078fece3 ("first public release") Fixes: 7f3aa0863903 ("eal: introduce bit operations API") Fixes: 166a743c53fa ("compat: add infrastructure to support symbol versioning") Fixes: 8f40ee0734c8 ("eal/x86: get hypervisor name") Fixes: 75583b0d1efd ("eal: add keep alive monitoring") Fixes: 88701645c98c ("eal: move interrupt type out of igb_uio") Fixes: f04519d8092e ("lib: add missing include dependencies") Fixes: f58880682c81 ("trace: implement register API") Fixes: 428eb983f5f7 ("eal: add OS specific header file") Signed-off-by: Brian Dooley Acked-by: Bruce Richardson Acked-by: Tyler Retzlaff --- lib/eal/include/rte_bitops.h | 8 ++++++++ lib/eal/include/rte_branch_prediction.h | 8 ++++++++ lib/eal/include/rte_compat.h | 8 ++++++++ lib/eal/include/rte_hypervisor.h | 8 ++++++++ lib/eal/include/rte_keepalive.h | 8 ++++++++ lib/eal/include/rte_pci_dev_feature_defs.h | 8 ++++++++ lib/eal/include/rte_pci_dev_features.h | 8 ++++++++ lib/eal/include/rte_time.h | 8 ++++++++ lib/eal/include/rte_trace_point_register.h | 8 ++++++++ lib/eal/linux/include/rte_os.h | 8 ++++++++ 10 files changed, 80 insertions(+) diff --git a/lib/eal/include/rte_bitops.h b/lib/eal/include/rte_bitops.h index 141e8ea730..f50dbe4388 100644 --- a/lib/eal/include/rte_bitops.h +++ b/lib/eal/include/rte_bitops.h @@ -18,4 +18,8 @@ #include +#ifdef __cplusplus +extern "C" { +#endif + /** * Get the uint64_t value for a specified bit set. @@ -272,3 +276,7 @@ rte_bit_relaxed_test_and_clear64(unsigned int nr, volatile uint64_t *addr) } +#ifdef __cplusplus +} +#endif + #endif /* _RTE_BITOPS_H_ */ diff --git a/lib/eal/include/rte_branch_prediction.h b/lib/eal/include/rte_branch_prediction.h index 854ef9e5dd..0256a9de60 100644 --- a/lib/eal/include/rte_branch_prediction.h +++ b/lib/eal/include/rte_branch_prediction.h @@ -11,4 +11,8 @@ #define _RTE_BRANCH_PREDICTION_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** * Check if a branch is likely to be taken. @@ -39,3 +43,7 @@ #endif /* unlikely */ +#ifdef __cplusplus +} +#endif + #endif /* _RTE_BRANCH_PREDICTION_H_ */ diff --git a/lib/eal/include/rte_compat.h b/lib/eal/include/rte_compat.h index 2718612cce..a7dbe23449 100644 --- a/lib/eal/include/rte_compat.h +++ b/lib/eal/include/rte_compat.h @@ -7,4 +7,8 @@ #define _RTE_COMPAT_H_ +#ifdef __cplusplus +extern "C" { +#endif + #ifndef ALLOW_EXPERIMENTAL_API @@ -44,3 +48,7 @@ __attribute__((section(".text.internal"))) #endif +#ifdef __cplusplus +} +#endif + #endif /* _RTE_COMPAT_H_ */ diff --git a/lib/eal/include/rte_hypervisor.h b/lib/eal/include/rte_hypervisor.h index 5fe719c1d4..1666431ce3 100644 --- a/lib/eal/include/rte_hypervisor.h +++ b/lib/eal/include/rte_hypervisor.h @@ -6,4 +6,8 @@ #define RTE_HYPERVISOR_H +#ifdef __cplusplus +extern "C" { +#endif + /** * @file @@ -31,3 +35,7 @@ const char * rte_hypervisor_get_name(enum rte_hypervisor id); +#ifdef __cplusplus +} +#endif + #endif /* RTE_HYPERVISOR_H */ diff --git a/lib/eal/include/rte_keepalive.h b/lib/eal/include/rte_keepalive.h index bd25508da8..538fb09095 100644 --- a/lib/eal/include/rte_keepalive.h +++ b/lib/eal/include/rte_keepalive.h @@ -12,4 +12,8 @@ #define _KEEPALIVE_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include #include @@ -140,3 +144,7 @@ rte_keepalive_register_relay_callback(struct rte_keepalive *keepcfg, void *data); +#ifdef __cplusplus +} +#endif + #endif /* _KEEPALIVE_H_ */ diff --git a/lib/eal/include/rte_pci_dev_feature_defs.h b/lib/eal/include/rte_pci_dev_feature_defs.h index e12c22081f..c5bb631286 100644 --- a/lib/eal/include/rte_pci_dev_feature_defs.h +++ b/lib/eal/include/rte_pci_dev_feature_defs.h @@ -6,4 +6,8 @@ #define _RTE_PCI_DEV_DEFS_H_ +#ifdef __cplusplus +extern "C" { +#endif + /* interrupt mode */ enum rte_intr_mode { @@ -14,3 +18,7 @@ enum rte_intr_mode { }; +#ifdef __cplusplus +} +#endif + #endif /* _RTE_PCI_DEV_DEFS_H_ */ diff --git a/lib/eal/include/rte_pci_dev_features.h b/lib/eal/include/rte_pci_dev_features.h index 6104123d27..ee6e10590c 100644 --- a/lib/eal/include/rte_pci_dev_features.h +++ b/lib/eal/include/rte_pci_dev_features.h @@ -6,4 +6,8 @@ #define _RTE_PCI_DEV_FEATURES_H +#ifdef __cplusplus +extern "C" { +#endif + #include @@ -13,3 +17,7 @@ #define RTE_INTR_MODE_MSIX_NAME "msix" +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/eal/include/rte_time.h b/lib/eal/include/rte_time.h index 5ad7c8841a..ec25f7b93d 100644 --- a/lib/eal/include/rte_time.h +++ b/lib/eal/include/rte_time.h @@ -6,4 +6,8 @@ #define _RTE_TIME_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include #include @@ -99,3 +103,7 @@ rte_ns_to_timespec(uint64_t nsec) } +#ifdef __cplusplus +} +#endif + #endif /* _RTE_TIME_H_ */ diff --git a/lib/eal/include/rte_trace_point_register.h b/lib/eal/include/rte_trace_point_register.h index 4f5c86552d..2e61439940 100644 --- a/lib/eal/include/rte_trace_point_register.h +++ b/lib/eal/include/rte_trace_point_register.h @@ -6,4 +6,8 @@ #define _RTE_TRACE_POINT_REGISTER_H_ +#ifdef __cplusplus +extern "C" { +#endif + #ifdef _RTE_TRACE_POINT_H_ #error for registration, include this file first before @@ -43,3 +47,7 @@ do { \ } while (0) +#ifdef __cplusplus +} +#endif + #endif /* _RTE_TRACE_POINT_REGISTER_H_ */ diff --git a/lib/eal/linux/include/rte_os.h b/lib/eal/linux/include/rte_os.h index 35c07c70cb..c72bf5b7e6 100644 --- a/lib/eal/linux/include/rte_os.h +++ b/lib/eal/linux/include/rte_os.h @@ -6,4 +6,8 @@ #define _RTE_OS_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** * This header should contain any definition @@ -43,3 +47,7 @@ typedef cpu_set_t rte_cpuset_t; #endif +#ifdef __cplusplus +} +#endif + #endif /* _RTE_OS_H_ */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:01.527664557 +0000 +++ 0002-eal-add-missing-C-guards.patch 2022-03-01 10:41:01.235244084 +0000 @@ -1 +1 @@ -From d7e9c02ccad8928b6b804049ced9a3ce6172d81e Mon Sep 17 00:00:00 2001 +From b2f85a808aef62fee67300f7b37307f92183dc0c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d7e9c02ccad8928b6b804049ced9a3ce6172d81e ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -79 +80 @@ -index 9556bbf4d0..fc9fbaaab2 100644 +index 2718612cce..a7dbe23449 100644 @@ -91 +92 @@ -@@ -47,3 +51,7 @@ __attribute__((section(".text.internal"))) +@@ -44,3 +48,7 @@ __attribute__((section(".text.internal")))