Use correct trap number for *BSD
v2 cover Use correct trap number for *BSD
This is a resend of a patch I sent back in March that was missing the proper includes due to a rebasing mistake.
The issue is that all the BSDs use T_PAGEFLT to signal a page fault on x86, while linux uses 0xe. The patch harmonizes the different ways this can be spelled, as explained in the patch itself.
Warner Losh (1):
tcg: Use correct trap number for page faults on *BSD systems
accel/tcg/user-exec.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
Signature · 1 line
2.22.1
v2 cover Use correct trap number for *BSD
This is a resend of a patch I sent back in March that was missing the proper includes due to a rebasing mistake.
Warner Losh (1):
tcg: Use correct trap number for page faults on *BSD systems
accel/tcg/user-exec.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
Signature · 1 line
2.22.1
PATCH v2 1/1 tcg: Use correct trap number for page faults on *BSD systems
In reply to Warner LoshThe trap number for a page fault on BSD systems is T_PAGEFLT not 0xe. 0xe is used by Linux and represents the intel hardware trap vector. The BSD kernels, however, translate this to T_PAGEFLT in their Xpage, Xtrap0e, Xtrap14, etc fault handlers. This is true for i386 and x86_64, though the name of the trap hanlder can very on the flavor of BSD. As far as I can tell, Linux doesn't provide a define for this value. Invent a new one (PAGE_FAULT_TRAP) and use it instead to avoid uglier ifdefs.
--- accel/tcg/user-exec.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
accel/tcg/user-exec.c +18 -2
@@ -254,28 +254,35 @@ void *probe_access(CPUArchState *env, target_ulong addr, int size,#if defined(__NetBSD__)#include <ucontext.h> +#include <machine/trap.h> #define EIP_sig (context) ((context)->uc_mcontext.__gregs[_REG_EIP])#define TRAP_sig (context) ((context)->uc_mcontext.__gregs[_REG_TRAPNO])#define ERROR_sig (context) ((context)->uc_mcontext.__gregs[_REG_ERR])#define MASK_sig (context) ((context)->uc_sigmask) +#define PAGE_FAULT_TRAP T_PAGEFLT#elif defined(__FreeBSD__) || defined(__DragonFly__)#include <ucontext.h> +#include <machine/trap.h> #define EIP_sig (context) (*((unsigned long *)&(context)->uc_mcontext.mc_eip))#define TRAP_sig (context) ((context)->uc_mcontext.mc_trapno)#define ERROR_sig (context) ((context)->uc_mcontext.mc_err)#define MASK_sig (context) ((context)->uc_sigmask) +#define PAGE_FAULT_TRAP T_PAGEFLT#elif defined(__OpenBSD__) +#include <machine/trap.h> #define EIP_sig (context) ((context)->sc_eip)#define TRAP_sig (context) ((context)->sc_trapno)#define ERROR_sig (context) ((context)->sc_err)#define MASK_sig (context) ((context)->sc_mask) +#define PAGE_FAULT_TRAP T_PAGEFLT#else #define EIP_sig (context) ((context)->uc_mcontext.gregs[REG_EIP])#define TRAP_sig (context) ((context)->uc_mcontext.gregs[REG_TRAPNO])#define ERROR_sig (context) ((context)->uc_mcontext.gregs[REG_ERR])#define MASK_sig (context) ((context)->uc_sigmask) +#define PAGE_FAULT_TRAP 0xe#endif int cpu_signal_handler(int host_signum, void *pinfo,
@@ -301,34 +308,42 @@ int cpu_signal_handler(int host_signum, void *pinfo, pc =EIP_sig (uc); trapno =TRAP_sig (uc);return handle_cpu_signal (pc, info, - trapno ==0xe ? (ERROR_sig (uc) >>1 ) &1 :0 , + trapno ==PAGE_FAULT_TRAP ? + (ERROR_sig (uc) >>1 ) &1 :0 , &MASK_sig (uc)); }#elif defined(__x86_64__)#ifdef __NetBSD__ +#include <machine/trap.h> #define PC_sig (context) _UC_MACHINE_PC(context)#define TRAP_sig (context) ((context)->uc_mcontext.__gregs[_REG_TRAPNO])#define ERROR_sig (context) ((context)->uc_mcontext.__gregs[_REG_ERR])#define MASK_sig (context) ((context)->uc_sigmask) +#define PAGE_FAULT_TRAP T_PAGEFLT#elif defined(__OpenBSD__) +#include <machine/trap.h> #define PC_sig (context) ((context)->sc_rip)#define TRAP_sig (context) ((context)->sc_trapno)#define ERROR_sig (context) ((context)->sc_err)#define MASK_sig (context) ((context)->sc_mask) +#define PAGE_FAULT_TRAP T_PAGEFLT#elif defined(__FreeBSD__) || defined(__DragonFly__)#include <ucontext.h> +#include <machine/trap.h> #define PC_sig (context) (*((unsigned long *)&(context)->uc_mcontext.mc_rip))#define TRAP_sig (context) ((context)->uc_mcontext.mc_trapno)#define ERROR_sig (context) ((context)->uc_mcontext.mc_err)#define MASK_sig (context) ((context)->uc_sigmask) +#define PAGE_FAULT_TRAP T_PAGEFLT#else #define PC_sig (context) ((context)->uc_mcontext.gregs[REG_RIP])#define TRAP_sig (context) ((context)->uc_mcontext.gregs[REG_TRAPNO])#define ERROR_sig (context) ((context)->uc_mcontext.gregs[REG_ERR])#define MASK_sig (context) ((context)->uc_sigmask) +#define PAGE_FAULT_TRAP 0xe#endif int cpu_signal_handler(int host_signum, void *pinfo,
@@ -346,7 +361,8 @@ int cpu_signal_handler(int host_signum, void *pinfo, pc =PC_sig (uc);return handle_cpu_signal (pc, info, -TRAP_sig (uc) ==0xe ? (ERROR_sig (uc) >>1 ) &1 :0 , +TRAP_sig (uc) ==PAGE_FAULT_TRAP ? + (ERROR_sig (uc) >>1 ) &1 :0 , &MASK_sig (uc)); }
Signature · 1 line
2.22.1
Re: [PATCH v2 1/1] tcg: Use correct trap number for page faults on *BSD systems
Quoted 8 lines · Warner Losh
The trap number for a page fault on BSD systems is
T_PAGEFLTnot0xe.0xeis used by Linux and represents the intel hardware trap vector. The BSD kernels, however, translate this toT_PAGEFLTin their Xpage, Xtrap0e, Xtrap14, etc fault handlers. This is true for i386 andx86_64, though the name of the trap hanlder can very on the flavor of BSD. As far as I can tell, Linux doesn't provide a define for this value. Invent a new one (PAGE_FAULT_TRAP) and use it instead to avoid uglier ifdefs.
Quoted 7 lines
Signed-off-by Mark Johnston<[email protected]>Signed-off-by Juergen Lock<[email protected]>[ Rework to avoid ifdefs and expand it to i386 ]Signed-off-by Warner Losh<[email protected]>--- accel/tcg/user-exec.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
Thanks, queued to tcg-next.
r~
Quoted 8 lines · Warner Losh
This is a resend of a patch I sent back in March that was missing the proper
includes due to a rebasing mistake.The issue is that all the BSDs use
T_PAGEFLTto signal a page fault on x86, while linux uses0xe. The patch harmonizes the different ways this can be spelled, as explained in the patch itself.
I forgot to mention that I've setup NetBSD and OpenBSD bhyve instances to compile and test these changes to make double sure that they will pass through the qemu CI.
Quoted 10 lines
Warner Losh (1):
tcg: Use correct trap number for page faults on *BSD systemsaccel/tcg/user-exec.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)--
2.22.1