x86/ioperm: add new paravirt function update_io_bitmap
Subsystems (5)
Juergen Gross
maintainerPATCH 1/1 x86/ioperm: add new paravirt function update_io_bitmap
Commit 111e7b15cf10f6 ("x86/ioperm: Extend IOPL config to control ioperm() as well") reworked the iopl syscall to use I/O bitmaps.
Unfortunately this broke Xen PV domains using that syscall as there is currently no I/O bitmap support in PV domains.
Add I/O bitmap support via a new paravirt function update_io_bitmap which Xen PV domains can use to update their I/O bitmaps via a hypercall.
--- arch/x86/include/asm/io_bitmap.h | 9 ++++++++- arch/x86/include/asm/paravirt.h | 7 +++++++ arch/x86/include/asm/paravirt_types.h | 4 ++++ arch/x86/kernel/paravirt.c | 5 +++++ arch/x86/kernel/process.c | 2 +- arch/x86/xen/enlighten_pv.c | 25 +++++++++++++++++++++++++ 6 files changed, 50 insertions(+), 2 deletions(-)
arch/x86/include/asm/io_bitmap.h +8 -1
@@ -19,7 +19,14 @@ struct task_struct;void io_bitmap_share (struct task_struct *tsk);void io_bitmap_exit (void ); -void tss_update_io_bitmap (void ); +void native_tss_update_io_bitmap (void ); + +#ifdef CONFIG_PARAVIRT_XXL +#include <asm/paravirt.h> +#else +#define tss_update_io_bitmap native_tss_update_io_bitmap +#endif +#else static inline void io_bitmap_share (struct task_struct *tsk) { }static inline void io_bitmap_exit (void ) { }
arch/x86/include/asm/paravirt.h +7 -0
@@ -295,6 +295,13 @@ static inline void write_idt_entry(gate_desc *dt, int entry, const gate_desc *g)PVOP_VCALL3 (cpu.write_idt_entry, dt, entry, g); } +#ifdef CONFIG_X86_IOPL_IOPERM +static inline void tss_update_io_bitmap (void ) +{ +PVOP_VCALL0 (cpu.update_io_bitmap); +} +#endif +static inline void paravirt_activate_mm (struct mm_struct *prev,struct mm_struct *next) {
arch/x86/include/asm/paravirt_types.h +4 -0
@@ -140,6 +140,10 @@ struct pv_cpu_ops {void (*load_sp0)(unsigned long sp0); +#ifdef CONFIG_X86_IOPL_IOPERM +void (*update_io_bitmap)(void ); +#endif +void (*wbinvd)(void );/* cpuid emulation, mostly so that caps bits can be disabled */
arch/x86/kernel/paravirt.c +5 -0
@@ -30,6 +30,7 @@#include <asm/timer.h> #include <asm/special_insns.h> #include <asm/tlb.h> +#include <asm/io_bitmap.h> /* * nop stub, which must not clobber anything *including the stack* to
@@ -341,6 +342,10 @@ struct paravirt_patch_template pv_ops = { .cpu.iret = native_iret, .cpu.swapgs = native_swapgs, +#ifdef CONFIG_X86_IOPL_IOPERM + .cpu.update_io_bitmap = native_tss_update_io_bitmap, +#endif + .cpu.start_context_switch = paravirt_nop, .cpu.end_context_switch = paravirt_nop,
arch/x86/kernel/process.c +1 -1
@@ -374,7 +374,7 @@ static void tss_copy_io_bitmap(struct tss_struct *tss, struct io_bitmap *iobm)/** * tss_update_io_bitmap - Update I/O bitmap before exiting to usermode */ -void tss_update_io_bitmap (void ) +void native_tss_update_io_bitmap (void ) {struct tss_struct *tss =this_cpu_ptr (&cpu_tss_rw);struct thread_struct *t = ¤t->thread;
arch/x86/xen/enlighten_pv.c +25 -0
@@ -72,6 +72,9 @@#include <asm/mwait.h> #include <asm/pci_x86.h> #include <asm/cpu.h> +#ifdef CONFIG_X86_IOPL_IOPERM +#include <asm/io_bitmap.h> +#endif #ifdef CONFIG_ACPI #include <linux/acpi.h>
@@ -837,6 +840,25 @@ static void xen_load_sp0(unsigned long sp0)this_cpu_write (cpu_tss_rw.x86_tss.sp0, sp0); } +#ifdef CONFIG_X86_IOPL_IOPERM +static void xen_update_io_bitmap (void ) +{ +struct physdev_set_iobitmap iobitmap; +struct tss_struct *tss =this_cpu_ptr (&cpu_tss_rw); + +native_tss_update_io_bitmap (); + + iobitmap.bitmap = (uint8_t *)(&tss->x86_tss) + + tss->x86_tss.io_bitmap_base; +if (tss->x86_tss.io_bitmap_base ==IO_BITMAP_OFFSET_INVALID ) + iobitmap.nr_ports =0 ; +else + iobitmap.nr_ports =IO_BITMAP_BITS ; + +HYPERVISOR_physdev_op (PHYSDEVOP_set_iobitmap, &iobitmap); +} +#endif +static void xen_io_delay (void ) { }
@@ -1046,6 +1068,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = { .write_idt_entry = xen_write_idt_entry, .load_sp0 = xen_load_sp0, +#ifdef CONFIG_X86_IOPL_IOPERM + .update_io_bitmap = xen_update_io_bitmap, +#endif .io_delay = xen_io_delay,/* Xen takes care of %gs when switching to usermode for us */
Signature · 1 line
2.16.4
Quoted 10 lines · Juergen Gross
Commit
111e7b15cf10f6("x86/ioperm: Extend IOPL config to controlioperm()as well") reworked the iopl syscall to use I/O bitmaps.Unfortunately this broke Xen PV domains using that syscall as there is currently no I/O bitmap support in PV domains.
Add I/O bitmap support via a new paravirt function
update_io_bitmapwhich Xen PV domains can use to update their I/O bitmaps via a hypercall.
Quoted 6 lines
Fixes 111e7b15cf10f6 ("x86/ioperm: Extend IOPL config to control ioperm() as well")Reported-by Jan Beulich <[email protected]>Cc <[email protected]> # 5.5Signed-off-by Juergen Gross <[email protected]>Reviewed-by Jan Beulich <[email protected]>Tested-by Jan Beulich <[email protected]>
Duh, sorry about that and thanks for fixing it.
BTW, why isn't stuff like this not catched during next or at least before the final release? Is nothing running CI on upstream with all that XEN muck active?
Thanks,
tglx
Jürgen Groß
maintainerQuoted 18 lines · Thomas Gleixner
Quoted 10 lines · Juergen Gross
Commit
111e7b15cf10f6("x86/ioperm: Extend IOPL config to controlioperm()as well") reworked the iopl syscall to use I/O bitmaps.Unfortunately this broke Xen PV domains using that syscall as there is currently no I/O bitmap support in PV domains.
Add I/O bitmap support via a new paravirt function
update_io_bitmapwhich Xen PV domains can use to update their I/O bitmaps via a hypercall.Quoted 6 lines
Fixes 111e7b15cf10f6 ("x86/ioperm: Extend IOPL config to control ioperm() as well")Reported-by Jan Beulich <[email protected]>Cc <[email protected]> # 5.5Signed-off-by Juergen Gross <[email protected]>Reviewed-by Jan Beulich <[email protected]>Tested-by Jan Beulich <[email protected]>
Quoted 5 lines
Duh, sorry about that and thanks for fixing it.
BTW, why isn't stuff like this not catched during next or at least before the final release? Is nothing running CI on upstream with all that XEN muck active?
This problem showed up by not being able to start the X server (probably not the freshest one) in dom0 on a moderate aged AMD system.
Our CI tests tend do be more text console based for dom0.
Juergen
Quoted 19 lines · Jürgen Groß
Quoted 18 lines · Thomas Gleixner
Quoted 16 lines · Juergen Gross
Commit
111e7b15cf10f6("x86/ioperm: Extend IOPL config to controlioperm()as well") reworked the iopl syscall to use I/O bitmaps.Unfortunately this broke Xen PV domains using that syscall as there is currently no I/O bitmap support in PV domains.
Add I/O bitmap support via a new paravirt function
update_io_bitmapwhich Xen PV domains can use to update their I/O bitmaps via a hypercall.Fixes 111e7b15cf10f6 ("x86/ioperm: Extend IOPL config to control ioperm() as well")Reported-by Jan Beulich <[email protected]>Cc <[email protected]> # 5.5Signed-off-by Juergen Gross <[email protected]>Reviewed-by Jan Beulich <[email protected]>Tested-by Jan Beulich <[email protected]>
Quoted 8 lines
Quoted 5 lines
Duh, sorry about that and thanks for fixing it.
BTW, why isn't stuff like this not catched during next or at least before the final release? Is nothing running CI on upstream with all that XEN muck active?
This problem showed up by not being able to start the X server (probably not the freshest one) in dom0 on a moderate aged AMD system.
Not the freshest one, yes, but also on a system where KMS would not be available (my success rate with KMS is rather low overall, and with newer Linux I see rather more systems to stop working than ones to become working, but I simply don't have the time to investigate).
Jan
Quoted 9 lines · Jürgen Groß
Quoted 3 lines · Thomas Gleixner
BTW, why isn't stuff like this not catched during next or at least before the final release? Is nothing running CI on upstream with all that XEN muck active?
This problem showed up by not being able to start the X server (probably not the freshest one) in dom0 on a moderate aged AMD system.
Our CI tests tend do be more text console based for dom0.
tools/testing/selftests/x86/io[perm|pl] should have caught that as well, right? If not, we need to fix the selftests.
Thanks,
tglx
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Jürgen Groß
maintainerQuoted 6 lines · Thomas Gleixner
Quoted 5 lines · Jürgen Groß
Quoted 3 lines · Thomas Gleixner
BTW, why isn't stuff like this not catched during next or at least before the final release? Is nothing running CI on upstream with all that XEN muck active?
Quoted 7 lines
Quoted 4 lines
This problem showed up by not being able to start the X server (probably not the freshest one) in dom0 on a moderate aged AMD system.
Our CI tests tend do be more text console based for dom0.
tools/testing/selftests/x86/io[perm|pl] should have caught that as well, right? If not, we need to fix the selftests.
Hmm, yes. Thanks for the pointer.
Will ask our testing specialist what is done in this regard and how it can be enhanced.
Juergen
Jürgen Groß
maintainerFriendly ping...
Quoted 165 lines · Juergen Gross
Commit
111e7b15cf10f6("x86/ioperm: Extend IOPL config to controlioperm()as well") reworked the iopl syscall to use I/O bitmaps.Unfortunately this broke Xen PV domains using that syscall as there is currently no I/O bitmap support in PV domains.
Add I/O bitmap support via a new paravirt function
update_io_bitmapwhich Xen PV domains can use to update their I/O bitmaps via a hypercall.Fixes 111e7b15cf10f6 ("x86/ioperm: Extend IOPL config to control ioperm() as well")Reported-by Jan Beulich <[email protected]>Cc <[email protected]> # 5.5Signed-off-by Juergen Gross <[email protected]>Reviewed-by Jan Beulich <[email protected]>Tested-by Jan Beulich <[email protected]>--- arch/x86/include/asm/io_bitmap.h | 9 ++++++++- arch/x86/include/asm/paravirt.h | 7 +++++++ arch/x86/include/asm/paravirt_types.h | 4 ++++ arch/x86/kernel/paravirt.c | 5 +++++ arch/x86/kernel/process.c | 2 +- arch/x86/xen/enlighten_pv.c | 25 +++++++++++++++++++++++++ 6 files changed, 50 insertions(+), 2 deletions(-)arch/x86/include/asm/io_bitmap.h +8
-1@@ -19,7 +19,14 @@ struct task_struct;void io_bitmap_share (struct task_struct *tsk);void io_bitmap_exit (void ); -void tss_update_io_bitmap (void ); +void native_tss_update_io_bitmap (void ); + +#ifdef CONFIG_PARAVIRT_XXL +#include <asm/paravirt.h> +#else +#define tss_update_io_bitmap native_tss_update_io_bitmap +#endif +#else static inline void io_bitmap_share (struct task_struct *tsk) { }static inline void io_bitmap_exit (void ) { }arch/x86/include/asm/paravirt.h +7
-0@@ -295,6 +295,13 @@ static inline void write_idt_entry(gate_desc *dt, int entry, const gate_desc *g)PVOP_VCALL3 (cpu.write_idt_entry, dt, entry, g); } +#ifdef CONFIG_X86_IOPL_IOPERM +static inline void tss_update_io_bitmap (void ) +{ +PVOP_VCALL0 (cpu.update_io_bitmap); +} +#endif +static inline void paravirt_activate_mm (struct mm_struct *prev,struct mm_struct *next) {arch/x86/include/asm/paravirt_types.h +4
-0@@ -140,6 +140,10 @@ struct pv_cpu_ops {void (*load_sp0)(unsigned long sp0); +#ifdef CONFIG_X86_IOPL_IOPERM +void (*update_io_bitmap)(void ); +#endif +void (*wbinvd)(void );/* cpuid emulation, mostly so that caps bits can be disabled */ arch/x86/kernel/paravirt.c +5
-0@@ -30,6 +30,7 @@#include <asm/timer.h> #include <asm/special_insns.h> #include <asm/tlb.h> +#include <asm/io_bitmap.h> /* * nop stub, which must not clobber anything *including the stack* to @@ -341,6 +342,10 @@ struct paravirt_patch_template pv_ops = { .cpu.iret = native_iret, .cpu.swapgs = native_swapgs, +#ifdef CONFIG_X86_IOPL_IOPERM + .cpu.update_io_bitmap = native_tss_update_io_bitmap, +#endif + .cpu.start_context_switch = paravirt_nop, .cpu.end_context_switch = paravirt_nop,arch/x86/kernel/process.c +1
-1@@ -374,7 +374,7 @@ static void tss_copy_io_bitmap(struct tss_struct *tss, struct io_bitmap *iobm)/** * tss_update_io_bitmap - Update I/O bitmap before exiting to usermode */ -void tss_update_io_bitmap (void ) +void native_tss_update_io_bitmap (void ) {struct tss_struct *tss =this_cpu_ptr (&cpu_tss_rw);struct thread_struct *t = ¤t->thread;arch/x86/xen/enlighten_pv.c +25
-0@@ -72,6 +72,9 @@#include <asm/mwait.h> #include <asm/pci_x86.h> #include <asm/cpu.h> +#ifdef CONFIG_X86_IOPL_IOPERM +#include <asm/io_bitmap.h> +#endif #ifdef CONFIG_ACPI #include <linux/acpi.h> @@ -837,6 +840,25 @@ static void xen_load_sp0(unsigned long sp0)this_cpu_write (cpu_tss_rw.x86_tss.sp0, sp0); } +#ifdef CONFIG_X86_IOPL_IOPERM +static void xen_update_io_bitmap (void ) +{ +struct physdev_set_iobitmap iobitmap; +struct tss_struct *tss =this_cpu_ptr (&cpu_tss_rw); + +native_tss_update_io_bitmap (); + + iobitmap.bitmap = (uint8_t *)(&tss->x86_tss) + + tss->x86_tss.io_bitmap_base; +if (tss->x86_tss.io_bitmap_base ==IO_BITMAP_OFFSET_INVALID ) + iobitmap.nr_ports =0 ; +else + iobitmap.nr_ports =IO_BITMAP_BITS ; + +HYPERVISOR_physdev_op (PHYSDEVOP_set_iobitmap, &iobitmap); +} +#endif +static void xen_io_delay (void ) { }@@ -1046,6 +1068,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = { .write_idt_entry = xen_write_idt_entry, .load_sp0 = xen_load_sp0, +#ifdef CONFIG_X86_IOPL_IOPERM + .update_io_bitmap = xen_update_io_bitmap, +#endif .io_delay = xen_io_delay,/* Xen takes care of %gs when switching to usermode for us */
Quoted 1 line · Jürgen Groß
Friendly ping...
Ooops. I pick it up first thing tomorrow morning
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
[tip: x86/urgent] x86/ioperm: Add new paravirt function update_io_bitmap()
In reply to Juergen GrossThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 99bcd4a6e5b8ba201fdd252f1054689884899fee Gitweb: https://git.kernel.org/tip/99bcd4a6e5b8ba201fdd252f1054689884899fee Author: Juergen Gross <[email protected]> AuthorDate: Tue, 18 Feb 2020 16:47:12 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 29 Feb 2020 12:43:09 +01:00
x86/ioperm: Add new paravirt function update_io_bitmap()
Commit 111e7b15cf10f6 ("x86/ioperm: Extend IOPL config to control ioperm() as well") reworked the iopl syscall to use I/O bitmaps.
Unfortunately this broke Xen PV domains using that syscall as there is currently no I/O bitmap support in PV domains.
Add I/O bitmap support via a new paravirt function update_io_bitmap which Xen PV domains can use to update their I/O bitmaps via a hypercall.
--- arch/x86/include/asm/io_bitmap.h | 9 ++++++++- arch/x86/include/asm/paravirt.h | 7 +++++++ arch/x86/include/asm/paravirt_types.h | 4 ++++ arch/x86/kernel/paravirt.c | 5 +++++ arch/x86/kernel/process.c | 2 +- arch/x86/xen/enlighten_pv.c | 25 +++++++++++++++++++++++++ 6 files changed, 50 insertions(+), 2 deletions(-)
arch/x86/include/asm/io_bitmap.h +8 -1
@@ -19,7 +19,14 @@ struct task_struct;void io_bitmap_share (struct task_struct *tsk);void io_bitmap_exit (void ); -void tss_update_io_bitmap (void ); +void native_tss_update_io_bitmap (void ); + +#ifdef CONFIG_PARAVIRT_XXL +#include <asm/paravirt.h> +#else +#define tss_update_io_bitmap native_tss_update_io_bitmap +#endif +#else static inline void io_bitmap_share (struct task_struct *tsk) { }static inline void io_bitmap_exit (void ) { }
arch/x86/include/asm/paravirt.h +7 -0
@@ -295,6 +295,13 @@ static inline void write_idt_entry(gate_desc *dt, int entry, const gate_desc *g)PVOP_VCALL3 (cpu.write_idt_entry, dt, entry, g); } +#ifdef CONFIG_X86_IOPL_IOPERM +static inline void tss_update_io_bitmap (void ) +{ +PVOP_VCALL0 (cpu.update_io_bitmap); +} +#endif +static inline void paravirt_activate_mm (struct mm_struct *prev,struct mm_struct *next) {
arch/x86/include/asm/paravirt_types.h +4 -0
@@ -140,6 +140,10 @@ struct pv_cpu_ops {void (*load_sp0)(unsigned long sp0); +#ifdef CONFIG_X86_IOPL_IOPERM +void (*update_io_bitmap)(void ); +#endif +void (*wbinvd)(void );/* cpuid emulation, mostly so that caps bits can be disabled */
arch/x86/kernel/paravirt.c +5 -0
@@ -30,6 +30,7 @@#include <asm/timer.h> #include <asm/special_insns.h> #include <asm/tlb.h> +#include <asm/io_bitmap.h> /* * nop stub, which must not clobber anything *including the stack* to
@@ -341,6 +342,10 @@ struct paravirt_patch_template pv_ops = { .cpu.iret = native_iret, .cpu.swapgs = native_swapgs, +#ifdef CONFIG_X86_IOPL_IOPERM + .cpu.update_io_bitmap = native_tss_update_io_bitmap, +#endif + .cpu.start_context_switch = paravirt_nop, .cpu.end_context_switch = paravirt_nop,
arch/x86/kernel/process.c +1 -1
@@ -374,7 +374,7 @@ static void tss_copy_io_bitmap(struct tss_struct *tss, struct io_bitmap *iobm)/** * tss_update_io_bitmap - Update I/O bitmap before exiting to usermode */ -void tss_update_io_bitmap (void ) +void native_tss_update_io_bitmap (void ) {struct tss_struct *tss =this_cpu_ptr (&cpu_tss_rw);struct thread_struct *t = ¤t->thread;
arch/x86/xen/enlighten_pv.c +25 -0
@@ -72,6 +72,9 @@#include <asm/mwait.h> #include <asm/pci_x86.h> #include <asm/cpu.h> +#ifdef CONFIG_X86_IOPL_IOPERM +#include <asm/io_bitmap.h> +#endif #ifdef CONFIG_ACPI #include <linux/acpi.h>
@@ -837,6 +840,25 @@ static void xen_load_sp0(unsigned long sp0)this_cpu_write (cpu_tss_rw.x86_tss.sp0, sp0); } +#ifdef CONFIG_X86_IOPL_IOPERM +static void xen_update_io_bitmap (void ) +{ +struct physdev_set_iobitmap iobitmap; +struct tss_struct *tss =this_cpu_ptr (&cpu_tss_rw); + +native_tss_update_io_bitmap (); + + iobitmap.bitmap = (uint8_t *)(&tss->x86_tss) + + tss->x86_tss.io_bitmap_base; +if (tss->x86_tss.io_bitmap_base ==IO_BITMAP_OFFSET_INVALID ) + iobitmap.nr_ports =0 ; +else + iobitmap.nr_ports =IO_BITMAP_BITS ; + +HYPERVISOR_physdev_op (PHYSDEVOP_set_iobitmap, &iobitmap); +} +#endif +static void xen_io_delay (void ) { }
@@ -1047,6 +1069,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = { .write_idt_entry = xen_write_idt_entry, .load_sp0 = xen_load_sp0, +#ifdef CONFIG_X86_IOPL_IOPERM + .update_io_bitmap = xen_update_io_bitmap, +#endif .io_delay = xen_io_delay,/* Xen takes care of %gs when switching to usermode for us */