 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpufunc.S,v 1.63 2020/06/24 18:09:37 maxv Exp $	*/
+/*	$NetBSD: cpufunc.S,v 1.64 2020/07/19 07:35:08 maxv Exp $	*/
 /*
  * Copyright (c) 1998, 2007, 2008, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -436,20 +436,23 @@ ENTRY(outw)
 	movq	%rdi, %rdx
 	movq	%rsi, %rax
 	outw	%ax, %dx
 	ret
 END(outw)
 ENTRY(outl)
 	movq	%rdi, %rdx
 	movq	%rsi, %rax
 	outl	%eax, %dx
 	ret
 END(outl)
-ENTRY(x86_movs)
+/*
  * Used by SVS only, to make an atomic but fast copy. Doesn't have
  * sanitizer instrumentation, but sanitizers disable SVS, so no problem.
  */
 ENTRY(svs_quad_copy)
 	movq	%rdx,%rcx
 	KMSAN_REP_STOS(8)
 	rep
 	movsq
 	ret
-END(x86_movs)
+END(svs_quad_copy)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: frameasm.h,v 1.51 2020/06/21 16:53:37 bouyer Exp $	*/
+/*	$NetBSD: frameasm.h,v 1.52 2020/07/19 07:35:08 maxv Exp $	*/
 #ifndef _AMD64_MACHINE_FRAMEASM_H
 #define _AMD64_MACHINE_FRAMEASM_H
 #ifdef _KERNEL_OPT
 #include "opt_xen.h"
 #include "opt_svs.h"
 #include "opt_kcov.h"
 #include "opt_kmsan.h"
 #endif
 /*
  * Macros to define pushing/popping frames for interrupts, traps
 @@ -266,53 +266,31 @@
 	pushq	%r10			; \
 	pushq	%r11			; \
 	movq	$sz,%rdi		; \
 	callq	_C_LABEL(kmsan_init_ret); \
 	popq	%r11			; \
 	popq	%r10			; \
 	popq	%r9			; \
 	popq	%r8			; \
 	popq	%rdi			; \
 	popq	%rsi			; \
 	popq	%rdx			; \
 	popq	%rcx			; \
 	popq	%rax
 #define KMSAN_REP_STOS(scale)	\
 	pushq	%rax			; \
 	pushq	%rcx			; \
 	pushq	%rdx			; \
 	pushq	%rsi			; \
 	pushq	%rdi			; \
 	pushq	%r8			; \
 	pushq	%r9			; \
 	pushq	%r10			; \
 	pushq	%r11			; \
 	leaq	(,%rcx,scale),%rsi	; \
 	callq	_C_LABEL(__msan_instrument_asm_store); \
 	popq	%r11			; \
 	popq	%r10			; \
 	popq	%r9			; \
 	popq	%r8			; \
 	popq	%rdi			; \
 	popq	%rsi			; \
 	popq	%rdx			; \
 	popq	%rcx			; \
 	popq	%rax
 #else
 #define KMSAN_ENTER		/* nothing */
 #define KMSAN_LEAVE		/* nothing */
 #define KMSAN_INIT_ARG(sz)	/* nothing */
 #define KMSAN_INIT_RET(sz)	/* nothing */
 #define	KMSAN_REP_STOS(scale)	/* nothing */
 #endif
 #ifdef KCOV
 #define KCOV_DISABLE			\
 	incl	CPUVAR(IDEPTH)
 #define KCOV_ENABLE			\
 	decl	CPUVAR(IDEPTH)
 #else
 #define KCOV_DISABLE		/* nothing */
 #define KCOV_ENABLE		/* nothing */
 #endif
 #define	INTRENTRY \

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpufunc.S,v 1.48 2020/06/24 18:09:37 maxv Exp $	*/
+/*	$NetBSD: cpufunc.S,v 1.49 2020/07/19 07:35:08 maxv Exp $	*/
 /*-
  * Copyright (c) 1998, 2007, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -28,27 +28,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Functions to provide access to i386-specific instructions.
+ *
  * These are shared with NetBSD/xen.
  */
 #include <sys/errno.h>
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.48 2020/06/24 18:09:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.49 2020/07/19 07:35:08 maxv Exp $");
 #include "opt_xen.h"
 #include <machine/specialreg.h>
 #include <machine/segments.h>
 #include "assym.h"
 ENTRY(x86_lfence)
 	lock
 	addl	$0, -4(%esp)
 	ret
 END(x86_lfence)
 @@ -343,29 +343,13 @@ END(outb)
 ENTRY(outw)
 	movl	4(%esp), %edx
 	movl	8(%esp), %eax
 	outw	%ax, %dx
 	ret
 END(outw)
 ENTRY(outl)
 	movl	4(%esp), %edx
 	movl	8(%esp), %eax
 	outl	%eax, %dx
 	ret
 END(outl)
 ENTRY(x86_movs)
 	pushl	%ebp
 	movl	%esp,%ebp
 	pushl	%edi
 	pushl	%esi
 	movl	8(%ebp),%edi
 	movl	12(%ebp),%esi
 	movl	16(%ebp),%ecx
 	rep
 	movsl
 	popl	%esi
 	popl	%edi
 	leave
 	ret
 END(x86_movs)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.h,v 1.124 2020/07/14 00:45:53 yamaguchi Exp $	*/
