Date: Fri, 25 Jul 2014 15:12:49 GMT From: op@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r271366 - soc2014/op/freebsd-base/sys/amd64/amd64 Message-ID: <201407251512.s6PFCnYT086675@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: op Date: Fri Jul 25 15:12:49 2014 New Revision: 271366 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271366 Log: KSP SMAP: use selfpatch for stac, clac in sys/amd64/amd64/exception.S Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com> git: https://github.com/opntr/opBSD/tree/op/gsoc2014/kpatch Modified: soc2014/op/freebsd-base/sys/amd64/amd64/exception.S Modified: soc2014/op/freebsd-base/sys/amd64/amd64/exception.S ============================================================================== --- soc2014/op/freebsd-base/sys/amd64/amd64/exception.S Fri Jul 25 14:47:44 2014 (r271365) +++ soc2014/op/freebsd-base/sys/amd64/amd64/exception.S Fri Jul 25 15:12:49 2014 (r271366) @@ -42,6 +42,7 @@ #include <machine/psl.h> #include <machine/trap.h> #include <machine/specialreg.h> +#include <machine/selfpatch-asmacros.h> #include "assym.s" @@ -198,7 +199,7 @@ movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) movl $TF_HASSEGS,TF_FLAGS(%rsp) - clac + _clac cld FAKE_MCOUNT(TF_RIP(%rsp)) #ifdef KDTRACE_HOOKS @@ -279,7 +280,7 @@ movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) movl $TF_HASSEGS,TF_FLAGS(%rsp) - clac + _clac cld testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ @@ -383,7 +384,7 @@ movq %r14,TF_R14(%rsp) /* C preserved */ movq %r15,TF_R15(%rsp) /* C preserved */ movl $TF_HASSEGS,TF_FLAGS(%rsp) - clac + _clac cld FAKE_MCOUNT(TF_RIP(%rsp)) movq PCPU(CURTHREAD),%rdi @@ -455,7 +456,7 @@ */ IDTVEC(nmi) - clac /* XXXOP */ + _clac subq $TF_RIP,%rsp movl $(T_NMI),TF_TRAPNO(%rsp) movq $0,TF_ADDR(%rsp) @@ -539,7 +540,7 @@ movq %rdx,%rdi /* destination stack pointer */ shrq $3,%rcx /* trap frame size in long words */ - clac /* XXXOP */ + _clac cld rep movsq /* copy trapframe */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407251512.s6PFCnYT086675>