Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/rump/librump/rumpkern Retire the old sysproxy nonsense (...
details: https://anonhg.NetBSD.org/src/rev/7d4497f7d6b5
branches: trunk
changeset: 758228:7d4497f7d6b5
user: pooka <pooka%NetBSD.org@localhost>
date: Wed Oct 27 20:34:50 2010 +0000
description:
Retire the old sysproxy nonsense (as part of doing it slightly better).
Introduce rump_pub_syscall() as the generic interface for making
system calls with already marshalled arguments. So it's kinda like
syscall(2), except it also remembered to breathe instead of having
to figure out how to deal with 64bit values.
diffstat:
sys/rump/librump/rumpkern/rumpkern.ifspec | 6 +-
sys/rump/librump/rumpkern/sysproxy_socket.c | 617 ----------------------------
2 files changed, 2 insertions(+), 621 deletions(-)
diffs (truncated from 638 to 300 lines):
diff -r e2bf3cd7acc7 -r 7d4497f7d6b5 sys/rump/librump/rumpkern/rumpkern.ifspec
--- a/sys/rump/librump/rumpkern/rumpkern.ifspec Wed Oct 27 19:18:00 2010 +0000
+++ b/sys/rump/librump/rumpkern/rumpkern.ifspec Wed Oct 27 20:34:50 2010 +0000
@@ -1,4 +1,4 @@
-; $NetBSD: rumpkern.ifspec,v 1.6 2010/09/01 19:13:38 pooka Exp $
+; $NetBSD: rumpkern.ifspec,v 1.7 2010/10/27 20:34:50 pooka Exp $
NAME|kern
PUBHDR|include/rump/rumpkern_if_pub.h
@@ -32,6 +32,4 @@
void |allbetsareoff_setid |pid_t, int
-int |sysproxy_set |rump_sysproxy_t, void *
-int |sysproxy_socket_setup_client |int
-int |sysproxy_socket_setup_server |int
+int |syscall |int, void *, register_t *
diff -r e2bf3cd7acc7 -r 7d4497f7d6b5 sys/rump/librump/rumpkern/sysproxy_socket.c
--- a/sys/rump/librump/rumpkern/sysproxy_socket.c Wed Oct 27 19:18:00 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,617 +0,0 @@
-/* $NetBSD: sysproxy_socket.c,v 1.9 2010/09/01 19:57:52 pooka Exp $ */
-
-/*
- * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
- *
- * Development of this software was supported by The Nokia Foundation.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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: sysproxy_socket.c,v 1.9 2010/09/01 19:57:52 pooka Exp $");
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/kmem.h>
-#include <sys/kthread.h>
-#include <sys/queue.h>
-#include <sys/syscall.h>
-#include <sys/atomic.h>
-
-#include <rump/rump.h>
-#include <rump/rumpuser.h>
-
-#include "rump_private.h"
-
-/*
- * This is a very simple RPC mechanism. It defines:
- *
- * 1) system call
- * 2) copyin
- * 3) copyout
- *
- * Currently all the data is in host format, so this can't really be
- * used to make cross-site calls. Extending to something like XMLRPC
- * is possible, but takes some amount of programming effort, since all
- * the kernel data structures and types are defined in C.
- *
- * XXX: yes, this is overall implemented in a very lazy fashion
- * currently. Hopefully it will get better. And hopefully the
- * global "sock" will go away, it's quite disgusting.
- */
-
-enum rumprpc { RUMPRPC_LWP_CREATE, RUMPRPC_LWP_EXIT,
- RUMPRPC_SYSCALL, RUMPRPC_SYSCALL_RESP,
- RUMPRPC_COPYIN, RUMPRPC_COPYIN_RESP,
- RUMPRPC_COPYOUT, RUMPRPC_COPYOUT_RESP };
-
-struct rumprpc_head {
- uint64_t rpch_flen;
- uint32_t rpch_reqno;
- int rpch_type;
-};
-
-struct rumprpc_sysreq {
- struct rumprpc_head rpc_head;
- int rpc_sysnum;
- uint8_t rpc_data[0];
-};
-
-struct rumprpc_sysresp {
- struct rumprpc_head rpc_head;
- int rpc_error;
- register_t rpc_retval;
-};
-
-struct rumprpc_copydata {
- struct rumprpc_head rpc_head;
- void *rpc_addr;
- size_t rpc_len;
- uint8_t rpc_data[0];
-};
-
-struct sysproxy_qent {
- uint32_t reqno;
- struct rumprpc_head *rpch_resp;
-
- kcondvar_t cv;
- TAILQ_ENTRY(sysproxy_qent) entries;
-};
-
-static TAILQ_HEAD(, sysproxy_qent) sendq = TAILQ_HEAD_INITIALIZER(sendq);
-static TAILQ_HEAD(, sysproxy_qent) recvq = TAILQ_HEAD_INITIALIZER(recvq);
-static bool sendavail = true;
-static kmutex_t sendmtx, recvmtx;
-static unsigned reqno;
-
-static struct sysproxy_qent *
-get_qent(void)
-{
- struct sysproxy_qent *qent;
- unsigned myreq = atomic_inc_uint_nv(&reqno);
-
- qent = kmem_alloc(sizeof(*qent), KM_SLEEP);
-
- qent->reqno = myreq;
- qent->rpch_resp = NULL;
- cv_init(&qent->cv, "sproxyq");
-
- return qent;
-}
-
-static void
-put_qent(struct sysproxy_qent *qent)
-{
-
- cv_destroy(&qent->cv);
- kmem_free(qent, sizeof(*qent));
-}
-
-static int
-write_n(int s, uint8_t *data, size_t dlen)
-{
- ssize_t n;
- size_t done;
- int error;
-
- error = 0;
- for (done = 0; done < dlen; done += n) {
- n = rumpuser_write(s, data + done, dlen - done, &error);
- if (n <= 0) {
- if (n == -1)
- return error;
- return ECONNRESET;
- }
- }
-
- return error;
-}
-
-static int
-read_n(int s, uint8_t *data, size_t dlen)
-{
- ssize_t n;
- size_t done;
- int error;
-
- error = 0;
- for (done = 0; done < dlen; done += n) {
- n = rumpuser_read(s, data + done, dlen - done, &error);
- if (n <= 0) {
- if (n == -1)
- return error;
- return ECONNRESET;
- }
- }
-
- return error;
-}
-
-static void
-dosend(int s, struct sysproxy_qent *qent, uint8_t *data, size_t len, bool rq)
-{
- int error;
-
- /*
- * Send. If the sendq is empty, we send in current thread context.
- * Otherwise we enqueue ourselves and block until we are able to
- * send in current thread context, i.e. we are the first in the queue.
- */
- mutex_enter(&sendmtx);
- if (!sendavail) {
- TAILQ_INSERT_TAIL(&sendq, qent, entries);
- while (qent != TAILQ_FIRST(&sendq))
- cv_wait(&qent->cv, &sendmtx);
- KASSERT(qent == TAILQ_FIRST(&sendq));
- TAILQ_REMOVE(&sendq, qent, entries);
- }
- sendavail = false;
- mutex_exit(&sendmtx);
-
- /*
- * Put ourselves onto the receive queue already now in case
- * the response arrives "immediately" after sending.
- */
- if (rq) {
- mutex_enter(&recvmtx);
- TAILQ_INSERT_TAIL(&recvq, qent, entries);
- mutex_exit(&recvmtx);
- }
-
- /* XXX: need better error recovery */
- if ((error = write_n(s, data, len)) != 0)
- panic("unrecoverable error %d (sloppy)", error);
-}
-
-struct wrk {
- void (*wfn)(void *arg);
- void *arg;
- kcondvar_t wrkcv;
- LIST_ENTRY(wrk) entries;
-};
-
-static LIST_HEAD(, wrk) idlewrker = LIST_HEAD_INITIALIZER(idlewrker);
-
-#define NIDLE_MAX 5
-
-static kmutex_t wrkmtx;
-static unsigned nwrk, nidle;
-
-/*
- * workers for handling requests. comes with simple little pooling
- * for threads.
- */
-static void
-wrkthread(void *arg)
-{
- struct wrk *wrk = arg;
-
- mutex_enter(&wrkmtx);
- nidle++;
- for (;;) {
- while (wrk->wfn == NULL)
- cv_wait(&wrk->wrkcv, &wrkmtx);
- nidle--;
- mutex_exit(&wrkmtx);
-
- wrk->wfn(wrk->arg);
- wrk->wfn = NULL;
- wrk->arg = NULL;
-
- mutex_enter(&wrkmtx);
- if (++nidle > NIDLE_MAX) {
- nidle--;
- break;
- }
- LIST_INSERT_HEAD(&idlewrker, wrk, entries);
- }
- nwrk--;
- mutex_exit(&wrkmtx);
-
- cv_destroy(&wrk->wrkcv);
- kmem_free(wrk, sizeof(*wrk));
- kthread_exit(0);
-}
-
-/*
- * Enqueue work into a separate thread context. Will create a new
- * thread if there are none available.
- */
-static void
-wrkenqueue(void (*wfn)(void *), void *arg)
-{
- struct wrk *wrk;
- int error;
-
- mutex_enter(&wrkmtx);
- if (nidle == 0) {
- nwrk++;
- if (nwrk > 30)
- printf("syscall proxy warning: over 30 workers\n");
- mutex_exit(&wrkmtx);
- wrk = kmem_zalloc(sizeof(*wrk), KM_SLEEP);
- cv_init(&wrk->wrkcv, "sproxywk");
- retry:
- error = kthread_create(PRI_NONE, KTHREAD_MPSAFE, NULL,
- wrkthread, wrk, NULL, "spw_%d", nwrk);
- if (error) {
- printf("kthread_create failed: %d. retry.\n", error);
- kpause("eagain", false, hz, NULL);
Home |
Main Index |
Thread Index |
Old Index