Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

vdso: Rename struct arch_vdso_data to arch_vdso_time_data

Browse Source 
The struct arch_vdso_data is only about vdso time data. So rename it to
arch_vdso_time_data to make it obvious.
Non time-related data will be migrated out of these structs soon.

Signed-off-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Heiko Carstens <hca@linux.ibm.com> # s390
Link: https://lore.kernel.org/all/20241010-vdso-generic-base-v1-28-b64f0842d512@linutronix.de
This commit is contained in:
Nam Cao 2024-10-10 09:01:30 +02:00 committed by Thomas Gleixner
parent 6142be7ed7
commit a812eee0b6
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/Kconfig
View File

@ -1530,7 +1530,7 @@ config HAVE_SPARSE_SYSCALL_NR
entries at 4000, 5000 and 6000 locations. This option turns on syscall entries at 4000, 5000 and 6000 locations. This option turns on syscall
related optimizations for a given architecture. related optimizations for a given architecture.
config ARCH_HAS_VDSO_DATA config ARCH_HAS_VDSO_TIME_DATA
bool bool
config HAVE_STATIC_CALL config HAVE_STATIC_CALL

2
arch/riscv/Kconfig
View File

@ -50,7 +50,7 @@ config RISCV
select ARCH_HAS_SYSCALL_WRAPPER select ARCH_HAS_SYSCALL_WRAPPER
select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
select ARCH_HAS_UBSAN select ARCH_HAS_UBSAN
select ARCH_HAS_VDSO_DATA select ARCH_HAS_VDSO_TIME_DATA
select ARCH_KEEP_MEMBLOCK if ACPI select ARCH_KEEP_MEMBLOCK if ACPI
select ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE if 64BIT && MMU select ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE if 64BIT && MMU
select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX

8
arch/riscv/include/asm/vdso/data.h → arch/riscv/include/asm/vdso/time_data.h
View File