+/*	$NetBSD: pmap.h,v 1.125 2020/07/19 07:35:08 maxv Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -602,18 +602,18 @@ extern vaddr_t pmap_direct_end;
 #define PMAP_DIRECT_END		pmap_direct_end
 #define PMAP_DIRECT_MAP(pa)	((vaddr_t)PMAP_DIRECT_BASE + (pa))
 #define PMAP_DIRECT_UNMAP(va)	((paddr_t)(va) - PMAP_DIRECT_BASE)
 /*
  * Alternate mapping hooks for pool pages.
  */
 #define PMAP_MAP_POOLPAGE(pa)	PMAP_DIRECT_MAP((pa))
 #define PMAP_UNMAP_POOLPAGE(va)	PMAP_DIRECT_UNMAP((va))
 #endif /* __HAVE_DIRECT_MAP */
-void	x86_movs(void *, void *, long);
+void	svs_quad_copy(void *, void *, long);
 #endif /* _KERNEL */
 #endif /* _X86_PMAP_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: svs.c,v 1.38 2020/07/14 00:45:53 yamaguchi Exp $	*/
+/*	$NetBSD: svs.c,v 1.39 2020/07/19 07:35:08 maxv Exp $	*/
 /*
  * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.38 2020/07/14 00:45:53 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.39 2020/07/19 07:35:08 maxv Exp $");
 #include "opt_svs.h"
 #include "opt_user_ldt.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/cpu.h>
 #include <sys/kauth.h>
 #include <sys/sysctl.h>
 #include <sys/xcall.h>
 #include <sys/reboot.h>
 @@ -694,27 +694,27 @@ svs_pdir_switch(struct pmap *pmap)
+{
 	struct cpu_info *ci = curcpu();
 	struct svs_utls *utls;
 	KASSERT(kpreempt_disabled());
 	KASSERT(pmap != pmap_kernel());
 	/* Update the info in the UTLS page */
 	utls = (struct svs_utls *)ci->ci_svs_utls;
 	utls->kpdirpa = pmap_pdirpa(pmap, 0) | svs_pcid_kcr3;
 	/* Copy user slots. */
 	mutex_enter(&ci->ci_svs_mtx);
-	x86_movs(ci->ci_svs_updir, pmap->pm_pdir, PDIR_SLOT_USERLIM);
+	svs_quad_copy(ci->ci_svs_updir, pmap->pm_pdir, PDIR_SLOT_USERLIM);
 	mutex_exit(&ci->ci_svs_mtx);
 	if (svs_pcid) {
 		invpcid(INVPCID_CONTEXT, PMAP_PCID_USER, 0);
+	}
+}
 static void
 svs_enable(void)
+{
 	svs_enabled = true;
 	x86_hotpatch(HP_NAME_SVS_ENTER, 0);