History

Merge tag 'stable/for-linus-4.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen bugfixes from David Vrabel: "Xen regression and bug fixes for 4.0-rc1 - Fix two regressions introduced in 4.0-rc1 affecting PV/PVH guests in certain configurations. - Prevent pvscsi frontends bypassing backend checks. - Allow privcmd hypercalls to be preempted even on kernel with voluntary preemption. This fixes soft-lockups with long running toolstack hypercalls (e.g., when creating/destroying large domains)" * tag 'stable/for-linus-4.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: x86/xen: Initialize cr4 shadow for 64-bit PV(H) guests xen-scsiback: mark pvscsi frontend request consumed only after last read x86/xen: allow privcmd hypercalls to be preempted x86/xen: Make sure X2APIC_ENABLE bit of MSR_IA32_APICBASE is not set

Linus Torvalds committed 11 years ago

Commit b24e2bd2 parents 84257ce 5054daa8 files · +104 −10Browse files

Unified · Split

8 files
  1. arch/x86/kernel/entry_32.S +3 −0
  2. arch/x86/kernel/entry_64.S +3 −0
  3. arch/x86/xen/enlighten.c +19 −1
  4. drivers/xen/Makefile +1 −1
  5. drivers/xen/preempt.c +44 −0
  6. drivers/xen/privcmd.c +2 −0
  7. drivers/xen/xen-scsiback.c +6 −8
  8. include/xen/xen-ops.h +26 −0