@ -1,12 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#ifndef __RISCV_ASM_VDSO_DATA_H #ifndef __RISCV_ASM_VDSO_TIME_DATA_H
#define __RISCV_ASM_VDSO_DATA_H #define __RISCV_ASM_VDSO_TIME_DATA_H
#include <linux/types.h> #include <linux/types.h>
#include <vdso/datapage.h> #include <vdso/datapage.h>
#include <asm/hwprobe.h> #include <asm/hwprobe.h>
struct arch_vdso_data { struct arch_vdso_time_data {
/* Stash static answers to the hwprobe queries when all CPUs are selected. */ /* Stash static answers to the hwprobe queries when all CPUs are selected. */
__u64 all_cpu_hwprobe_values[RISCV_HWPROBE_MAX_KEY + 1]; __u64 all_cpu_hwprobe_values[RISCV_HWPROBE_MAX_KEY + 1];
@ -14,4 +14,4 @@ struct arch_vdso_data {
__u8 homogeneous_cpus; __u8 homogeneous_cpus;
}; };
#endif /* __RISCV_ASM_VDSO_DATA_H */ #endif /* __RISCV_ASM_VDSO_TIME_DATA_H */

2
arch/riscv/kernel/sys_hwprobe.c
View File

@ -402,7 +402,7 @@ static int do_riscv_hwprobe(struct riscv_hwprobe __user *pairs,
static int __init init_hwprobe_vdso_data(void) static int __init init_hwprobe_vdso_data(void)
{ {
struct vdso_data *vd = __arch_get_k_vdso_data(); struct vdso_data *vd = __arch_get_k_vdso_data();
struct arch_vdso_data *avd = &vd->arch_data; struct arch_vdso_time_data *avd = &vd->arch_data;
u64 id_bitsmash = 0; u64 id_bitsmash = 0;
struct riscv_hwprobe pair; struct riscv_hwprobe pair;
int key; int key;

4
arch/riscv/kernel/vdso/hwprobe.c
View File

@ -17,7 +17,7 @@ static int riscv_vdso_get_values(struct riscv_hwprobe *pairs, size_t pair_count,
unsigned int flags) unsigned int flags)
{ {
const struct vdso_data *vd = __arch_get_vdso_data(); const struct vdso_data *vd = __arch_get_vdso_data();
const struct arch_vdso_data *avd = &vd->arch_data; const struct arch_vdso_time_data *avd = &vd->arch_data;
bool all_cpus = !cpusetsize && !cpus; bool all_cpus = !cpusetsize && !cpus;
struct riscv_hwprobe *p = pairs; struct riscv_hwprobe *p = pairs;
struct riscv_hwprobe *end = pairs + pair_count; struct riscv_hwprobe *end = pairs + pair_count;
@ -52,7 +52,7 @@ static int riscv_vdso_get_cpus(struct riscv_hwprobe *pairs, size_t pair_count,
unsigned int flags) unsigned int flags)
{ {
const struct vdso_data *vd = __arch_get_vdso_data(); const struct vdso_data *vd = __arch_get_vdso_data();
const struct arch_vdso_data *avd = &vd->arch_data; const struct arch_vdso_time_data *avd = &vd->arch_data;
struct riscv_hwprobe *p = pairs; struct riscv_hwprobe *p = pairs;
struct riscv_hwprobe *end = pairs + pair_count; struct riscv_hwprobe *end = pairs + pair_count;
unsigned char *c = (unsigned char *)cpus; unsigned char *c = (unsigned char *)cpus;

2
arch/s390/Kconfig
View File

@ -88,7 +88,7 @@ config S390
select ARCH_HAS_STRICT_MODULE_RWX select ARCH_HAS_STRICT_MODULE_RWX
select ARCH_HAS_SYSCALL_WRAPPER select ARCH_HAS_SYSCALL_WRAPPER
select ARCH_HAS_UBSAN select ARCH_HAS_UBSAN
select ARCH_HAS_VDSO_DATA select ARCH_HAS_VDSO_TIME_DATA
select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_HAVE_NMI_SAFE_CMPXCHG
select ARCH_INLINE_READ_LOCK select ARCH_INLINE_READ_LOCK
select ARCH_INLINE_READ_LOCK_BH select ARCH_INLINE_READ_LOCK_BH

12
arch/s390/include/asm/vdso/data.h
View File

@ -1,12 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __S390_ASM_VDSO_DATA_H
#define __S390_ASM_VDSO_DATA_H
#include <linux/types.h>
struct arch_vdso_data {
__s64 tod_steering_delta;
__u64 tod_steering_end;
};
#endif /* __S390_ASM_VDSO_DATA_H */

12
arch/s390/include/asm/vdso/time_data.h Normal file
View File

@ -0,0 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __S390_ASM_VDSO_TIME_DATA_H
#define __S390_ASM_VDSO_TIME_DATA_H
#include <linux/types.h>
struct arch_vdso_time_data {
__s64 tod_steering_delta;
__u64 tod_steering_end;
};
#endif /* __S390_ASM_VDSO_TIME_DATA_H */

8
include/vdso/datapage.h
View File

@ -19,10 +19,10 @@
#include <vdso/time32.h> #include <vdso/time32.h>
#include <vdso/time64.h> #include <vdso/time64.h>
#ifdef CONFIG_ARCH_HAS_VDSO_DATA #ifdef CONFIG_ARCH_HAS_VDSO_TIME_DATA
#include <asm/vdso/data.h> #include <asm/vdso/time_data.h>
#else #else
struct arch_vdso_data {}; struct arch_vdso_time_data {};
#endif #endif
#define VDSO_BASES (CLOCK_TAI + 1) #define VDSO_BASES (CLOCK_TAI + 1)
@ -114,7 +114,7 @@ struct vdso_data {
u32 hrtimer_res; u32 hrtimer_res;
u32 __unused; u32 __unused;
struct arch_vdso_data arch_data; struct arch_vdso_time_data arch_data;
}; };
/** /**