Commit a812eee0 authored by Nam Cao's avatar Nam Cao Committed by Thomas Gleixner
Browse files

vdso: Rename struct arch_vdso_data to arch_vdso_time_data 



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: default avatarNam Cao <namcao@linutronix.de>
Signed-off-by: default avatarThomas 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
parent 6142be7e

arch/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1530,7 +1530,7 @@ config HAVE_SPARSE_SYSCALL_NR 
	  entries at 4000, 5000 and 6000 locations. This option turns on syscall

	  related optimizations for a given architecture.



config ARCH_HAS_VDSO_DATA

config ARCH_HAS_VDSO_TIME_DATA

	bool



config HAVE_STATIC_CALL

arch/riscv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ config RISCV 
	select ARCH_HAS_SYSCALL_WRAPPER

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAS_UBSAN

	select ARCH_HAS_VDSO_DATA

	select ARCH_HAS_VDSO_TIME_DATA

	select ARCH_KEEP_MEMBLOCK if ACPI

	select ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE	if 64BIT && MMU

	select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX

arch/riscv/include/asm/vdso/data.h→arch/riscv/include/asm/vdso/time_data.h

+4 −4
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __RISCV_ASM_VDSO_DATA_H

#define __RISCV_ASM_VDSO_DATA_H

#ifndef __RISCV_ASM_VDSO_TIME_DATA_H

#define __RISCV_ASM_VDSO_TIME_DATA_H



#include <linux/types.h>

#include <vdso/datapage.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. */

	__u64 all_cpu_hwprobe_values[RISCV_HWPROBE_MAX_KEY + 1];
@@ -14,4 +14,4 @@ struct arch_vdso_data { 
	__u8 homogeneous_cpus;

};



#endif /* __RISCV_ASM_VDSO_DATA_H */
 
#endif /* __RISCV_ASM_VDSO_TIME_DATA_H */

arch/riscv/kernel/sys_hwprobe.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static int do_riscv_hwprobe(struct riscv_hwprobe __user *pairs, 
static int __init init_hwprobe_vdso_data(void)

{

	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;

	struct riscv_hwprobe pair;

	int key;

arch/riscv/kernel/vdso/hwprobe.c

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ static int riscv_vdso_get_values(struct riscv_hwprobe *pairs, size_t pair_count, 
				 unsigned int flags)

{

	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;

	struct riscv_hwprobe *p = pairs;

	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)

{

	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 *end = pairs + pair_count;

	unsigned char *c = (unsigned char *)cpus;