rte_dev: allow C-symbol-in-C++ dma operations

Message ID 20220505043935.GA312259@cth-desktop-dorm.onozuka.cth451.me (mailing list archive)
State Accepted, archived
Delegated to: David Marchand
Headers
Series rte_dev: allow C-symbol-in-C++ dma operations |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-mellanox-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/github-robot: build success github build: passed
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS

Commit Message

Tianhao Chai May 5, 2022, 4:39 a.m. UTC
  Currently the "extern C" section ends right before rte_dev_dma_unmap
and other DMA function declarations, causing some C++ compilers to
produce C++ mangled symbols to rte_dev_dma_unmap instead of C symbols.
This leads to build failures later when linking a final executable
against this object.

The issue is observed on DPDK 22.03 and G++ 11.

Signed-off-by: Tianhao Chai <cth451@gmail.com>
---
 lib/eal/include/rte_dev.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
  

Comments

Bruce Richardson May 5, 2022, 9 a.m. UTC | #1
On Wed, May 04, 2022 at 11:39:35PM -0500, Tianhao Chai wrote:
> Currently the "extern C" section ends right before rte_dev_dma_unmap
> and other DMA function declarations, causing some C++ compilers to
> produce C++ mangled symbols to rte_dev_dma_unmap instead of C symbols.
> This leads to build failures later when linking a final executable
> against this object.
> 
> The issue is observed on DPDK 22.03 and G++ 11.
> 

From the git history I think the first offending commit is a753e53.

Fixes: a753e53d517b ("eal: add device event monitor framework")


> Signed-off-by: Tianhao Chai <cth451@gmail.com>

Acked-by: Bruce Richardson <bruce.richardson@intel.com>

> ---
>  lib/eal/include/rte_dev.h | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h
> index 448a41cb0e..e6ff1218f9 100644
> --- a/lib/eal/include/rte_dev.h
> +++ b/lib/eal/include/rte_dev.h
> @@ -320,10 +320,6 @@ rte_dev_iterator_next(struct rte_dev_iterator *it);
>  	     dev != NULL; \
>  	     dev = rte_dev_iterator_next(it))
>  
> -#ifdef __cplusplus
> -}
> -#endif
> -
>  /**
>   * @warning
>   * @b EXPERIMENTAL: this API may change without prior notice
> @@ -496,4 +492,8 @@ int
>  rte_dev_dma_unmap(struct rte_device *dev, void *addr, uint64_t iova,
>  		  size_t len);
>  
> +#ifdef __cplusplus
> +}
> +#endif
> +
>  #endif /* _RTE_DEV_H_ */
> -- 
> 2.35.1
>
  
Tyler Retzlaff May 5, 2022, 9:43 a.m. UTC | #2
On Wed, May 04, 2022 at 11:39:35PM -0500, Tianhao Chai wrote:
> Currently the "extern C" section ends right before rte_dev_dma_unmap
> and other DMA function declarations, causing some C++ compilers to
> produce C++ mangled symbols to rte_dev_dma_unmap instead of C symbols.
> This leads to build failures later when linking a final executable
> against this object.
> 
> The issue is observed on DPDK 22.03 and G++ 11.
> 
> Signed-off-by: Tianhao Chai <cth451@gmail.com>

Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
  
David Marchand May 5, 2022, 9:53 a.m. UTC | #3
On Thu, May 5, 2022 at 11:00 AM Bruce Richardson
<bruce.richardson@intel.com> wrote:
> On Wed, May 04, 2022 at 11:39:35PM -0500, Tianhao Chai wrote:
> > Currently the "extern C" section ends right before rte_dev_dma_unmap
> > and other DMA function declarations, causing some C++ compilers to
> > produce C++ mangled symbols to rte_dev_dma_unmap instead of C symbols.
> > This leads to build failures later when linking a final executable
> > against this object.
> >
> Fixes: a753e53d517b ("eal: add device event monitor framework")
Cc: stable@dpdk.org

>
> > Signed-off-by: Tianhao Chai <cth451@gmail.com>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>

Applied, thanks.
  
Morten Brørup May 6, 2022, 5:41 p.m. UTC | #4
> From: Tianhao Chai [mailto:cth451@gmail.com]
> Sent: Thursday, 5 May 2022 06.40
> To: dev@dpdk.org
> Cc: Tianhao Chai
> Subject: [PATCH] rte_dev: allow C-symbol-in-C++ dma operations
> 
> Currently the "extern C" section ends right before rte_dev_dma_unmap
> and other DMA function declarations, causing some C++ compilers to
> produce C++ mangled symbols to rte_dev_dma_unmap instead of C symbols.
> This leads to build failures later when linking a final executable
> against this object.
> 
> The issue is observed on DPDK 22.03 and G++ 11.
> 
> Signed-off-by: Tianhao Chai <cth451@gmail.com>
> ---

Acked-by: Morten Brørup <mb@smartsharesystems.com>
  

Patch

diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h
index 448a41cb0e..e6ff1218f9 100644
--- a/lib/eal/include/rte_dev.h
+++ b/lib/eal/include/rte_dev.h
@@ -320,10 +320,6 @@  rte_dev_iterator_next(struct rte_dev_iterator *it);
 	     dev != NULL; \
 	     dev = rte_dev_iterator_next(it))
 
-#ifdef __cplusplus
-}
-#endif
-
 /**
  * @warning
  * @b EXPERIMENTAL: this API may change without prior notice
@@ -496,4 +492,8 @@  int
 rte_dev_dma_unmap(struct rte_device *dev, void *addr, uint64_t iova,
 		  size_t len);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_DEV_H_ */