 @@ -1,14 +1,14 @@
-/*	$NetBSD: msan.h,v 1.1 2019/11/14 16:23:52 maxv Exp $	*/
+/*	$NetBSD: msan.h,v 1.2 2020/04/15 16:28:29 maxv Exp $	*/
 /*
  * Copyright (c) 2019 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.
 @@ -87,51 +87,82 @@ kmsan_md_addr_to_orig(const void *addr)
+	}
+}
 static inline bool
 kmsan_md_unsupported(vaddr_t addr)
+{
 	return (addr >= (vaddr_t)PTE_BASE &&
 	    addr < ((vaddr_t)PTE_BASE + NBPD_L4));
+}
 static inline paddr_t
 __md_palloc(void)
+{
 	/* The page is zeroed. */
 	return pmap_get_physpage();
+}
 static inline paddr_t
 __md_palloc_large(void)
+{
 	struct pglist pglist;
 	int ret;
 	if (!uvm.page_init_done)
 		return 0;
 	kmsan_init_arg(sizeof(psize_t) + 4 * sizeof(paddr_t) +
 	    sizeof(struct pglist *) + 2 * sizeof(int));
 	ret = uvm_pglistalloc(NBPD_L2, 0, ~0UL, NBPD_L2, 0,
 	    &pglist, 1, 0);
 	if (ret != 0)
 		return 0;
 	/* The page may not be zeroed. */
 	return VM_PAGE_TO_PHYS(TAILQ_FIRST(&pglist));
+}
 static void
 kmsan_md_shadow_map_page(vaddr_t va)
+{
 	const pt_entry_t pteflags = PTE_W | pmap_pg_nx | PTE_P;
 	paddr_t pa;
 	KASSERT(va >= __MD_SHADOW_START && va < __MD_SHADOW_END);
 	if (!pmap_valid_entry(L4_BASE[pl4_i(va)])) {
 		pa = __md_palloc();
-		L4_BASE[pl4_i(va)] = pa | PTE_W | pmap_pg_nx | PTE_P;
+		L4_BASE[pl4_i(va)] = pa | pteflags;
+	}
 	if (!pmap_valid_entry(L3_BASE[pl3_i(va)])) {
 		pa = __md_palloc();
-		L3_BASE[pl3_i(va)] = pa | PTE_W | pmap_pg_nx | PTE_P;
+		L3_BASE[pl3_i(va)] = pa | pteflags;
+	}
 	if (!pmap_valid_entry(L2_BASE[pl2_i(va)])) {
 		if ((pa = __md_palloc_large()) != 0) {
 			L2_BASE[pl2_i(va)] = pa | pteflags | PTE_PS |
 			    pmap_pg_g;
 			__insn_barrier();
 			__builtin_memset(va, 0, NBPD_L2);
 			return;
+		}
 		pa = __md_palloc();
-		L2_BASE[pl2_i(va)] = pa | PTE_W | pmap_pg_nx | PTE_P;
+		L2_BASE[pl2_i(va)] = pa | pteflags;
 	} else if (L2_BASE[pl2_i(va)] & PTE_PS) {
 		return;
+	}
 	if (!pmap_valid_entry(L1_BASE[pl1_i(va)])) {
 		pa = __md_palloc();
-		L1_BASE[pl1_i(va)] = pa | PTE_W | pmap_pg_g | pmap_pg_nx | PTE_P;
+		L1_BASE[pl1_i(va)] = pa | pteflags | pmap_pg_g;
+	}
+}
 static void
 kmsan_md_init(void)
+{
 	extern struct bootspace bootspace;
 	size_t i;
 	CTASSERT((__MD_SHADOW_SIZE / NBPD_L4) == NL4_SLOT_KMSAN);
 	/* Kernel. */
 	for (i = 0; i < BTSPACE_NSEGS; i++) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_msan.c,v 1.9 2020/04/03 18:26:14 maxv Exp $	*/
+/*	$NetBSD: subr_msan.c,v 1.10 2020/04/15 16:28:28 maxv Exp $	*/
 /*
  * Copyright (c) 2019-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,46 +20,49 @@
  * ``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: subr_msan.c,v 1.9 2020/04/03 18:26:14 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_msan.c,v 1.10 2020/04/15 16:28:28 maxv Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/kprintf.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/cpu.h>
 #include <sys/msan.h>
 #include <uvm/uvm.h>
 static void kmsan_printf(const char *, ...);
 void kmsan_init_arg(size_t);
 void kmsan_init_ret(size_t);
 #ifdef KMSAN_PANIC
 #define REPORT panic
 #else
 #define REPORT kmsan_printf
 #endif
 /* -------------------------------------------------------------------------- */
 /*
  * Part of the compiler ABI.
  */
 typedef uint32_t msan_orig_t;
 @@ -346,29 +349,26 @@ kmsan_shadow_check(const void *addr, siz
 		return;
 	if (__predict_false(kmsan_md_unsupported((vaddr_t)addr)))
 		return;
 	shad = kmsan_md_addr_to_shad(addr);
 	for (i = 0; i < size; i++) {
 		if (__predict_true(shad[i] == 0))
 			continue;
 		kmsan_report_hook((const char *)addr + i, size, i, hook);
 		break;
+	}
+}
 void kmsan_init_arg(size_t);
 void kmsan_init_ret(size_t);
 void
 kmsan_init_arg(size_t n)
+{
 	msan_lwp_t *lwp;
 	uint8_t *arg;
 	if (__predict_false(!kmsan_enabled))
 		return;
 	lwp = curlwp->l_kmsan;
 	arg = lwp->tls[lwp->ctx].param;
 	__builtin_memset(arg, 0, n);
+}