hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/s390/include/asm/vdso.h
....@@ -2,6 +2,8 @@
22 #ifndef __S390_VDSO_H__
33 #define __S390_VDSO_H__
44
5
+#include <vdso/datapage.h>
6
+
57 /* Default link addresses for the vDSOs */
68 #define VDSO32_LBASE 0
79 #define VDSO64_LBASE 0
....@@ -18,38 +20,22 @@
1820 * itself and may change without notice.
1921 */
2022
21
-struct vdso_data {
22
- __u64 tb_update_count; /* Timebase atomicity ctr 0x00 */
23
- __u64 xtime_tod_stamp; /* TOD clock for xtime 0x08 */
24
- __u64 xtime_clock_sec; /* Kernel time 0x10 */
25
- __u64 xtime_clock_nsec; /* 0x18 */
26
- __u64 xtime_coarse_sec; /* Coarse kernel time 0x20 */
27
- __u64 xtime_coarse_nsec; /* 0x28 */
28
- __u64 wtom_clock_sec; /* Wall to monotonic clock 0x30 */
29
- __u64 wtom_clock_nsec; /* 0x38 */
30
- __u64 wtom_coarse_sec; /* Coarse wall to monotonic 0x40 */
31
- __u64 wtom_coarse_nsec; /* 0x48 */
32
- __u32 tz_minuteswest; /* Minutes west of Greenwich 0x50 */
33
- __u32 tz_dsttime; /* Type of dst correction 0x54 */
34
- __u32 ectg_available; /* ECTG instruction present 0x58 */
35
- __u32 tk_mult; /* Mult. used for xtime_nsec 0x5c */
36
- __u32 tk_shift; /* Shift used for xtime_nsec 0x60 */
37
- __u32 ts_dir; /* TOD steering direction 0x64 */
38
- __u64 ts_end; /* TOD steering end 0x68 */
39
- __u32 hrtimer_res; /* hrtimer resolution 0x70 */
40
-};
41
-
4223 struct vdso_per_cpu_data {
43
- __u64 ectg_timer_base;
44
- __u64 ectg_user_time;
45
- __u32 cpu_nr;
46
- __u32 node_id;
24
+ /*
25
+ * Note: node_id and cpu_nr must be at adjacent memory locations.
26
+ * VDSO userspace must read both values with a single instruction.
27
+ */
28
+ union {
29
+ __u64 getcpu_val;
30
+ struct {
31
+ __u32 node_id;
32
+ __u32 cpu_nr;
33
+ };
34
+ };
4735 };
4836
4937 extern struct vdso_data *vdso_data;
50
-extern struct vdso_data boot_vdso_data;
5138
52
-void vdso_alloc_boot_cpu(struct lowcore *lowcore);
5339 int vdso_alloc_per_cpu(struct lowcore *lowcore);
5440 void vdso_free_per_cpu(struct lowcore *lowcore);
5541