Sat Jul 30 05:24:17 2011 UTC ()

Use kmem(9) to allocate per-cpu softint context.  No functional changes.


(uebayasi)

diff -r1.35 -r1.36 src/sys/kern/kern_softint.c

--- src/sys/kern/kern_softint.c 2011/04/24 18:46:22	1.35
+++ src/sys/kern/kern_softint.c 2011/07/30 05:24:16	1.36

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_softint.c,v 1.35 2011/04/24 18:46:22 rmind Exp $	*/
+/*	$NetBSD: kern_softint.c,v 1.36 2011/07/30 05:24:16 uebayasi Exp $	*/
 /*-
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * 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.
 @@ -166,36 +166,37 @@
  *	If a soft interrupt handler blocks and is resumed, it resumes
  *	execution as a normal LWP (kthread) and gains VM context.  Only
  *	when it has completed and is ready to fire again will it
  *	interrupt other threads.
+ *
  * Future directions
+ *
  *	Provide a cheap way to direct software interrupts to remote
  *	CPUs.  Provide a way to enqueue work items into the handler
  *	record,	removing additional spl calls (see subr_workqueue.c).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.35 2011/04/24 18:46:22 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.36 2011/07/30 05:24:16 uebayasi Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/intr.h>
 #include <sys/mutex.h>
 #include <sys/kthread.h>
 #include <sys/evcnt.h>
 #include <sys/cpu.h>
 #include <sys/xcall.h>
 #include <sys/kmem.h>
 #include <net/netisr.h>
 #include <uvm/uvm_extern.h>
 /* This could overlap with signal info in struct lwp. */
 typedef struct softint {
 	SIMPLEQ_HEAD(, softhand) si_q;
 	struct lwp		*si_lwp;
 	struct cpu_info		*si_cpu;
 	uintptr_t		si_machdep;
 	struct evcnt		si_evcnt;
 	struct evcnt		si_evcnt_block;
 @@ -273,28 +274,27 @@ softint_init(struct cpu_info *ci)
 	static struct cpu_info *first;
 	softcpu_t *sc, *scfirst;
 	softhand_t *sh, *shmax;
 	if (first == NULL) {
 		/* Boot CPU. */
 		first = ci;
 		mutex_init(&softint_lock, MUTEX_DEFAULT, IPL_NONE);
 		softint_bytes = round_page(softint_bytes);
 		softint_max = (softint_bytes - sizeof(softcpu_t)) /
 		    sizeof(softhand_t);
+	}
-	sc = (softcpu_t *)uvm_km_alloc(kernel_map, softint_bytes, 0,
+	sc = kmem_zalloc(softint_bytes, KM_SLEEP);
 	    UVM_KMF_WIRED | UVM_KMF_ZERO);
 	if (sc == NULL)
 		panic("softint_init_cpu: cannot allocate memory");
 	ci->ci_data.cpu_softcpu = sc;
 	ci->ci_data.cpu_softints = 0;
 	sc->sc_cpu = ci;
 	softint_init_isr(sc, "net", PRI_SOFTNET, SOFTINT_NET);
 	softint_init_isr(sc, "bio", PRI_SOFTBIO, SOFTINT_BIO);
 	softint_init_isr(sc, "clk", PRI_SOFTCLOCK, SOFTINT_CLOCK);
 	softint_init_isr(sc, "ser", PRI_SOFTSERIAL, SOFTINT_SERIAL);
 	if (first != ci) {