um: Allow building and running on older hosts
PATCH 1/2 um: Allow building and running on older hosts
commit 0a987645672ebde7844a9c0732a5a25f3d4bb6c6 upstream.
Commit a78ff1112263 ("um: add extended processor state save/restore support") and b6024b21fec8 ("um: extend fpstate to _xstate to support YMM registers") forced the use of the x86 FP _xstate and PTRACE_GETREGSET/SETREGSET. On older hosts, we would neither be able to build UML nor run it anymore with these two commits applied because we don't have definitions for struct _xstate nor these two ptrace requests.
We can determine at build time which fp context structure to check against, just like we can keep using the old i387 fp save/restore if PTRACE_GETRESET/SETREGSET are not defined.
--- arch/x86/um/os-Linux/registers.c | 12 ++++++++---- arch/x86/um/user-offsets.c | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-)
arch/x86/um/os-Linux/registers.c +8 -4
@@ -26,6 +26,7 @@ int save_i387_registers(int pid, unsigned long *fp_regs)int save_fp_registers (int pid,unsigned long *fp_regs) { +#ifdef PTRACE_GETREGSET struct iovec iov;if (have_xstate_support) {
@@ -34,9 +35,9 @@ int save_fp_registers(int pid, unsigned long *fp_regs)if (ptrace (PTRACE_GETREGSET , pid,NT_X86_XSTATE , &iov) <0 )return -errno; return 0; - }else { + } else +#endif return save_i387_registers (pid, fp_regs); - } }int restore_i387_registers (int pid,unsigned long *fp_regs)
@@ -48,6 +49,7 @@ int restore_i387_registers(int pid, unsigned long *fp_regs)int restore_fp_registers (int pid,unsigned long *fp_regs) { +#ifdef PTRACE_SETREGSET struct iovec iov;if (have_xstate_support) {
@@ -56,9 +58,9 @@ int restore_fp_registers(int pid, unsigned long *fp_regs)if (ptrace (PTRACE_SETREGSET , pid,NT_X86_XSTATE , &iov) <0 )return -errno; return 0; - }else { + } else +#endif return restore_i387_registers (pid, fp_regs); - } }#ifdef __i386__
@@ -122,6 +124,7 @@ int put_fp_registers(int pid, unsigned long *regs)void arch_init_registers (int pid) { +#ifdef PTRACE_GETREGSET struct _xstate fp_regs;struct iovec iov;
@@ -129,6 +132,7 @@ void arch_init_registers(int pid) iov.iov_len =sizeof (struct _xstate );if (ptrace (PTRACE_GETREGSET , pid,NT_X86_XSTATE , &iov) ==0 ) have_xstate_support =1 ; +#endif }#endif
arch/x86/um/user-offsets.c +4 -0
@@ -50,7 +50,11 @@ void foo(void)DEFINE (HOST_GS ,GS );DEFINE (HOST_ORIG_AX ,ORIG_EAX );#else +#if defined(PTRACE_GETREGSET ) && defined(PTRACE_SETREGSET )DEFINE (HOST_FP_SIZE ,sizeof (struct _xstate ) /sizeof (unsigned long )); +#else +DEFINE (HOST_FP_SIZE ,sizeof (struct _fpstate ) /sizeof (unsigned long )); +#endif DEFINE_LONGS (HOST_BX ,RBX );DEFINE_LONGS (HOST_CX ,RCX );DEFINE_LONGS (HOST_DI ,RDI );
Signature · 1 line
2.22.0.657.g960e92d24f-goog
PATCH 2/2 um: Fix FP register size for XSTATE/XSAVE
From: Thomas Meyer <[email protected]>
commit 6f602afda7275c24c20ba38b5b6cd4ed08561fff upstream.
Hard code max size. Taken from
https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=gdb/common/x86-xstate.h
--- arch/um/include/asm/thread_info.h | 3 +++ arch/um/include/shared/os.h | 2 +- arch/um/kernel/process.c | 4 ++-- arch/um/os-Linux/skas/process.c | 17 ++++++++--------- arch/x86/um/os-Linux/registers.c | 18 ++++++++++++------ arch/x86/um/user-offsets.c | 4 ++-- 6 files changed, 28 insertions(+), 20 deletions(-)
arch/um/include/asm/thread_info.h +3 -0
@@ -11,6 +11,7 @@#include <asm/types.h> #include <asm/page.h> #include <asm/segment.h> +#include <sysdep/ptrace_user.h> struct thread_info {struct task_struct *task;/* main task structure */
@@ -22,6 +23,8 @@ struct thread_info {0-0xBFFFFFFF for user 0-0xFFFFFFFF for kernel */ struct thread_info *real_thread;/* Points to non-IRQ stack */ +unsigned long aux_fp_regs[FP_SIZE ];/* auxiliary fp_regs to save/restore +them out-of-band */ };#define INIT_THREAD_INFO (tsk) \
arch/um/include/shared/os.h +1 -1
@@ -274,7 +274,7 @@ extern int protect(struct mm_id * mm_idp, unsigned long addr,extern int is_skas_winch (int pid,int fd,void *data);extern int start_userspace (unsigned long stub_stack);extern int copy_context_skas0 (unsigned long stack,int pid); -extern void userspace (struct uml_pt_regs *regs); +extern void userspace (struct uml_pt_regs *regs,unsigned long *aux_fp_regs);extern int map_stub_pages (int fd,unsigned long code,unsigned long data,unsigned long stack);extern void new_thread (void *stack,jmp_buf *buf,void (*handler)(void ));
arch/um/kernel/process.c +2 -2
@@ -128,7 +128,7 @@ void new_thread_handler(void)* callback returns only if the kernel thread execs a process */ n =fn (arg); -userspace (¤t->thread.regs.regs); +userspace (¤t->thread.regs.regs,current_thread_info ()->aux_fp_regs); }/* Called magically, see new_thread_handler above */
@@ -147,7 +147,7 @@ void fork_handler(void) current->thread.prev_sched =NULL ; -userspace (¤t->thread.regs.regs); +userspace (¤t->thread.regs.regs,current_thread_info ()->aux_fp_regs); } int copy_thread(unsigned long clone_flags, unsigned long sp,
arch/um/os-Linux/skas/process.c +8 -9
@@ -87,12 +87,11 @@ void wait_stub_done(int pid)extern unsigned long current_stub_stack (void ); -static void get_skas_faultinfo (int pid,struct faultinfo *fi) +static void get_skas_faultinfo (int pid,struct faultinfo *fi,unsigned long *aux_fp_regs) {int err; -unsigned long fpregs[FP_SIZE ]; - err =get_fp_registers (pid, fpregs); + err =get_fp_registers (pid, aux_fp_regs);if (err <0 ) {printk (UM_KERN_ERR "save_fp_registers returned %d\n" , err);
@@ -112,7 +111,7 @@ static void get_skas_faultinfo(int pid, struct faultinfo *fi)*/ memcpy (fi, (void *)current_stub_stack (),sizeof (*fi)); - err =put_fp_registers (pid, fpregs); + err =put_fp_registers (pid, aux_fp_regs);if (err <0 ) {printk (UM_KERN_ERR "put_fp_registers returned %d\n" , err);
@@ -120,9 +119,9 @@ static void get_skas_faultinfo(int pid, struct faultinfo *fi) } } -static void handle_segv (int pid,struct uml_pt_regs * regs) +static void handle_segv (int pid,struct uml_pt_regs *regs,unsigned long *aux_fp_regs) { -get_skas_faultinfo (pid, ®s->faultinfo); +get_skas_faultinfo (pid, ®s->faultinfo, aux_fp_regs);segv (regs->faultinfo,0 ,1 ,NULL ); }
@@ -305,7 +304,7 @@ int start_userspace(unsigned long stub_stack)return err; } -void userspace (struct uml_pt_regs *regs) +void userspace (struct uml_pt_regs *regs,unsigned long *aux_fp_regs) {int err, status, op, pid = userspace_pid[0 ];/* To prevent races if using_sysemu changes under us.*/
@@ -374,11 +373,11 @@ void userspace(struct uml_pt_regs *regs)case SIGSEGV :if (PTRACE_FULL_FAULTINFO ) {get_skas_faultinfo (pid, - ®s->faultinfo); + ®s->faultinfo, aux_fp_regs); (*sig_info[SIGSEGV ])(SIGSEGV , (struct siginfo *)&si, regs); } -else handle_segv (pid, regs); +else handle_segv (pid, regs, aux_fp_regs);break ;case SIGTRAP +0x80 :handle_trap (pid, regs, local_using_sysemu);
arch/x86/um/os-Linux/registers.c +12 -6
@@ -5,6 +5,7 @@*/ #include <errno.h> +#include <stdlib.h> #include <sys/ptrace.h> #ifdef __i386__#include <sys/user.h>
@@ -31,7 +32,7 @@ int save_fp_registers(int pid, unsigned long *fp_regs)if (have_xstate_support) { iov.iov_base = fp_regs; - iov.iov_len =sizeof (struct _xstate ); + iov.iov_len =FP_SIZE *sizeof (unsigned long );if (ptrace (PTRACE_GETREGSET , pid,NT_X86_XSTATE , &iov) <0 )return -errno;return 0 ;
@@ -51,10 +52,9 @@ int restore_fp_registers(int pid, unsigned long *fp_regs) {#ifdef PTRACE_SETREGSET struct iovec iov; -if (have_xstate_support) { iov.iov_base = fp_regs; - iov.iov_len =sizeof (struct _xstate ); + iov.iov_len =FP_SIZE *sizeof (unsigned long );if (ptrace (PTRACE_SETREGSET , pid,NT_X86_XSTATE , &iov) <0 )return -errno;return 0 ;
@@ -125,13 +125,19 @@ int put_fp_registers(int pid, unsigned long *regs)void arch_init_registers (int pid) {#ifdef PTRACE_GETREGSET -struct _xstate fp_regs; +void * fp_regs;struct iovec iov; - iov.iov_base = &fp_regs; - iov.iov_len =sizeof (struct _xstate ); + fp_regs =malloc (FP_SIZE *sizeof (unsigned long )); +if (fp_regs ==NULL ) +return ; + + iov.iov_base = fp_regs; + iov.iov_len =FP_SIZE *sizeof (unsigned long );if (ptrace (PTRACE_GETREGSET , pid,NT_X86_XSTATE , &iov) ==0 ) have_xstate_support =1 ; + +free (fp_regs);#endif }#endif
arch/x86/um/user-offsets.c +2 -2
@@ -50,8 +50,8 @@ void foo(void)DEFINE (HOST_GS ,GS );DEFINE (HOST_ORIG_AX ,ORIG_EAX );#else -#if defined(PTRACE_GETREGSET ) && defined(PTRACE_SETREGSET ) -DEFINE (HOST_FP_SIZE ,sizeof (struct _xstate ) /sizeof (unsigned long )); +#ifdef FP_XSTATE_MAGIC1 +DEFINE_LONGS (HOST_FP_SIZE ,2696 );#else DEFINE (HOST_FP_SIZE ,sizeof (struct _fpstate ) /sizeof (unsigned long ));#endif
Signature · 1 line
2.22.0.657.g960e92d24f-goog
Greg KH
maintainerQuoted 9 lines · Alessio Balsini
commit
0a987645672ebde7844a9c0732a5a25f3d4bb6c6upstream.Commit
a78ff1112263("um: add extended processor state save/restore support") andb6024b21fec8("um: extend fpstate to_xstateto support YMM registers") forced the use of the x86 FP_xstateand PTRACE_GETREGSET/SETREGSET. On older hosts, we would neither be able to build UML nor run it anymore with these two commits applied because we don't have definitions for struct_xstatenor these two ptrace requests.
Quoted 7 lines
We can determine at build time which fp context structure to check against, just like we can keep using the old i387 fp save/restore if PTRACE_GETRESET/SETREGSET are not defined.
Fixes a78ff1112263 ("um: add extended processor state save/restore support")Fixes b6024b21fec8 ("um: extend fpstate to _xstate to support YMM registers")Change-Id I2cda034c8a6637de392c2740a993982ad132bda5
No need for change-id in upstream patches :)
let me see if I can just take what is already in 4.13 directly...
Sasha Levin
maintainerQuoted 14 lines · Greg KH
Quoted 13 lines · Alessio Balsini
commit
0a987645672ebde7844a9c0732a5a25f3d4bb6c6upstream.Commit
a78ff1112263("um: add extended processor state save/restore support") andb6024b21fec8("um: extend fpstate to_xstateto support YMM registers") forced the use of the x86 FP_xstateand PTRACE_GETREGSET/SETREGSET. On older hosts, we would neither be able to build UML nor run it anymore with these two commits applied because we don't have definitions for struct_xstatenor these two ptrace requests.We can determine at build time which fp context structure to check against, just like we can keep using the old i387 fp save/restore if PTRACE_GETRESET/SETREGSET are not defined.
Quoted 7 lines
Quoted 3 lines
Fixes a78ff1112263 ("um: add extended processor state save/restore support")Fixes b6024b21fec8 ("um: extend fpstate to _xstate to support YMM registers")Change-Id I2cda034c8a6637de392c2740a993982ad132bda5No need for change-id in upstream patches :)
let me see if I can just take what is already in 4.13 directly...
Alessio,
Do we also need 2fb44600fe784 ("um: Fix check for _xstate for older hosts")?
--
Thanks,
Sasha