移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/arch/x86/xen/smp_pv.c
..
..
@@ -22,11 +22,14 @@
22
22
 #include <linux/tick.h>
23
23
 #include <linux/nmi.h>
24
24
 #include <linux/cpuhotplug.h>
25
+#include <linux/stackprotector.h>
26
+#include <linux/pgtable.h>
25
27
 
26
28
 #include <asm/paravirt.h>
29
+#include <asm/idtentry.h>
27
30
 #include <asm/desc.h>
28
-#include <asm/pgtable.h>
29
31
 #include <asm/cpu.h>
32
+#include <asm/io_apic.h>
30
33
 
31
34
 #include <xen/interface/xen.h>
32
35
 #include <xen/interface/vcpu.h>
..
..
@@ -52,11 +55,13 @@
52
55
 static DEFINE_PER_CPU(struct xen_common_irq, xen_pmu_irq) = { .irq = -1 };
53
56
 
54
57
 static irqreturn_t xen_irq_work_interrupt(int irq, void *dev_id);
58
+void asm_cpu_bringup_and_idle(void);
55
59
 
56
60
 static void cpu_bringup(void)
57
61
 {
58
62
 	int cpu;
59
63
 
64
+	cr4_init();
60
65
 	cpu_init();
61
66
 	touch_softlockup_watchdog();
62
67
 	preempt_disable();
..
..
@@ -89,7 +94,6 @@
89
94
 {
90
95
 	cpu_bringup();
91
96
 	cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
92
-	prevent_tail_call_optimization();
93
97
 }
94
98
 
95
99
 void xen_smp_intr_free_pv(unsigned int cpu)
..
..
@@ -126,7 +130,7 @@
126
130
 	per_cpu(xen_irq_work, cpu).irq = rc;
127
131
 	per_cpu(xen_irq_work, cpu).name = callfunc_name;
128
132
 
129
-	if (is_xen_pmu(cpu)) {
133
+	if (is_xen_pmu) {
130
134
 		pmu_name = kasprintf(GFP_KERNEL, "pmu%d", cpu);
131
135
 		rc = bind_virq_to_irqhandler(VIRQ_XENPMU, cpu,
132
136
 					     xen_pmu_irq_handler,
..
..
@@ -145,28 +149,12 @@
145
149
 	return rc;
146
150
 }
147
151
 
148
-static void __init xen_fill_possible_map(void)
149
-{
150
-	int i, rc;
151
-
152
-	if (xen_initial_domain())
153
-		return;
154
-
155
-	for (i = 0; i < nr_cpu_ids; i++) {
156
-		rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL);
157
-		if (rc >= 0) {
158
-			num_processors++;
159
-			set_cpu_possible(i, true);
160
-		}
161
-	}
162
-}
163
-
164
-static void __init xen_filter_cpu_maps(void)
152
+static void __init _get_smp_config(unsigned int early)
165
153
 {
166
154
 	int i, rc;
167
155
 	unsigned int subtract = 0;
168
156
 
169
-	if (!xen_initial_domain())
157
+	if (early)
170
158
 		return;
171
159
 
172
160
 	num_processors = 0;
..
..
@@ -207,16 +195,6 @@
207
195
 		 * sure the old memory can be recycled. */
208
196
 		make_lowmem_page_readwrite(xen_initial_gdt);
209
197
 
210
-#ifdef CONFIG_X86_32
211
-	/*
212
-	 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
213
-	 * expects __USER_DS
214
-	 */
215
-	loadsegment(ds, __USER_DS);
216
-	loadsegment(es, __USER_DS);
217
-#endif
218
-
219
-	xen_filter_cpu_maps();
220
198
 	xen_setup_vcpu_info_placement();
221
199
 
222
200
 	/*
..
..
@@ -250,6 +228,7 @@
250
228
 	for_each_possible_cpu(i) {
251
229
 		zalloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);
252
230
 		zalloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);
231
+		zalloc_cpumask_var(&per_cpu(cpu_die_map, i), GFP_KERNEL);
253
232
 		zalloc_cpumask_var(&per_cpu(cpu_llc_shared_map, i), GFP_KERNEL);
254
233
 	}
255
234
 	set_cpu_sibling_map(0);
..
..
@@ -295,10 +274,6 @@
295
274
 
296
275
 	gdt = get_cpu_gdt_rw(cpu);
297
276
 
298
-#ifdef CONFIG_X86_32
299
-	ctxt->user_regs.fs = __KERNEL_PERCPU;
300
-	ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
301
-#endif
302
277
 	memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
303
278
 
304
279
 	/*
..
..
@@ -306,7 +281,7 @@
306
281
 	 * pointing just below where pt_regs would be if it were a normal
307
282
 	 * kernel entry.
308
283
 	 */
309
-	ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
284
+	ctxt->user_regs.eip = (unsigned long)asm_cpu_bringup_and_idle;
310
285
 	ctxt->flags = VGCF_IN_KERNEL;
311
286
 	ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
312
287
 	ctxt->user_regs.ds = __USER_DS;
..
..
@@ -336,14 +311,9 @@
336
311
 	ctxt->kernel_ss = __KERNEL_DS;
337
312
 	ctxt->kernel_sp = task_top_of_stack(idle);
338
313
 
339
-#ifdef CONFIG_X86_32
340
-	ctxt->event_callback_cs     = __KERNEL_CS;
341
-	ctxt->failsafe_callback_cs  = __KERNEL_CS;
342
-#else
343
314
 	ctxt->gs_base_kernel = per_cpu_offset(cpu);
344
-#endif
345
315
 	ctxt->event_callback_eip    =
346
-		(unsigned long)xen_hypervisor_callback;
316
+		(unsigned long)xen_asm_exc_xen_hypervisor_callback;
347
317
 	ctxt->failsafe_callback_eip =
348
318
 		(unsigned long)xen_failsafe_callback;
349
319
 	per_cpu(xen_cr3, cpu) = __pa(swapper_pg_dir);
..
..
@@ -360,7 +330,9 @@
360
330
 {
361
331
 	int rc;
362
332
 
363
-	common_cpu_up(cpu, idle);
333
+	rc = common_cpu_up(cpu, idle);
334
+	if (rc)
335
+		return rc;
364
336
 
365
337
 	xen_setup_runstate_info(cpu);
366
338
 
..
..
@@ -502,5 +474,8 @@
502
474
 void __init xen_smp_init(void)
503
475
 {
504
476
 	smp_ops = xen_smp_ops;
505
-	xen_fill_possible_map();
477
+
478
+	/* Avoid searching for BIOS MP tables */
479
+	x86_init.mpparse.find_smp_config = x86_init_noop;
480
+	x86_init.mpparse.get_smp_config = _get_smp_config;
506
481
 }