arch/x86/kernel/entry_32.S+3−0
@@ -982,6 +982,9 @@ ENTRY(xen_hypervisor_callback) · 981 unmodified lines
982982 ENTRY(xen_do_upcall)
983983 1: mov %esp, %eax
984984 call xen_evtchn_do_upcall
985+#ifndef CONFIG_PREEMPT
986+ call xen_maybe_preempt_hcall
987+#endif
985988 jmp ret_from_intr
986989 CFI_ENDPROC
987990 ENDPROC(xen_hypervisor_callback)
arch/x86/kernel/entry_64.S+3−0
@@ -1208,6 +1208,9 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs) · 1207 unmodified lines
12081208 popq %rsp
12091209 CFI_DEF_CFA_REGISTER rsp
12101210 decl PER_CPU_VAR(irq_count)
1211+#ifndef CONFIG_PREEMPT
1212+ call xen_maybe_preempt_hcall
1213+#endif
12111214 jmp error_exit
12121215 CFI_ENDPROC
12131216 END(xen_do_hypervisor_callback)
arch/x86/xen/enlighten.c+19−1
@@ -1070,6 +1070,23 @@ static inline void xen_write_cr8(unsigned long val) · 1069 unmodified lines
10701070 BUG_ON(val);
10711071 }
10721072 #endif
1073+
1074+static u64 xen_read_msr_safe(unsigned int msr, int *err)
1075+{
1076+ u64 val;
1077+
1078+ val = native_read_msr_safe(msr, err);
1079+ switch (msr) {
1080+ case MSR_IA32_APICBASE:
1081+#ifdef CONFIG_X86_X2APIC
1082+ if (!(cpuid_ecx(1) & (1 << (X86_FEATURE_X2APIC & 31))))
1083+#endif
1084+ val &= ~X2APIC_ENABLE;
1085+ break;
1086+ }
1087+ return val;
1088+}
1089+
10731090 static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high)
10741091 {
10751092 int ret;
@@ -1240,7 +1257,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = { · 164 unmodified lines
12401257
12411258 .wbinvd = native_wbinvd,
12421259
1243− .read_msr = native_read_msr_safe,
1260+ .read_msr = xen_read_msr_safe,
12441261 .write_msr = xen_write_msr_safe,
12451262
12461263 .read_tsc = native_read_tsc,
@@ -1741,6 +1758,7 @@ asmlinkage __visible void __init xen_start_kernel(void) · 494 unmodified lines
17411758 #ifdef CONFIG_X86_32
17421759 i386_start_kernel();
17431760 #else
1761+ cr4_init_shadow(); /* 32b kernel does this in i386_start_kernel() */
17441762 x86_64_start_reservations((char *)__pa_symbol(&boot_params));
17451763 #endif
17461764 }
drivers/xen/Makefile+1−1
@@ -2,7 +2,7 @@ ifeq ($(filter y, $(CONFIG_ARM) $(CONFIG_ARM64)),) · 1 unmodified line
22 obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
33 endif
44 obj-$(CONFIG_X86) += fallback.o
5−obj-y += grant-table.o features.o balloon.o manage.o
5+obj-y += grant-table.o features.o balloon.o manage.o preempt.o
66 obj-y += events/
77 obj-y += xenbus/
88
drivers/xen/preempt.c+44−0
@@ -0,0 +1,44 @@
1+/*
2+ * Preemptible hypercalls
3+ *
4+ * Copyright (C) 2014 Citrix Systems R&D ltd.
5+ *
6+ * This source code is free software; you can redistribute it and/or
7+ * modify it under the terms of the GNU General Public License as
8+ * published by the Free Software Foundation; either version 2 of the
9+ * License, or (at your option) any later version.
10+ */
11+
12+#include <linux/sched.h>
13+#include <xen/xen-ops.h>
14+
15+#ifndef CONFIG_PREEMPT
16+
17+/*
18+ * Some hypercalls issued by the toolstack can take many 10s of
19+ * seconds. Allow tasks running hypercalls via the privcmd driver to
20+ * be voluntarily preempted even if full kernel preemption is
21+ * disabled.
22+ *
23+ * Such preemptible hypercalls are bracketed by
24+ * xen_preemptible_hcall_begin() and xen_preemptible_hcall_end()
25+ * calls.
26+ */
27+
28+DEFINE_PER_CPU(bool, xen_in_preemptible_hcall);
29+EXPORT_SYMBOL_GPL(xen_in_preemptible_hcall);
30+
31+asmlinkage __visible void xen_maybe_preempt_hcall(void)
32+{
33+ if (unlikely(__this_cpu_read(xen_in_preemptible_hcall)
34+ && should_resched())) {
35+ /*
36+ * Clear flag as we may be rescheduled on a different
37+ * cpu.
38+ */
39+ __this_cpu_write(xen_in_preemptible_hcall, false);
40+ _cond_resched();
41+ __this_cpu_write(xen_in_preemptible_hcall, true);
42+ }
43+}
44+#endif /* CONFIG_PREEMPT */
drivers/xen/privcmd.c+2−0
@@ -56,10 +56,12 @@ static long privcmd_ioctl_hypercall(void __user *udata) · 55 unmodified lines
5656 if (copy_from_user(&hypercall, udata, sizeof(hypercall)))
5757 return -EFAULT;
5858
59+ xen_preemptible_hcall_begin();
5960 ret = privcmd_call(hypercall.op,
6061 hypercall.arg[0], hypercall.arg[1],
6162 hypercall.arg[2], hypercall.arg[3],
6263 hypercall.arg[4]);
64+ xen_preemptible_hcall_end();
6365
6466 return ret;
6567 }
drivers/xen/xen-scsiback.c+6−8
@@ -709,12 +709,11 @@ static int prepare_pending_reqs(struct vscsibk_info *info, · 708 unmodified lines
709709 static int scsiback_do_cmd_fn(struct vscsibk_info *info)
710710 {
711711 struct vscsiif_back_ring *ring = &info->ring;
712− struct vscsiif_request *ring_req;
712+ struct vscsiif_request ring_req;
713713 struct vscsibk_pend *pending_req;
714714 RING_IDX rc, rp;
715715 int err, more_to_do;
716716 uint32_t result;
717− uint8_t act;
718717
719718 rc = ring->req_cons;
720719 rp = ring->sring->req_prod;
@@ -735,11 +734,10 @@ static int scsiback_do_cmd_fn(struct vscsibk_info *info) · 14 unmodified lines
735734 if (!pending_req)
736735 return 1;
737736
738− ring_req = RING_GET_REQUEST(ring, rc);
737+ ring_req = *RING_GET_REQUEST(ring, rc);
739738 ring->req_cons = ++rc;
740739
741− act = ring_req->act;
742− err = prepare_pending_reqs(info, ring_req, pending_req);
740+ err = prepare_pending_reqs(info, &ring_req, pending_req);
743741 if (err) {
744742 switch (err) {
745743 case -ENODEV:
@@ -755,9 +753,9 @@ static int scsiback_do_cmd_fn(struct vscsibk_info *info) · 9 unmodified lines
755753 return 1;
756754 }
757755
758− switch (act) {
756+ switch (ring_req.act) {
759757 case VSCSIIF_ACT_SCSI_CDB:
760− if (scsiback_gnttab_data_map(ring_req, pending_req)) {
758+ if (scsiback_gnttab_data_map(&ring_req, pending_req)) {
761759 scsiback_fast_flush_area(pending_req);
762760 scsiback_do_resp_with_sense(NULL,
763761 DRIVER_ERROR << 24, 0, pending_req);
@@ -768,7 +766,7 @@ static int scsiback_do_cmd_fn(struct vscsibk_info *info) · 4 unmodified lines
768766 break;
769767 case VSCSIIF_ACT_SCSI_ABORT:
770768 scsiback_device_action(pending_req, TMR_ABORT_TASK,
771− ring_req->ref_rqid);
769+ ring_req.ref_rqid);
772770 break;
773771 case VSCSIIF_ACT_SCSI_RESET:
774772 scsiback_device_action(pending_req, TMR_LUN_RESET, 0);
include/xen/xen-ops.h+26−0
@@ -46,4 +46,30 @@ static inline efi_system_table_t __init *xen_efi_probe(void) · 45 unmodified lines
4646 }
4747 #endif
4848
49+#ifdef CONFIG_PREEMPT
50+
51+static inline void xen_preemptible_hcall_begin(void)
52+{
53+}
54+
55+static inline void xen_preemptible_hcall_end(void)
56+{
57+}
58+
59+#else
60+
61+DECLARE_PER_CPU(bool, xen_in_preemptible_hcall);
62+
63+static inline void xen_preemptible_hcall_begin(void)
64+{
65+ __this_cpu_write(xen_in_preemptible_hcall, true);
66+}
67+
68+static inline void xen_preemptible_hcall_end(void)
69+{
70+ __this_cpu_write(xen_in_preemptible_hcall, false);
71+}
72+
73+#endif /* CONFIG_PREEMPT */
74+
4975 #endif /* INCLUDE_XEN_OPS_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t