d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eal: remove unused arch-specific headers for locks

Browse Source 
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>
Acked-by: Stanislaw Kardach <kda@semihalf.com>
This commit is contained in:
David Marchand 2022-06-08 13:57:01 +02:00 committed by Thomas Monjalon
parent 6799275eee
commit e5e613f05b
21 changed files with 13 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -255,7 +255,7 @@ F: app/test/test_bitmap.c
MCSlock MCSlock
M: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com> 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 F: app/test/test_mcslock.c
Sequence Lock Sequence Lock
@ -266,7 +266,7 @@ F: app/test/test_seqlock.c
Ticketlock Ticketlock
M: Joyce Kong <joyce.kong@arm.com> 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 F: app/test/test_ticketlock.c
Pseudo-random Number Generation Pseudo-random Number Generation

3
lib/eal/arm/include/meson.build
View File

@ -14,21 +14,18 @@ arch_headers = files(
'rte_cycles.h', 'rte_cycles.h',
'rte_io_64.h', 'rte_io_64.h',
'rte_io.h', 'rte_io.h',
'rte_mcslock.h',
'rte_memcpy_32.h', 'rte_memcpy_32.h',
'rte_memcpy_64.h', 'rte_memcpy_64.h',
'rte_memcpy.h', 'rte_memcpy.h',
'rte_pause_32.h', 'rte_pause_32.h',
'rte_pause_64.h', 'rte_pause_64.h',
'rte_pause.h', 'rte_pause.h',
'rte_pflock.h',
'rte_power_intrinsics.h', 'rte_power_intrinsics.h',
'rte_prefetch_32.h', 'rte_prefetch_32.h',
'rte_prefetch_64.h', 'rte_prefetch_64.h',
'rte_prefetch.h', 'rte_prefetch.h',
'rte_rwlock.h', 'rte_rwlock.h',
'rte_spinlock.h', 'rte_spinlock.h',
'rte_ticketlock.h',
'rte_vect.h', 'rte_vect.h',
) )
install_headers(arch_headers, subdir: get_option('include_subdir_arch')) install_headers(arch_headers, subdir: get_option('include_subdir_arch'))

22
lib/eal/arm/include/rte_mcslock.h
View File

@ -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_ */

18
lib/eal/arm/include/rte_pflock.h
View File

@ -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_ */

22
lib/eal/arm/include/rte_ticketlock.h
View File

@ -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_ */

6
lib/eal/include/meson.build
View File

@ -29,11 +29,13 @@ headers += files(
'rte_lcore.h', 'rte_lcore.h',
'rte_log.h', 'rte_log.h',
'rte_malloc.h', 'rte_malloc.h',
'rte_mcslock.h',
'rte_memory.h', 'rte_memory.h',
'rte_memzone.h', 'rte_memzone.h',
'rte_pci_dev_feature_defs.h', 'rte_pci_dev_feature_defs.h',
'rte_pci_dev_features.h', 'rte_pci_dev_features.h',
'rte_per_lcore.h', 'rte_per_lcore.h',
'rte_pflock.h',
'rte_random.h', 'rte_random.h',
'rte_reciprocal.h', 'rte_reciprocal.h',
'rte_seqcount.h', 'rte_seqcount.h',
@ -43,6 +45,7 @@ headers += files(
'rte_string_fns.h', 'rte_string_fns.h',
'rte_tailq.h', 'rte_tailq.h',
'rte_thread.h', 'rte_thread.h',
'rte_ticketlock.h',
'rte_time.h', 'rte_time.h',
'rte_trace.h', 'rte_trace.h',
'rte_trace_point.h', 'rte_trace_point.h',
@ -59,15 +62,12 @@ generic_headers = files(
'generic/rte_cpuflags.h', 'generic/rte_cpuflags.h',
'generic/rte_cycles.h', 'generic/rte_cycles.h',
'generic/rte_io.h', 'generic/rte_io.h',
'generic/rte_mcslock.h',
'generic/rte_memcpy.h', 'generic/rte_memcpy.h',
'generic/rte_pause.h', 'generic/rte_pause.h',
'generic/rte_pflock.h',
'generic/rte_power_intrinsics.h', 'generic/rte_power_intrinsics.h',
'generic/rte_prefetch.h', 'generic/rte_prefetch.h',
'generic/rte_rwlock.h', 'generic/rte_rwlock.h',
'generic/rte_spinlock.h', 'generic/rte_spinlock.h',
'generic/rte_ticketlock.h',
'generic/rte_vect.h', 'generic/rte_vect.h',
) )
install_headers(generic_headers, subdir: 'generic') install_headers(generic_headers, subdir: 'generic')

8
lib/eal/include/generic/rte_mcslock.h → lib/eal/include/rte_mcslock.h
View File

@ -19,6 +19,10 @@
* they acquired the lock. * they acquired the lock.
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#include <rte_lcore.h> #include <rte_lcore.h>
#include <rte_common.h> #include <rte_common.h>
#include <rte_pause.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); return (__atomic_load_n(&msl, __ATOMIC_RELAXED) != NULL);
} }
#ifdef __cplusplus
}
#endif
#endif /* _RTE_MCSLOCK_H_ */ #endif /* _RTE_MCSLOCK_H_ */

