[src/trunk]: src/sys/kern Allow for struct sigacts being greater than PAGE_SI...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a225fa84620d
branches:  trunk
changeset: 567192:a225fa84620d
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Jun 04 12:23:50 2004 +0000

description:
Allow for struct sigacts being greater than PAGE_SIZE on sun2.  sun2
-current kernels now work again.

Reviewed by Matt Thomas. Thanks.

diffstat:

 sys/kern/kern_sig.c |  36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diffs (71 lines):

diff -r d178a07bafbb -r a225fa84620d sys/kern/kern_sig.c
--- a/sys/kern/kern_sig.c       Fri Jun 04 10:28:37 2004 +0000
+++ b/sys/kern/kern_sig.c       Fri Jun 04 12:23:50 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_sig.c,v 1.195 2004/05/04 21:25:47 pk Exp $        */
+/*     $NetBSD: kern_sig.c,v 1.196 2004/06/04 12:23:50 skrll Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.195 2004/05/04 21:25:47 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.196 2004/06/04 12:23:50 skrll Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_compat_sunos.h"
@@ -78,6 +78,7 @@
 
 #include <sys/user.h>          /* for coredump */
 
+#include <uvm/uvm.h>
 #include <uvm/uvm_extern.h>
 
 static void    child_psignal(struct proc *, int);
@@ -89,8 +90,31 @@
 
 sigset_t       contsigmask, stopsigmask, sigcantmask, sigtrapmask;
 
-POOL_INIT(sigacts_pool, sizeof(struct sigacts), 0, 0, 0, "sigapl",
-    &pool_allocator_nointr);
+struct pool    sigacts_pool;   /* memory pool for sigacts structures */
+
+/*
+ * struct sigacts memory pool allocator.
+ */
+
+static void *
+sigacts_poolpage_alloc(struct pool *pp, int flags)
+{
+
+       return (void *)uvm_km_kmemalloc1(kernel_map,
+           uvm.kernel_object, (PAGE_SIZE)*2, (PAGE_SIZE)*2, UVM_UNKNOWN_OFFSET,
+           (flags & PR_WAITOK) ? 0 : UVM_KMF_NOWAIT | UVM_KMF_TRYLOCK);
+}
+
+static void
+sigacts_poolpage_free(struct pool *pp, void *v)
+{
+        uvm_km_free(kernel_map, (vaddr_t)v, (PAGE_SIZE)*2);
+}
+
+static struct pool_allocator sigactspool_allocator = {
+        sigacts_poolpage_alloc, sigacts_poolpage_free, (PAGE_SIZE)*2,
+};
+
 POOL_INIT(siginfo_pool, sizeof(siginfo_t), 0, 0, 0, "siginfo",
     &pool_allocator_nointr);
 POOL_INIT(ksiginfo_pool, sizeof(ksiginfo_t), 0, 0, 0, "ksiginfo", NULL);
@@ -206,6 +230,10 @@
 signal_init(void)
 {
 
+       pool_init(&sigacts_pool, sizeof(struct sigacts), 0, 0, 0, "sigapl",
+           sizeof(struct sigacts) > PAGE_SIZE ?
+           &sigactspool_allocator : &pool_allocator_nointr);
+
        exithook_establish(ksiginfo_exithook, NULL);
        exechook_establish(ksiginfo_exithook, NULL);