tjh.dev
+15
-11
arch/arm64/kernel/paravirt.c
+15
-11
arch/arm64/kernel/paravirt.c
···
50
50
struct pv_time_stolen_time_region *reg;
51
51
52
52
reg = per_cpu_ptr(&stolen_time_region, cpu);
53
-
if (!reg->kaddr) {
54
-
pr_warn_once("stolen time enabled but not configured for cpu %d\n",
55
-
cpu);
53
+
54
+
/*
55
+
* paravirt_steal_clock() may be called before the CPU
56
+
* online notification callback runs. Until the callback
57
+
* has run we just return zero.
58
+
*/
59
+
if (!reg->kaddr)
56
60
return 0;
57
-
}
58
61
59
62
return le64_to_cpu(READ_ONCE(reg->kaddr->stolen_time));
60
63
}
61
64
62
-
static int stolen_time_dying_cpu(unsigned int cpu)
65
+
static int stolen_time_cpu_down_prepare(unsigned int cpu)
63
66
{
64
67
struct pv_time_stolen_time_region *reg;
65
68
···
76
73
return 0;
77
74
}
78
75
79
-
static int init_stolen_time_cpu(unsigned int cpu)
76
+
static int stolen_time_cpu_online(unsigned int cpu)
80
77
{
81
78
struct pv_time_stolen_time_region *reg;
82
79
struct arm_smccc_res res;
···
106
103
return 0;
107
104
}
108
105
109
-
static int pv_time_init_stolen_time(void)
106
+
static int __init pv_time_init_stolen_time(void)
110
107
{
111
108
int ret;
112
109
113
-
ret = cpuhp_setup_state(CPUHP_AP_ARM_KVMPV_STARTING,
114
-
"hypervisor/arm/pvtime:starting",
115
-
init_stolen_time_cpu, stolen_time_dying_cpu);
110
+
ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
111
+
"hypervisor/arm/pvtime:online",
112
+
stolen_time_cpu_online,
113
+
stolen_time_cpu_down_prepare);
116
114
if (ret < 0)
117
115
return ret;
118
116
return 0;
119
117
}
120
118
121
-
static bool has_pv_steal_clock(void)
119
+
static bool __init has_pv_steal_clock(void)
122
120
{
123
121
struct arm_smccc_res res;
124
122
-1
include/linux/cpuhotplug.h
-1
include/linux/cpuhotplug.h