Add missing arch-specific headers in meson.build. Fixes: 2173f3333b61 ("mcslock: add MCS queued lock implementation") Cc: stable@dpdk.org Signed-off-by: Olivier Matz <olivier.matz@6wind.com> --- lib/librte_eal/arm/include/meson.build | 1 + lib/librte_eal/ppc/include/meson.build | 1 + lib/librte_eal/x86/include/meson.build | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/librte_eal/arm/include/meson.build b/lib/librte_eal/arm/include/meson.build index 73b750a18f..70b2382c0b 100644 --- a/lib/librte_eal/arm/include/meson.build +++ b/lib/librte_eal/arm/include/meson.build @@ -14,6 +14,7 @@ arch_headers = files( 'rte_cycles.h', 'rte_io_64.h', 'rte_io.h', + 'rte_mcslock.h', 'rte_memcpy_32.h', 'rte_memcpy_64.h', 'rte_memcpy.h', diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/librte_eal/ppc/include/meson.build index ab4bd28092..e46ae899e6 100644 --- a/lib/librte_eal/ppc/include/meson.build +++ b/lib/librte_eal/ppc/include/meson.build @@ -8,6 +8,7 @@ arch_headers = files( 'rte_cpuflags.h', 'rte_cycles.h', 'rte_io.h', + 'rte_mcslock.h', 'rte_memcpy.h', 'rte_pause.h', 'rte_prefetch.h', diff --git a/lib/librte_eal/x86/include/meson.build b/lib/librte_eal/x86/include/meson.build index f0e998c2fe..9be5b318de 100644 --- a/lib/librte_eal/x86/include/meson.build +++ b/lib/librte_eal/x86/include/meson.build @@ -11,6 +11,7 @@ arch_headers = files( 'rte_cpuflags.h', 'rte_cycles.h', 'rte_io.h', + 'rte_mcslock.h', 'rte_memcpy.h', 'rte_prefetch.h', 'rte_pause.h', -- 2.25.1
Add missing arch-specific headers in meson.build. Fixes: ca49b92079df ("ticketlock: enable generic ticketlock on all arch") Cc: stable@dpdk.org Signed-off-by: Olivier Matz <olivier.matz@6wind.com> --- lib/librte_eal/arm/include/meson.build | 1 + lib/librte_eal/ppc/include/meson.build | 1 + lib/librte_eal/x86/include/meson.build | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/librte_eal/arm/include/meson.build b/lib/librte_eal/arm/include/meson.build index 70b2382c0b..844fa324f3 100644 --- a/lib/librte_eal/arm/include/meson.build +++ b/lib/librte_eal/arm/include/meson.build @@ -26,6 +26,7 @@ arch_headers = files( 'rte_prefetch.h', 'rte_rwlock.h', 'rte_spinlock.h', + 'rte_ticketlock.h', 'rte_vect.h', ) install_headers(arch_headers, subdir: get_option('include_subdir_arch')) diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/librte_eal/ppc/include/meson.build index e46ae899e6..dcd91e2f85 100644 --- a/lib/librte_eal/ppc/include/meson.build +++ b/lib/librte_eal/ppc/include/meson.build @@ -14,6 +14,7 @@ arch_headers = files( 'rte_prefetch.h', 'rte_rwlock.h', 'rte_spinlock.h', + 'rte_ticketlock.h', 'rte_vect.h', ) install_headers(arch_headers, subdir: get_option('include_subdir_arch')) diff --git a/lib/librte_eal/x86/include/meson.build b/lib/librte_eal/x86/include/meson.build index 9be5b318de..b25b176bcc 100644 --- a/lib/librte_eal/x86/include/meson.build +++ b/lib/librte_eal/x86/include/meson.build @@ -18,6 +18,7 @@ arch_headers = files( 'rte_rtm.h', 'rte_rwlock.h', 'rte_spinlock.h', + 'rte_ticketlock.h', 'rte_vect.h', ) install_headers(arch_headers, subdir: get_option('include_subdir_arch')) -- 2.25.1
On Wed, Nov 4, 2020 at 6:04 PM Olivier Matz <olivier.matz@6wind.com> wrote: > > Add missing arch-specific headers in meson.build. > > Fixes: ca49b92079df ("ticketlock: enable generic ticketlock on all arch") > Cc: stable@dpdk.org > > Signed-off-by: Olivier Matz <olivier.matz@6wind.com> Issue can be seen with: diff --git a/examples/helloworld/main.c b/examples/helloworld/main.c index 8a4cee60ff..627becb01b 100644 --- a/examples/helloworld/main.c +++ b/examples/helloworld/main.c @@ -14,6 +14,8 @@ #include <rte_per_lcore.h> #include <rte_lcore.h> #include <rte_debug.h> +#include <rte_mcslock.h> +#include <rte_ticketlock.h> static int lcore_hello(__rte_unused void *arg) For the series: Acked-by: David Marchand <david.marchand@redhat.com> -- David Marchand
On 11/4/20 9:03 AM, Olivier Matz wrote:
> Add missing arch-specific headers in meson.build.
>
> Fixes: ca49b92079df ("ticketlock: enable generic ticketlock on all arch")
> Cc: stable@dpdk.org
>
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---
> lib/librte_eal/arm/include/meson.build | 1 +
> lib/librte_eal/ppc/include/meson.build | 1 +
> lib/librte_eal/x86/include/meson.build | 1 +
> 3 files changed, 3 insertions(+)
>
> diff --git a/lib/librte_eal/arm/include/meson.build b/lib/librte_eal/arm/include/meson.build
> index 70b2382c0b..844fa324f3 100644
> --- a/lib/librte_eal/arm/include/meson.build
> +++ b/lib/librte_eal/arm/include/meson.build
> @@ -26,6 +26,7 @@ arch_headers = files(
> 'rte_prefetch.h',
> 'rte_rwlock.h',
> 'rte_spinlock.h',
> + 'rte_ticketlock.h',
> 'rte_vect.h',
> )
> install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
> diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/librte_eal/ppc/include/meson.build
> index e46ae899e6..dcd91e2f85 100644
> --- a/lib/librte_eal/ppc/include/meson.build
> +++ b/lib/librte_eal/ppc/include/meson.build
> @@ -14,6 +14,7 @@ arch_headers = files(
> 'rte_prefetch.h',
> 'rte_rwlock.h',
> 'rte_spinlock.h',
> + 'rte_ticketlock.h',
> 'rte_vect.h',
> )
> install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
Acked-by: David Christensen <drc@linux.vnet.ibm.com>
> -----Original Message-----
> From: Olivier Matz <olivier.matz@6wind.com>
> Sent: Thursday, November 5, 2020 1:04 AM
> To: dev@dpdk.org
> Cc: jerinj@marvell.com; Ruifeng Wang <Ruifeng.Wang@arm.com>; Jan
> Viktorin <viktorin@rehivetech.com>; David Christensen
> <drc@linux.vnet.ibm.com>; Bruce Richardson <bruce.richardson@intel.com>;
> Konstantin Ananyev <konstantin.ananyev@intel.com>; Honnappa
> Nagarahalli <Honnappa.Nagarahalli@arm.com>; Phil Yang
> <Phil.Yang@arm.com>; Gavin Hu <Gavin.Hu@arm.com>; Steve Capper
> <Steve.Capper@arm.com>; Joyce Kong <Joyce.Kong@arm.com>;
> stable@dpdk.org
> Subject: [PATCH 2/2] eal: fix missing installation of ticketlock headers
>
> Add missing arch-specific headers in meson.build.
>
> Fixes: ca49b92079df ("ticketlock: enable generic ticketlock on all arch")
> Cc: stable@dpdk.org
>
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---
> lib/librte_eal/arm/include/meson.build | 1 +
> lib/librte_eal/ppc/include/meson.build | 1 +
> lib/librte_eal/x86/include/meson.build | 1 +
> 3 files changed, 3 insertions(+)
>
> diff --git a/lib/librte_eal/arm/include/meson.build
> b/lib/librte_eal/arm/include/meson.build
> index 70b2382c0b..844fa324f3 100644
> --- a/lib/librte_eal/arm/include/meson.build
> +++ b/lib/librte_eal/arm/include/meson.build
> @@ -26,6 +26,7 @@ arch_headers = files(
> 'rte_prefetch.h',
> 'rte_rwlock.h',
> 'rte_spinlock.h',
> + 'rte_ticketlock.h',
> 'rte_vect.h',
> )
> install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
> diff --git a/lib/librte_eal/ppc/include/meson.build
> b/lib/librte_eal/ppc/include/meson.build
> index e46ae899e6..dcd91e2f85 100644
> --- a/lib/librte_eal/ppc/include/meson.build
> +++ b/lib/librte_eal/ppc/include/meson.build
> @@ -14,6 +14,7 @@ arch_headers = files(
> 'rte_prefetch.h',
> 'rte_rwlock.h',
> 'rte_spinlock.h',
> + 'rte_ticketlock.h',
> 'rte_vect.h',
> )
> install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
> diff --git a/lib/librte_eal/x86/include/meson.build
> b/lib/librte_eal/x86/include/meson.build
> index 9be5b318de..b25b176bcc 100644
> --- a/lib/librte_eal/x86/include/meson.build
> +++ b/lib/librte_eal/x86/include/meson.build
> @@ -18,6 +18,7 @@ arch_headers = files(
> 'rte_rtm.h',
> 'rte_rwlock.h',
> 'rte_spinlock.h',
> + 'rte_ticketlock.h',
> 'rte_vect.h',
> )
> install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
> --
> 2.25.1
Acked-by: Ruifeng Wang <ruifeng.wang@arm.com>
> -----Original Message-----
> From: Olivier Matz <olivier.matz@6wind.com>
> Sent: Thursday, November 5, 2020 1:04 AM
> To: dev@dpdk.org
> Cc: jerinj@marvell.com; Ruifeng Wang <Ruifeng.Wang@arm.com>; Jan
> Viktorin <viktorin@rehivetech.com>; David Christensen
> <drc@linux.vnet.ibm.com>; Bruce Richardson <bruce.richardson@intel.com>;
> Konstantin Ananyev <konstantin.ananyev@intel.com>; Honnappa
> Nagarahalli <Honnappa.Nagarahalli@arm.com>; Phil Yang
> <Phil.Yang@arm.com>; Gavin Hu <Gavin.Hu@arm.com>; Steve Capper
> <Steve.Capper@arm.com>; Joyce Kong <Joyce.Kong@arm.com>;
> stable@dpdk.org
> Subject: [PATCH 1/2] eal: fix missing installation of mcslock headers
>
> Add missing arch-specific headers in meson.build.
>
> Fixes: 2173f3333b61 ("mcslock: add MCS queued lock implementation")
> Cc: stable@dpdk.org
>
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---
> lib/librte_eal/arm/include/meson.build | 1 +
> lib/librte_eal/ppc/include/meson.build | 1 +
> lib/librte_eal/x86/include/meson.build | 1 +
> 3 files changed, 3 insertions(+)
>
> diff --git a/lib/librte_eal/arm/include/meson.build
> b/lib/librte_eal/arm/include/meson.build
> index 73b750a18f..70b2382c0b 100644
> --- a/lib/librte_eal/arm/include/meson.build
> +++ b/lib/librte_eal/arm/include/meson.build
> @@ -14,6 +14,7 @@ arch_headers = files(
> 'rte_cycles.h',
> 'rte_io_64.h',
> 'rte_io.h',
> + 'rte_mcslock.h',
> 'rte_memcpy_32.h',
> 'rte_memcpy_64.h',
> 'rte_memcpy.h',
> diff --git a/lib/librte_eal/ppc/include/meson.build
> b/lib/librte_eal/ppc/include/meson.build
> index ab4bd28092..e46ae899e6 100644
> --- a/lib/librte_eal/ppc/include/meson.build
> +++ b/lib/librte_eal/ppc/include/meson.build
> @@ -8,6 +8,7 @@ arch_headers = files(
> 'rte_cpuflags.h',
> 'rte_cycles.h',
> 'rte_io.h',
> + 'rte_mcslock.h',
> 'rte_memcpy.h',
> 'rte_pause.h',
> 'rte_prefetch.h',
> diff --git a/lib/librte_eal/x86/include/meson.build
> b/lib/librte_eal/x86/include/meson.build
> index f0e998c2fe..9be5b318de 100644
> --- a/lib/librte_eal/x86/include/meson.build
> +++ b/lib/librte_eal/x86/include/meson.build
> @@ -11,6 +11,7 @@ arch_headers = files(
> 'rte_cpuflags.h',
> 'rte_cycles.h',
> 'rte_io.h',
> + 'rte_mcslock.h',
> 'rte_memcpy.h',
> 'rte_prefetch.h',
> 'rte_pause.h',
> --
> 2.25.1
Acked-by: Ruifeng Wang <ruifeng.wang@arm.com>
On Wed, Nov 4, 2020 at 6:28 PM David Marchand <david.marchand@redhat.com> wrote:
> On Wed, Nov 4, 2020 at 6:04 PM Olivier Matz <olivier.matz@6wind.com> wrote:
> >
> > Add missing arch-specific headers in meson.build.
> >
> > Fixes: ca49b92079df ("ticketlock: enable generic ticketlock on all arch")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> Acked-by: David Marchand <david.marchand@redhat.com>
Acked-by: David Christensen <drc@linux.vnet.ibm.com>
Acked-by: Ruifeng Wang <ruifeng.wang@arm.com>
Applied, thanks Olivier.
--
David Marchand