* [PATCH] eal: remove unused arch specific headers for locks
@ 2022-06-07 19:03 David Marchand
2022-06-07 20:34 ` Stephen Hemminger
2022-06-08 11:57 ` [PATCH v2] " David Marchand
0 siblings, 2 replies; 5+ messages in thread
From: David Marchand @ 2022-06-07 19:03 UTC (permalink / raw)
To: dev
Cc: Thomas Monjalon, Ruifeng Wang, Jan Viktorin,
Honnappa Nagarahalli, Joyce Kong, David Christensen,
Bruce Richardson, Konstantin Ananyev
MCS lock, PF lock and Ticket lock have no arch specific implementation,
there is no need for the extra redirection in headers.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
Note: this was mentionned during the seqlock patch review, and I spotted
it again, while reviewing the RISC-V port, and I see the same for a next
architecture too. So better clean this up as we don't need the
redirection.
---
MAINTAINERS | 4 ++--
lib/eal/arm/include/meson.build | 3 ---
lib/eal/arm/include/rte_mcslock.h | 22 -------------------
lib/eal/arm/include/rte_pflock.h | 18 ---------------
lib/eal/arm/include/rte_ticketlock.h | 22 -------------------
lib/eal/include/meson.build | 6 ++---
lib/eal/include/{generic => }/rte_mcslock.h | 8 +++++++
lib/eal/include/{generic => }/rte_pflock.h | 0
.../include/{generic => }/rte_ticketlock.h | 0
lib/eal/ppc/include/meson.build | 3 ---
lib/eal/ppc/include/rte_mcslock.h | 18 ---------------
lib/eal/ppc/include/rte_pflock.h | 17 --------------
lib/eal/ppc/include/rte_ticketlock.h | 18 ---------------
lib/eal/x86/include/meson.build | 3 ---
lib/eal/x86/include/rte_mcslock.h | 18 ---------------
lib/eal/x86/include/rte_pflock.h | 18 ---------------
lib/eal/x86/include/rte_ticketlock.h | 18 ---------------
17 files changed, 13 insertions(+), 183 deletions(-)
delete mode 100644 lib/eal/arm/include/rte_mcslock.h
delete mode 100644 lib/eal/arm/include/rte_pflock.h
delete mode 100644 lib/eal/arm/include/rte_ticketlock.h
rename lib/eal/include/{generic => }/rte_mcslock.h (98%)
rename lib/eal/include/{generic => }/rte_pflock.h (100%)
rename lib/eal/include/{generic => }/rte_ticketlock.h (100%)
delete mode 100644 lib/eal/ppc/include/rte_mcslock.h
delete mode 100644 lib/eal/ppc/include/rte_pflock.h
delete mode 100644 lib/eal/ppc/include/rte_ticketlock.h
delete mode 100644 lib/eal/x86/include/rte_mcslock.h
delete mode 100644 lib/eal/x86/include/rte_pflock.h
delete mode 100644 lib/eal/x86/include/rte_ticketlock.h
diff --git a/MAINTAINERS b/MAINTAINERS
index a1075613c0..c5944df3dc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -255,7 +255,7 @@ F: app/test/test_bitmap.c
MCSlock
M: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
-F: lib/eal/include/generic/rte_mcslock.h
+F: lib/eal/include/rte_mcslock.h
F: app/test/test_mcslock.c
Sequence Lock
@@ -266,7 +266,7 @@ F: app/test/test_seqlock.c
Ticketlock
M: Joyce Kong <joyce.kong@arm.com>
-F: lib/eal/include/generic/rte_ticketlock.h
+F: lib/eal/include/rte_ticketlock.h
F: app/test/test_ticketlock.c
Pseudo-random Number Generation
diff --git a/lib/eal/arm/include/meson.build b/lib/eal/arm/include/meson.build
index 65c3aec35c..657bf58569 100644
--- a/lib/eal/arm/include/meson.build
+++ b/lib/eal/arm/include/meson.build
@@ -14,21 +14,18 @@ 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',
'rte_pause_32.h',
'rte_pause_64.h',
'rte_pause.h',
- 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch_32.h',
'rte_prefetch_64.h',
'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/eal/arm/include/rte_mcslock.h b/lib/eal/arm/include/rte_mcslock.h
deleted file mode 100644
index 896d678073..0000000000
--- a/lib/eal/arm/include/rte_mcslock.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_MCSLOCK_ARM_H_
-#define _RTE_MCSLOCK_ARM_H_
-
-#ifndef RTE_FORCE_INTRINSICS
-# error Platform must be built with RTE_FORCE_INTRINSICS
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_mcslock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_MCSLOCK_ARM_H_ */
diff --git a/lib/eal/arm/include/rte_pflock.h b/lib/eal/arm/include/rte_pflock.h
deleted file mode 100644
index bb9934eec4..0000000000
--- a/lib/eal/arm/include/rte_pflock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2021 Microsoft Corporation
- */
-
-#ifndef _RTE_PFLOCK_ARM_H_
-#define _RTE_PFLOCK_ARM_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_pflock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_PFLOCK_ARM_H_ */
diff --git a/lib/eal/arm/include/rte_ticketlock.h b/lib/eal/arm/include/rte_ticketlock.h
deleted file mode 100644
index e66beefbe2..0000000000
--- a/lib/eal/arm/include/rte_ticketlock.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_TICKETLOCK_ARM_H_
-#define _RTE_TICKETLOCK_ARM_H_
-
-#ifndef RTE_FORCE_INTRINSICS
-# error Platform must be built with RTE_FORCE_INTRINSICS
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_ticketlock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_TICKETLOCK_ARM_H_ */
diff --git a/lib/eal/include/meson.build b/lib/eal/include/meson.build
index 40ebb5b63d..fd6e844224 100644
--- a/lib/eal/include/meson.build
+++ b/lib/eal/include/meson.build
@@ -29,11 +29,13 @@ headers += files(
'rte_lcore.h',
'rte_log.h',
'rte_malloc.h',
+ 'rte_mcslock.h',
'rte_memory.h',
'rte_memzone.h',
'rte_pci_dev_feature_defs.h',
'rte_pci_dev_features.h',
'rte_per_lcore.h',
+ 'rte_pflock.h',
'rte_random.h',
'rte_reciprocal.h',
'rte_seqcount.h',
@@ -43,6 +45,7 @@ headers += files(
'rte_string_fns.h',
'rte_tailq.h',
'rte_thread.h',
+ 'rte_ticketlock.h',
'rte_time.h',
'rte_trace.h',
'rte_trace_point.h',
@@ -59,15 +62,12 @@ generic_headers = files(
'generic/rte_cpuflags.h',
'generic/rte_cycles.h',
'generic/rte_io.h',
- 'generic/rte_mcslock.h',
'generic/rte_memcpy.h',
'generic/rte_pause.h',
- 'generic/rte_pflock.h',
'generic/rte_power_intrinsics.h',
'generic/rte_prefetch.h',
'generic/rte_rwlock.h',
'generic/rte_spinlock.h',
- 'generic/rte_ticketlock.h',
'generic/rte_vect.h',
)
install_headers(generic_headers, subdir: 'generic')
diff --git a/lib/eal/include/generic/rte_mcslock.h b/lib/eal/include/rte_mcslock.h
similarity index 98%
rename from lib/eal/include/generic/rte_mcslock.h
rename to lib/eal/include/rte_mcslock.h
index f15b785358..a805cb2906 100644
--- a/lib/eal/include/generic/rte_mcslock.h
+++ b/lib/eal/include/rte_mcslock.h
@@ -19,6 +19,10 @@
* they acquired the lock.
*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <rte_lcore.h>
#include <rte_common.h>
#include <rte_pause.h>
@@ -169,4 +173,8 @@ rte_mcslock_is_locked(rte_mcslock_t *msl)
return (__atomic_load_n(&msl, __ATOMIC_RELAXED) != NULL);
}
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _RTE_MCSLOCK_H_ */
diff --git a/lib/eal/include/generic/rte_pflock.h b/lib/eal/include/rte_pflock.h
similarity index 100%
rename from lib/eal/include/generic/rte_pflock.h
rename to lib/eal/include/rte_pflock.h
diff --git a/lib/eal/include/generic/rte_ticketlock.h b/lib/eal/include/rte_ticketlock.h
similarity index 100%
rename from lib/eal/include/generic/rte_ticketlock.h
rename to lib/eal/include/rte_ticketlock.h
diff --git a/lib/eal/ppc/include/meson.build b/lib/eal/ppc/include/meson.build
index 1e1f39c05a..fa64330f01 100644
--- a/lib/eal/ppc/include/meson.build
+++ b/lib/eal/ppc/include/meson.build
@@ -8,15 +8,12 @@ arch_headers = files(
'rte_cpuflags.h',
'rte_cycles.h',
'rte_io.h',
- 'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
- 'rte_pflock.h',
'rte_power_intrinsics.h',
'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/eal/ppc/include/rte_mcslock.h b/lib/eal/ppc/include/rte_mcslock.h
deleted file mode 100644
index c58a6edc1c..0000000000
--- a/lib/eal/ppc/include/rte_mcslock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_MCSLOCK_PPC_64_H_
-#define _RTE_MCSLOCK_PPC_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_mcslock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_MCSLOCK_PPC_64_H_ */
diff --git a/lib/eal/ppc/include/rte_pflock.h b/lib/eal/ppc/include/rte_pflock.h
deleted file mode 100644
index 27c201b11d..0000000000
--- a/lib/eal/ppc/include/rte_pflock.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2021 Microsoft Corporation
- */
-#ifndef _RTE_PFLOCK_PPC_64_H_
-#define _RTE_PFLOCK_PPC_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_pflock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_PFLOCK_PPC_64_H_ */
diff --git a/lib/eal/ppc/include/rte_ticketlock.h b/lib/eal/ppc/include/rte_ticketlock.h
deleted file mode 100644
index c175e9eab2..0000000000
--- a/lib/eal/ppc/include/rte_ticketlock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_TICKETLOCK_PPC_64_H_
-#define _RTE_TICKETLOCK_PPC_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_ticketlock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_TICKETLOCK_PPC_64_H_ */
diff --git a/lib/eal/x86/include/meson.build b/lib/eal/x86/include/meson.build
index 12c2e00035..52d2f8e969 100644
--- a/lib/eal/x86/include/meson.build
+++ b/lib/eal/x86/include/meson.build
@@ -7,16 +7,13 @@ arch_headers = files(
'rte_cpuflags.h',
'rte_cycles.h',
'rte_io.h',
- 'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
- 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch.h',
'rte_rtm.h',
'rte_rwlock.h',
'rte_spinlock.h',
- 'rte_ticketlock.h',
'rte_vect.h',
)
arch_indirect_headers = files(
diff --git a/lib/eal/x86/include/rte_mcslock.h b/lib/eal/x86/include/rte_mcslock.h
deleted file mode 100644
index a8f041a720..0000000000
--- a/lib/eal/x86/include/rte_mcslock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_MCSLOCK_X86_64_H_
-#define _RTE_MCSLOCK_X86_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_mcslock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_MCSLOCK_X86_64_H_ */
diff --git a/lib/eal/x86/include/rte_pflock.h b/lib/eal/x86/include/rte_pflock.h
deleted file mode 100644
index c2d876062c..0000000000
--- a/lib/eal/x86/include/rte_pflock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2021 Microsoft Corporation
- */
-
-#ifndef _RTE_PFLOCK_X86_64_H_
-#define _RTE_PFLOCK_X86_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_pflock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_PFLOCK_X86_64_H_ */
diff --git a/lib/eal/x86/include/rte_ticketlock.h b/lib/eal/x86/include/rte_ticketlock.h
deleted file mode 100644
index 0cc01f6b92..0000000000
--- a/lib/eal/x86/include/rte_ticketlock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_TICKETLOCK_X86_64_H_
-#define _RTE_TICKETLOCK_X86_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_ticketlock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_TICKETLOCK_X86_64_H_ */
--
2.36.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] eal: remove unused arch specific headers for locks
2022-06-07 19:03 [PATCH] eal: remove unused arch specific headers for locks David Marchand
@ 2022-06-07 20:34 ` Stephen Hemminger
2022-06-08 11:57 ` [PATCH v2] " David Marchand
1 sibling, 0 replies; 5+ messages in thread
From: Stephen Hemminger @ 2022-06-07 20:34 UTC (permalink / raw)
To: David Marchand
Cc: dev, Thomas Monjalon, Ruifeng Wang, Jan Viktorin,
Honnappa Nagarahalli, Joyce Kong, David Christensen,
Bruce Richardson, Konstantin Ananyev
On Tue, 7 Jun 2022 21:03:08 +0200
David Marchand <david.marchand@redhat.com> wrote:
> MCS lock, PF lock and Ticket lock have no arch specific implementation,
> there is no need for the extra redirection in headers.
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> Note: this was mentionned during the seqlock patch review, and I spotted
> it again, while reviewing the RISC-V port, and I see the same for a next
> architecture too. So better clean this up as we don't need the
> redirection.
>
> ---
> MAINTAINERS | 4 ++--
> lib/eal/arm/include/meson.build | 3 ---
> lib/eal/arm/include/rte_mcslock.h | 22 -------------------
> lib/eal/arm/include/rte_pflock.h | 18 ---------------
> lib/eal/arm/include/rte_ticketlock.h | 22 -------------------
> lib/eal/include/meson.build | 6 ++---
> lib/eal/include/{generic => }/rte_mcslock.h | 8 +++++++
> lib/eal/include/{generic => }/rte_pflock.h | 0
> .../include/{generic => }/rte_ticketlock.h | 0
> lib/eal/ppc/include/meson.build | 3 ---
> lib/eal/ppc/include/rte_mcslock.h | 18 ---------------
> lib/eal/ppc/include/rte_pflock.h | 17 --------------
> lib/eal/ppc/include/rte_ticketlock.h | 18 ---------------
> lib/eal/x86/include/meson.build | 3 ---
> lib/eal/x86/include/rte_mcslock.h | 18 ---------------
> lib/eal/x86/include/rte_pflock.h | 18 ---------------
> lib/eal/x86/include/rte_ticketlock.h | 18 ---------------
> 17 files changed, 13 insertions(+), 183 deletions(-)
> delete mode 100644 lib/eal/arm/include/rte_mcslock.h
> delete mode 100644 lib/eal/arm/include/rte_pflock.h
> delete mode 100644 lib/eal/arm/include/rte_ticketlock.h
> rename lib/eal/include/{generic => }/rte_mcslock.h (98%)
> rename lib/eal/include/{generic => }/rte_pflock.h (100%)
> rename lib/eal/include/{generic => }/rte_ticketlock.h (100%)
> delete mode 100644 lib/eal/ppc/include/rte_mcslock.h
> delete mode 100644 lib/eal/ppc/include/rte_pflock.h
> delete mode 100644 lib/eal/ppc/include/rte_ticketlock.h
> delete mode 100644 lib/eal/x86/include/rte_mcslock.h
> delete mode 100644 lib/eal/x86/include/rte_pflock.h
> delete mode 100644 lib/eal/x86/include/rte_ticketlock.h
>
Looks great will make future work easier.
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] eal: remove unused arch specific headers for locks
2022-06-07 19:03 [PATCH] eal: remove unused arch specific headers for locks David Marchand
2022-06-07 20:34 ` Stephen Hemminger
@ 2022-06-08 11:57 ` David Marchand
2022-06-08 13:16 ` Stanisław Kardach
1 sibling, 1 reply; 5+ messages in thread
From: David Marchand @ 2022-06-08 11:57 UTC (permalink / raw)
To: dev
Cc: Stephen Hemminger, Thomas Monjalon, Ruifeng Wang, Jan Viktorin,
Honnappa Nagarahalli, Joyce Kong, David Christensen,
Stanislaw Kardach, Bruce Richardson, Konstantin Ananyev
MCS lock, PF lock and Ticket lock have no arch specific implementation,
there is no need for the extra redirection in headers.
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
Note: this was mentionned during the seqlock patch review, and I spotted
it again, while reviewing the RISC-V port, and I see the same for a next
architecture too. So better clean this up as we don't need the
redirection.
Changes since v1:
- rebased following RISC-V merge,
---
MAINTAINERS | 4 ++--
lib/eal/arm/include/meson.build | 3 ---
lib/eal/arm/include/rte_mcslock.h | 22 -------------------
lib/eal/arm/include/rte_pflock.h | 18 ---------------
lib/eal/arm/include/rte_ticketlock.h | 22 -------------------
lib/eal/include/meson.build | 6 ++---
lib/eal/include/{generic => }/rte_mcslock.h | 8 +++++++
lib/eal/include/{generic => }/rte_pflock.h | 0
.../include/{generic => }/rte_ticketlock.h | 0
lib/eal/ppc/include/meson.build | 3 ---
lib/eal/ppc/include/rte_mcslock.h | 18 ---------------
lib/eal/ppc/include/rte_pflock.h | 17 --------------
lib/eal/ppc/include/rte_ticketlock.h | 18 ---------------
lib/eal/riscv/include/meson.build | 3 ---
lib/eal/riscv/include/rte_mcslock.h | 18 ---------------
lib/eal/riscv/include/rte_pflock.h | 17 --------------
lib/eal/riscv/include/rte_ticketlock.h | 21 ------------------
lib/eal/x86/include/meson.build | 3 ---
lib/eal/x86/include/rte_mcslock.h | 18 ---------------
lib/eal/x86/include/rte_pflock.h | 18 ---------------
lib/eal/x86/include/rte_ticketlock.h | 18 ---------------
21 files changed, 13 insertions(+), 242 deletions(-)
delete mode 100644 lib/eal/arm/include/rte_mcslock.h
delete mode 100644 lib/eal/arm/include/rte_pflock.h
delete mode 100644 lib/eal/arm/include/rte_ticketlock.h
rename lib/eal/include/{generic => }/rte_mcslock.h (98%)
rename lib/eal/include/{generic => }/rte_pflock.h (100%)
rename lib/eal/include/{generic => }/rte_ticketlock.h (100%)
delete mode 100644 lib/eal/ppc/include/rte_mcslock.h
delete mode 100644 lib/eal/ppc/include/rte_pflock.h
delete mode 100644 lib/eal/ppc/include/rte_ticketlock.h
delete mode 100644 lib/eal/riscv/include/rte_mcslock.h
delete mode 100644 lib/eal/riscv/include/rte_pflock.h
delete mode 100644 lib/eal/riscv/include/rte_ticketlock.h
delete mode 100644 lib/eal/x86/include/rte_mcslock.h
delete mode 100644 lib/eal/x86/include/rte_pflock.h
delete mode 100644 lib/eal/x86/include/rte_ticketlock.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 372f44523d..4e477401f8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -255,7 +255,7 @@ F: app/test/test_bitmap.c
MCSlock
M: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
-F: lib/eal/include/generic/rte_mcslock.h
+F: lib/eal/include/rte_mcslock.h
F: app/test/test_mcslock.c
Sequence Lock
@@ -266,7 +266,7 @@ F: app/test/test_seqlock.c
Ticketlock
M: Joyce Kong <joyce.kong@arm.com>
-F: lib/eal/include/generic/rte_ticketlock.h
+F: lib/eal/include/rte_ticketlock.h
F: app/test/test_ticketlock.c
Pseudo-random Number Generation
diff --git a/lib/eal/arm/include/meson.build b/lib/eal/arm/include/meson.build
index 65c3aec35c..657bf58569 100644
--- a/lib/eal/arm/include/meson.build
+++ b/lib/eal/arm/include/meson.build
@@ -14,21 +14,18 @@ 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',
'rte_pause_32.h',
'rte_pause_64.h',
'rte_pause.h',
- 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch_32.h',
'rte_prefetch_64.h',
'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/eal/arm/include/rte_mcslock.h b/lib/eal/arm/include/rte_mcslock.h
deleted file mode 100644
index 896d678073..0000000000
--- a/lib/eal/arm/include/rte_mcslock.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_MCSLOCK_ARM_H_
-#define _RTE_MCSLOCK_ARM_H_
-
-#ifndef RTE_FORCE_INTRINSICS
-# error Platform must be built with RTE_FORCE_INTRINSICS
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_mcslock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_MCSLOCK_ARM_H_ */
diff --git a/lib/eal/arm/include/rte_pflock.h b/lib/eal/arm/include/rte_pflock.h
deleted file mode 100644
index bb9934eec4..0000000000
--- a/lib/eal/arm/include/rte_pflock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2021 Microsoft Corporation
- */
-
-#ifndef _RTE_PFLOCK_ARM_H_
-#define _RTE_PFLOCK_ARM_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_pflock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_PFLOCK_ARM_H_ */
diff --git a/lib/eal/arm/include/rte_ticketlock.h b/lib/eal/arm/include/rte_ticketlock.h
deleted file mode 100644
index e66beefbe2..0000000000
--- a/lib/eal/arm/include/rte_ticketlock.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_TICKETLOCK_ARM_H_
-#define _RTE_TICKETLOCK_ARM_H_
-
-#ifndef RTE_FORCE_INTRINSICS
-# error Platform must be built with RTE_FORCE_INTRINSICS
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_ticketlock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_TICKETLOCK_ARM_H_ */
diff --git a/lib/eal/include/meson.build b/lib/eal/include/meson.build
index 40ebb5b63d..fd6e844224 100644
--- a/lib/eal/include/meson.build
+++ b/lib/eal/include/meson.build
@@ -29,11 +29,13 @@ headers += files(
'rte_lcore.h',
'rte_log.h',
'rte_malloc.h',
+ 'rte_mcslock.h',
'rte_memory.h',
'rte_memzone.h',
'rte_pci_dev_feature_defs.h',
'rte_pci_dev_features.h',
'rte_per_lcore.h',
+ 'rte_pflock.h',
'rte_random.h',
'rte_reciprocal.h',
'rte_seqcount.h',
@@ -43,6 +45,7 @@ headers += files(
'rte_string_fns.h',
'rte_tailq.h',
'rte_thread.h',
+ 'rte_ticketlock.h',
'rte_time.h',
'rte_trace.h',
'rte_trace_point.h',
@@ -59,15 +62,12 @@ generic_headers = files(
'generic/rte_cpuflags.h',
'generic/rte_cycles.h',
'generic/rte_io.h',
- 'generic/rte_mcslock.h',
'generic/rte_memcpy.h',
'generic/rte_pause.h',
- 'generic/rte_pflock.h',
'generic/rte_power_intrinsics.h',
'generic/rte_prefetch.h',
'generic/rte_rwlock.h',
'generic/rte_spinlock.h',
- 'generic/rte_ticketlock.h',
'generic/rte_vect.h',
)
install_headers(generic_headers, subdir: 'generic')
diff --git a/lib/eal/include/generic/rte_mcslock.h b/lib/eal/include/rte_mcslock.h
similarity index 98%
rename from lib/eal/include/generic/rte_mcslock.h
rename to lib/eal/include/rte_mcslock.h
index f15b785358..a805cb2906 100644
--- a/lib/eal/include/generic/rte_mcslock.h
+++ b/lib/eal/include/rte_mcslock.h
@@ -19,6 +19,10 @@
* they acquired the lock.
*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <rte_lcore.h>
#include <rte_common.h>
#include <rte_pause.h>
@@ -169,4 +173,8 @@ rte_mcslock_is_locked(rte_mcslock_t *msl)
return (__atomic_load_n(&msl, __ATOMIC_RELAXED) != NULL);
}
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _RTE_MCSLOCK_H_ */
diff --git a/lib/eal/include/generic/rte_pflock.h b/lib/eal/include/rte_pflock.h
similarity index 100%
rename from lib/eal/include/generic/rte_pflock.h
rename to lib/eal/include/rte_pflock.h
diff --git a/lib/eal/include/generic/rte_ticketlock.h b/lib/eal/include/rte_ticketlock.h
similarity index 100%
rename from lib/eal/include/generic/rte_ticketlock.h
rename to lib/eal/include/rte_ticketlock.h
diff --git a/lib/eal/ppc/include/meson.build b/lib/eal/ppc/include/meson.build
index 1e1f39c05a..fa64330f01 100644
--- a/lib/eal/ppc/include/meson.build
+++ b/lib/eal/ppc/include/meson.build
@@ -8,15 +8,12 @@ arch_headers = files(
'rte_cpuflags.h',
'rte_cycles.h',
'rte_io.h',
- 'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
- 'rte_pflock.h',
'rte_power_intrinsics.h',
'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/eal/ppc/include/rte_mcslock.h b/lib/eal/ppc/include/rte_mcslock.h
deleted file mode 100644
index c58a6edc1c..0000000000
--- a/lib/eal/ppc/include/rte_mcslock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_MCSLOCK_PPC_64_H_
-#define _RTE_MCSLOCK_PPC_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_mcslock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_MCSLOCK_PPC_64_H_ */
diff --git a/lib/eal/ppc/include/rte_pflock.h b/lib/eal/ppc/include/rte_pflock.h
deleted file mode 100644
index 27c201b11d..0000000000
--- a/lib/eal/ppc/include/rte_pflock.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2021 Microsoft Corporation
- */
-#ifndef _RTE_PFLOCK_PPC_64_H_
-#define _RTE_PFLOCK_PPC_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_pflock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_PFLOCK_PPC_64_H_ */
diff --git a/lib/eal/ppc/include/rte_ticketlock.h b/lib/eal/ppc/include/rte_ticketlock.h
deleted file mode 100644
index c175e9eab2..0000000000
--- a/lib/eal/ppc/include/rte_ticketlock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_TICKETLOCK_PPC_64_H_
-#define _RTE_TICKETLOCK_PPC_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_ticketlock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_TICKETLOCK_PPC_64_H_ */
diff --git a/lib/eal/riscv/include/meson.build b/lib/eal/riscv/include/meson.build
index 7f6e4a5b1e..481c7d50a4 100644
--- a/lib/eal/riscv/include/meson.build
+++ b/lib/eal/riscv/include/meson.build
@@ -9,15 +9,12 @@ arch_headers = files(
'rte_cpuflags.h',
'rte_cycles.h',
'rte_io.h',
- 'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
- 'rte_pflock.h',
'rte_power_intrinsics.h',
'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/eal/riscv/include/rte_mcslock.h b/lib/eal/riscv/include/rte_mcslock.h
deleted file mode 100644
index b517cd5fc5..0000000000
--- a/lib/eal/riscv/include/rte_mcslock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef RTE_MCSLOCK_RISCV_H
-#define RTE_MCSLOCK_RISCV_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_mcslock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* RTE_MCSLOCK_RISCV_H */
diff --git a/lib/eal/riscv/include/rte_pflock.h b/lib/eal/riscv/include/rte_pflock.h
deleted file mode 100644
index ce6ca02aca..0000000000
--- a/lib/eal/riscv/include/rte_pflock.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2021 Microsoft Corporation
- */
-#ifndef RTE_PFLOCK_RISCV_H
-#define RTE_PFLOCK_RISCV_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_pflock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* RTE_PFLOCK_RISCV_H */
diff --git a/lib/eal/riscv/include/rte_ticketlock.h b/lib/eal/riscv/include/rte_ticketlock.h
deleted file mode 100644
index b8d2a4f937..0000000000
--- a/lib/eal/riscv/include/rte_ticketlock.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- * Copyright(c) 2022 StarFive
- * Copyright(c) 2022 SiFive
- * Copyright(c) 2022 Semihalf
- */
-
-#ifndef RTE_TICKETLOCK_RISCV_H
-#define RTE_TICKETLOCK_RISCV_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_ticketlock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* RTE_TICKETLOCK_RISCV_H */
diff --git a/lib/eal/x86/include/meson.build b/lib/eal/x86/include/meson.build
index 12c2e00035..52d2f8e969 100644
--- a/lib/eal/x86/include/meson.build
+++ b/lib/eal/x86/include/meson.build
@@ -7,16 +7,13 @@ arch_headers = files(
'rte_cpuflags.h',
'rte_cycles.h',
'rte_io.h',
- 'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
- 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch.h',
'rte_rtm.h',
'rte_rwlock.h',
'rte_spinlock.h',
- 'rte_ticketlock.h',
'rte_vect.h',
)
arch_indirect_headers = files(
diff --git a/lib/eal/x86/include/rte_mcslock.h b/lib/eal/x86/include/rte_mcslock.h
deleted file mode 100644
index a8f041a720..0000000000
--- a/lib/eal/x86/include/rte_mcslock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_MCSLOCK_X86_64_H_
-#define _RTE_MCSLOCK_X86_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_mcslock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_MCSLOCK_X86_64_H_ */
diff --git a/lib/eal/x86/include/rte_pflock.h b/lib/eal/x86/include/rte_pflock.h
deleted file mode 100644
index c2d876062c..0000000000
--- a/lib/eal/x86/include/rte_pflock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2021 Microsoft Corporation
- */
-
-#ifndef _RTE_PFLOCK_X86_64_H_
-#define _RTE_PFLOCK_X86_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_pflock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_PFLOCK_X86_64_H_ */
diff --git a/lib/eal/x86/include/rte_ticketlock.h b/lib/eal/x86/include/rte_ticketlock.h
deleted file mode 100644
index 0cc01f6b92..0000000000
--- a/lib/eal/x86/include/rte_ticketlock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_TICKETLOCK_X86_64_H_
-#define _RTE_TICKETLOCK_X86_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_ticketlock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_TICKETLOCK_X86_64_H_ */
--
2.36.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] eal: remove unused arch specific headers for locks
2022-06-08 11:57 ` [PATCH v2] " David Marchand
@ 2022-06-08 13:16 ` Stanisław Kardach
2022-06-08 13:46 ` Thomas Monjalon
0 siblings, 1 reply; 5+ messages in thread
From: Stanisław Kardach @ 2022-06-08 13:16 UTC (permalink / raw)
To: David Marchand
Cc: dev, Stephen Hemminger, Thomas Monjalon, Ruifeng Wang,
Jan Viktorin, Honnappa Nagarahalli, Joyce Kong,
David Christensen, Bruce Richardson, Konstantin Ananyev
On Wed, Jun 8, 2022 at 1:57 PM David Marchand <david.marchand@redhat.com> wrote:
>
> MCS lock, PF lock and Ticket lock have no arch specific implementation,
> there is no need for the extra redirection in headers.
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
> Note: this was mentionned during the seqlock patch review, and I spotted
> it again, while reviewing the RISC-V port, and I see the same for a next
> architecture too. So better clean this up as we don't need the
> redirection.
>
> Changes since v1:
> - rebased following RISC-V merge,
>
Thanks, this works just fine for RISC-V.
Acked-by: Stanislaw Kardach <kda@semihalf.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] eal: remove unused arch specific headers for locks
2022-06-08 13:16 ` Stanisław Kardach
@ 2022-06-08 13:46 ` Thomas Monjalon
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Monjalon @ 2022-06-08 13:46 UTC (permalink / raw)
To: David Marchand
Cc: dev, Stephen Hemminger, Ruifeng Wang, Jan Viktorin,
Honnappa Nagarahalli, Joyce Kong, David Christensen,
Bruce Richardson, Konstantin Ananyev, Stanisław Kardach
08/06/2022 15:16, Stanisław Kardach:
> On Wed, Jun 8, 2022 at 1:57 PM David Marchand <david.marchand@redhat.com> wrote:
> >
> > MCS lock, PF lock and Ticket lock have no arch specific implementation,
> > there is no need for the extra redirection in headers.
> >
> > Signed-off-by: David Marchand <david.marchand@redhat.com>
> > Acked-by: Stephen Hemminger <stephen@networkplumber.org>
> > ---
> > Note: this was mentionned during the seqlock patch review, and I spotted
> > it again, while reviewing the RISC-V port, and I see the same for a next
> > architecture too. So better clean this up as we don't need the
> > redirection.
> >
> > Changes since v1:
> > - rebased following RISC-V merge,
> >
> Thanks, this works just fine for RISC-V.
>
> Acked-by: Stanislaw Kardach <kda@semihalf.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-06-08 13:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-07 19:03 [PATCH] eal: remove unused arch specific headers for locks David Marchand
2022-06-07 20:34 ` Stephen Hemminger
2022-06-08 11:57 ` [PATCH v2] " David Marchand
2022-06-08 13:16 ` Stanisław Kardach
2022-06-08 13:46 ` Thomas Monjalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).