 @@ -1,14 +1,14 @@
-/*	$NetBSD: kloader.c,v 1.31 2021/10/11 14:16:43 rin Exp $	*/
+/*	$NetBSD: kloader.c,v 1.32 2021/10/11 14:25:05 rin Exp $	*/
 /*-
  * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
  * 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.
 @@ -17,33 +17,33 @@
  * ``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: kloader.c,v 1.31 2021/10/11 14:16:43 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kloader.c,v 1.32 2021/10/11 14:25:05 rin Exp $");
 #include "debug_kloader.h"
 #include <sys/param.h>
 #include <sys/fcntl.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #define	ELFSIZE	32
 #include <sys/exec_elf.h>
 #include <uvm/uvm_extern.h>
 #include <machine/kloader.h>
 #define	PRINTF(fmt, args...)	printf("kloader: " fmt, ##args)
 @@ -164,75 +164,75 @@ kloader_reboot(void)
 	/* NOTREACHED */
+}
 int
 kloader_load(void)
+{
 	Elf_Ehdr eh;
 	Elf_Phdr *ph, *p;
 	Elf_Shdr *sh;
 	Elf_Addr entry;
 	vaddr_t kv;
 	size_t sz;
-	size_t shstrsz;
+	size_t phsz, shsz, shstrsz;
 	char *shstrtab;
 	int symndx, strndx;
 	size_t ksymsz;
 	struct kloader_bootinfo nbi; /* new boot info */
 	char *oldbuf, *newbuf;
 	char **ap;
 	int i;
 	ph = NULL;
 	sh = NULL;
 	shstrtab = NULL;
 	/* read kernel's ELF header */
 	kloader_read(0, sizeof(Elf_Ehdr), &eh);
 	if (eh.e_ident[EI_MAG0] != ELFMAG0 ||
 	    eh.e_ident[EI_MAG1] != ELFMAG1 ||
 	    eh.e_ident[EI_MAG2] != ELFMAG2 ||
 	    eh.e_ident[EI_MAG3] != ELFMAG3) {
 		PRINTF("not an ELF file\n");
 		goto err;
+	}
 	/* read program headers */
-	sz = eh.e_phentsize * eh.e_phnum;
+	phsz = eh.e_phentsize * eh.e_phnum;
-	if ((ph = malloc(sz, M_TEMP, M_NOWAIT)) == NULL) {
+	if ((ph = kmem_alloc(phsz, KM_NOSLEEP)) == NULL) {
 		PRINTF("can't allocate program header table.\n");
 		goto err;
+	}
-	if (kloader_read(eh.e_phoff, sz, ph) != 0) {
+	if (kloader_read(eh.e_phoff, phsz, ph) != 0) {
 		PRINTF("program header read error.\n");
 		goto err;
+	}
 	/* read section headers */
-	sz = eh.e_shentsize * eh.e_shnum;
+	shsz = eh.e_shentsize * eh.e_shnum;
-	if ((sh = malloc(sz, M_TEMP, M_NOWAIT)) == NULL) {
+	if ((sh = kmem_alloc(shsz, KM_NOSLEEP)) == NULL) {
 		PRINTF("can't allocate section header table.\n");
 		goto err;
+	}
-	if (kloader_read(eh.e_shoff, eh.e_shentsize * eh.e_shnum, sh) != 0) {
+	if (kloader_read(eh.e_shoff, shsz, sh) != 0) {
 		PRINTF("section header read error.\n");
 		goto err;
+	}
 	/* read section names */
 	shstrsz = ROUND4(sh[eh.e_shstrndx].sh_size);
-	shstrtab = malloc(shstrsz, M_TEMP, M_NOWAIT);
+	shstrtab = kmem_alloc(shstrsz, KM_NOSLEEP);
 	if (shstrtab == NULL) {
 		PRINTF("unable to allocate memory for .shstrtab\n");
 		goto err;
+	}
 	DPRINTF("reading 0x%x bytes of .shstrtab at 0x%x\n",
 	    sh[eh.e_shstrndx].sh_size, sh[eh.e_shstrndx].sh_offset);
 	kloader_read(sh[eh.e_shstrndx].sh_offset, sh[eh.e_shstrndx].sh_size,
 	    shstrtab);
 	/* save entry point, code to construct symbol table overwrites it */
 	entry = eh.e_entry;
 	/*
 @@ -406,31 +406,31 @@ kloader_load(void)
 	KDASSERT(kloader.cur_pg);
 	kloader.loader = (void *)PG_VADDR(kloader.cur_pg);
 	memcpy(kloader.loader, kloader.ops->boot, PAGE_SIZE);
 	/* loader stack starts at the bottom of that page */
 	kloader.loader_sp = (vaddr_t)kloader.loader + PAGE_SIZE;
 	DPRINTF("[loader] addr=%p sp=%p [kernel] entry=%p\n",
 	    kloader.loader, (void *)kloader.loader_sp, (void *)nbi.entry);
 	return (0);
  err:
 	if (ph != NULL)
-		free(ph, M_TEMP);
+		kmem_free(ph, phsz);
 	if (sh != NULL)
-		free(sh, M_TEMP);
+		kmem_free(sh, shsz);
 	if (shstrtab != NULL)
-		free(shstrtab, M_TEMP);
+		kmem_free(shstrtab, shstrsz);
 	return 1;
+}
 int
 kloader_alloc_memory(size_t sz)
+{
 	int n, error;
 	n = (sz + BUCKET_SIZE - 1) / BUCKET_SIZE	/* kernel &co */
 	    + 1;					/* 2nd loader */