0
lib/eal/include/generic/rte_pflock.h → lib/eal/include/rte_pflock.h
View File

0
lib/eal/include/generic/rte_ticketlock.h → lib/eal/include/rte_ticketlock.h
View File

3
lib/eal/ppc/include/meson.build
View File

@ -8,15 +8,12 @@ arch_headers = files(
'rte_cpuflags.h', 'rte_cpuflags.h',
'rte_cycles.h', 'rte_cycles.h',
'rte_io.h', 'rte_io.h',
'rte_mcslock.h',
'rte_memcpy.h', 'rte_memcpy.h',
'rte_pause.h', 'rte_pause.h',
'rte_pflock.h',
'rte_power_intrinsics.h', 'rte_power_intrinsics.h',
'rte_prefetch.h', 'rte_prefetch.h',
'rte_rwlock.h', 'rte_rwlock.h',
'rte_spinlock.h', 'rte_spinlock.h',
'rte_ticketlock.h',
'rte_vect.h', 'rte_vect.h',
) )
install_headers(arch_headers, subdir: get_option('include_subdir_arch')) install_headers(arch_headers, subdir: get_option('include_subdir_arch'))

18
lib/eal/ppc/include/rte_mcslock.h
View File

@ -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_ */

17
lib/eal/ppc/include/rte_pflock.h
View File

@ -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_ */

18
lib/eal/ppc/include/rte_ticketlock.h
View File

@ -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_ */

3
lib/eal/riscv/include/meson.build
View File

@ -9,15 +9,12 @@ arch_headers = files(
'rte_cpuflags.h', 'rte_cpuflags.h',
'rte_cycles.h', 'rte_cycles.h',
'rte_io.h', 'rte_io.h',
'rte_mcslock.h',
'rte_memcpy.h', 'rte_memcpy.h',
'rte_pause.h', 'rte_pause.h',
'rte_pflock.h',
'rte_power_intrinsics.h', 'rte_power_intrinsics.h',
'rte_prefetch.h', 'rte_prefetch.h',
'rte_rwlock.h', 'rte_rwlock.h',
'rte_spinlock.h', 'rte_spinlock.h',
'rte_ticketlock.h',
'rte_vect.h', 'rte_vect.h',
) )
install_headers(arch_headers, subdir: get_option('include_subdir_arch')) install_headers(arch_headers, subdir: get_option('include_subdir_arch'))

18
lib/eal/riscv/include/rte_mcslock.h
View File

@ -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 */

17
lib/eal/riscv/include/rte_pflock.h
View File

@ -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 */

21
lib/eal/riscv/include/rte_ticketlock.h
View File

@ -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 */

3
lib/eal/x86/include/meson.build
View File

@ -7,16 +7,13 @@ arch_headers = files(
'rte_cpuflags.h', 'rte_cpuflags.h',
'rte_cycles.h', 'rte_cycles.h',
'rte_io.h', 'rte_io.h',
'rte_mcslock.h',
'rte_memcpy.h', 'rte_memcpy.h',
'rte_pause.h', 'rte_pause.h',
'rte_pflock.h',
'rte_power_intrinsics.h', 'rte_power_intrinsics.h',
'rte_prefetch.h', 'rte_prefetch.h',
'rte_rtm.h', 'rte_rtm.h',
'rte_rwlock.h', 'rte_rwlock.h',
'rte_spinlock.h', 'rte_spinlock.h',
'rte_ticketlock.h',
'rte_vect.h', 'rte_vect.h',
) )
arch_indirect_headers = files( arch_indirect_headers = files(

18
lib/eal/x86/include/rte_mcslock.h
View File

@ -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_ */

18
lib/eal/x86/include/rte_pflock.h
View File

@ -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_ */

18
lib/eal/x86/include/rte_ticketlock.h
View File

@ -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_ */