[PATCH] eal/x86: don't export internal alignment macro

[PATCH] eal/x86: don't export internal alignment macro

[David Marchand]

ALIGNMENT_MASK is only used internally.
Besides it lacks a DPDK-related prefix.
Hide it from external eyes.

Reported-by: Morten Brørup <mb@smartsharesystems.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 lib/eal/x86/include/rte_memcpy.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/eal/x86/include/rte_memcpy.h b/lib/eal/x86/include/rte_memcpy.h
index 18aa4e43a7..b678b5c942 100644
--- a/lib/eal/x86/include/rte_memcpy.h
+++ b/lib/eal/x86/include/rte_memcpy.h
@@ -851,6 +851,8 @@ rte_memcpy(void *dst, const void *src, size_t n)
 		return rte_memcpy_generic(dst, src, n);
 }
 
+#undef ALIGNMENT_MASK
+
 #if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION >= 100000)
 #pragma GCC diagnostic pop
 #endif
-- 
2.36.1

RE: [PATCH] eal/x86: don't export internal alignment macro

[Morten Brørup]

> From: David Marchand [mailto:david.marchand@redhat.com]
> Sent: Tuesday, 21 June 2022 16.13
> 
> ALIGNMENT_MASK is only used internally.
> Besides it lacks a DPDK-related prefix.
> Hide it from external eyes.
> 
> Reported-by: Morten Brørup <mb@smartsharesystems.com>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
>  lib/eal/x86/include/rte_memcpy.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/lib/eal/x86/include/rte_memcpy.h
> b/lib/eal/x86/include/rte_memcpy.h
> index 18aa4e43a7..b678b5c942 100644
> --- a/lib/eal/x86/include/rte_memcpy.h
> +++ b/lib/eal/x86/include/rte_memcpy.h
> @@ -851,6 +851,8 @@ rte_memcpy(void *dst, const void *src, size_t n)
>  		return rte_memcpy_generic(dst, src, n);
>  }
> 
> +#undef ALIGNMENT_MASK
> +
>  #if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION >= 100000)
>  #pragma GCC diagnostic pop
>  #endif
> --
> 2.36.1
> 

You could consider also giving another name with a lower risk of collision.
However, I think the risk is very low, since it can only collide with other headers being included before this header file, so this suffices.

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

Re: [PATCH] eal/x86: don't export internal alignment macro

[Thomas Monjalon]

21/06/2022 16:28, Morten Brørup:
> > From: David Marchand [mailto:david.marchand@redhat.com]
> > Sent: Tuesday, 21 June 2022 16.13
> > 
> > ALIGNMENT_MASK is only used internally.
> > Besides it lacks a DPDK-related prefix.
> > Hide it from external eyes.
> > 
> > Reported-by: Morten Brørup <mb@smartsharesystems.com>
> > Signed-off-by: David Marchand <david.marchand@redhat.com>
> > ---
> > --- a/lib/eal/x86/include/rte_memcpy.h
> > +++ b/lib/eal/x86/include/rte_memcpy.h
> > +#undef ALIGNMENT_MASK
> 
> You could consider also giving another name with a lower risk of collision.
> However, I think the risk is very low, since it can only collide with other headers being included before this header file, so this suffices.
> 
> Reviewed-by: Morten Brørup <mb@smartsharesystems.com>

Fixes: f5472703c0bd ("eal: optimize aligned memcpy on x86")
Cc: stable@dpdk.org

Applied, thanks.