From patchwork Thu May 12 20:57:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 95369 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 28CFDB6F0A for ; Fri, 13 May 2011 07:01:51 +1000 (EST) Received: from localhost ([::1]:34816 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKd12-0006JQ-IM for incoming@patchwork.ozlabs.org; Thu, 12 May 2011 17:01:48 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKcxj-00012c-7C for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QKcxh-0001p8-BK for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:23 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:35403) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKcxh-0001mG-0k for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:21 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e36.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4CKqLbN011815 for ; Thu, 12 May 2011 14:52:21 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id p4CKw125156906 for ; Thu, 12 May 2011 14:58:01 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p4CEvWm0031680 for ; Thu, 12 May 2011 08:57:33 -0600 Received: from oc6675851006.ibm.com (dyn9047029068.beaverton.ibm.com [9.47.29.68]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p4CEvUhH031551; Thu, 12 May 2011 08:57:31 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Thu, 12 May 2011 13:57:23 -0700 Message-Id: <1305233867-4367-2-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1305233867-4367-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1305233867-4367-1-git-send-email-jvrao@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.110.154 Cc: Harsh Prateek Bora , Arun R Bharadwaj , aliguori@us.ibm.com, "Venkateswararao Jujjuri \(JV\)" , stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 01/25] [virtio-9p] Add infrastructure to support glib threads and coroutines. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch is originally made by Arun Bharadwaj for glib support. Later Harsh Prateek Bora added coroutines support. Signed-off-by: Arun R Bharadwaj Signed-off-by: Harsh Prateek Bora Signed-off-by: Venkateswararao Jujjuri " --- Makefile.objs | 2 + hw/9pfs/virtio-9p-coth.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ hw/9pfs/virtio-9p-coth.h | 45 +++++++++++++++++++++++++++++ hw/9pfs/virtio-9p-device.c | 26 +++++++++++++++- hw/9pfs/virtio-9p.h | 1 - 5 files changed, 139 insertions(+), 3 deletions(-) create mode 100644 hw/9pfs/virtio-9p-coth.c create mode 100644 hw/9pfs/virtio-9p-coth.h diff --git a/Makefile.objs b/Makefile.objs index 3873f10..96f6a24 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -297,8 +297,10 @@ hw-obj-$(CONFIG_SOUND) += $(sound-obj-y) 9pfs-nested-$(CONFIG_VIRTFS) = virtio-9p.o virtio-9p-debug.o 9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-local.o virtio-9p-xattr.o 9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-xattr-user.o virtio-9p-posix-acl.o +9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-coth.o hw-obj-$(CONFIG_REALLY_VIRTFS) += $(addprefix 9pfs/, $(9pfs-nested-y)) +$(addprefix 9pfs/, $(9pfs-nested-y)): QEMU_CFLAGS+=$(GLIB_CFLAGS) ###################################################################### diff --git a/hw/9pfs/virtio-9p-coth.c b/hw/9pfs/virtio-9p-coth.c new file mode 100644 index 0000000..edd3cde --- /dev/null +++ b/hw/9pfs/virtio-9p-coth.c @@ -0,0 +1,68 @@ +/* + * Virtio 9p backend + * + * Copyright IBM, Corp. 2010 + * + * Authors: + * Harsh Prateek Bora + * Venkateswararao Jujjuri(JV) + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#include "fsdev/qemu-fsdev.h" +#include "qemu-thread.h" +#include "qemu-coroutine.h" +#include "virtio-9p-coth.h" + +/* v9fs glib thread pool */ +V9fsThPool v9fs_pool; + +void v9fs_qemu_submit_request(V9fsRequest *req) +{ + V9fsThPool *p = &v9fs_pool; + + req->done = 0; + p->requests = g_list_append(p->requests, req); + g_thread_pool_push(v9fs_pool.pool, req, NULL); +} + +void v9fs_qemu_process_req_done(void *arg) +{ + struct V9fsThPool *p = &v9fs_pool; + char byte; + ssize_t len; + GList *cur_req, *next_req; + + do { + len = read(p->rfd, &byte, sizeof(byte)); + } while (len == -1 && errno == EINTR); + + for (cur_req = p->requests; cur_req != NULL; cur_req = next_req) { + V9fsRequest *req = cur_req->data; + next_req = g_list_next(cur_req); + + if (!req->done) { + continue; + } + + Coroutine *entry = req->coroutine; + qemu_coroutine_enter(entry, NULL); + + p->requests = g_list_delete_link(p->requests, cur_req); + } +} + +void v9fs_thread_routine(gpointer data, gpointer user_data) +{ + V9fsRequest *req = data; + char byte = 0; + ssize_t len; + req->func(req); + req->done = 1; + do { + len = write(v9fs_pool.wfd, &byte, sizeof(byte)); + } while (len == -1 && errno == EINTR); +} diff --git a/hw/9pfs/virtio-9p-coth.h b/hw/9pfs/virtio-9p-coth.h new file mode 100644 index 0000000..fdc44f6 --- /dev/null +++ b/hw/9pfs/virtio-9p-coth.h @@ -0,0 +1,45 @@ +/* + * Virtio 9p backend + * + * Copyright IBM, Corp. 2010 + * + * Authors: + * Harsh Prateek Bora + * Venkateswararao Jujjuri(JV) + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#ifndef _QEMU_VIRTIO_9P_COTH_H +#define _QEMU_VIRTIO_9P_COTH_H + +#include "qemu-thread.h" +#include "qemu-coroutine.h" +#include + +typedef struct V9fsRequest { + void (*func)(struct V9fsRequest *req); + + /* Flag to indicate that request is satisfied, ready for post-processing */ + int done; + Coroutine *coroutine; +} V9fsRequest; + +typedef struct V9fsThPool { + GThreadPool *pool; + GList *requests; + int rfd; + int wfd; +} V9fsThPool; + +/* v9fs glib thread pool */ +extern V9fsThPool v9fs_pool; + +extern void v9fs_thread_routine(gpointer data, gpointer user_data); +extern void v9fs_qemu_process_req_done(void *arg); +extern void v9fs_qemu_submit_request(V9fsRequest *req); + + +#endif diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index a2b6acc..21fb310 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -18,6 +18,9 @@ #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" #include "virtio-9p-xattr.h" +#include "virtio-9p-coth.h" + +static int notifier_fds[2]; static uint32_t virtio_9p_get_features(VirtIODevice *vdev, uint32_t features) { @@ -49,14 +52,13 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf) int i, len; struct stat stat; FsTypeEntry *fse; - + V9fsThPool *p = &v9fs_pool; s = (V9fsState *)virtio_common_init("virtio-9p", VIRTIO_ID_9P, sizeof(struct virtio_9p_config)+ MAX_TAG_LEN, sizeof(V9fsState)); - /* initialize pdu allocator */ QLIST_INIT(&s->free_list); for (i = 0; i < (MAX_REQ - 1); i++) { @@ -132,6 +134,26 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf) s->tag_len; s->vdev.get_config = virtio_9p_get_config; + if (!g_thread_supported()) { + g_thread_init(NULL); + } + + if (qemu_pipe(notifier_fds) == -1) { + fprintf(stderr, "failed to create fd's for virtio-9p\n"); + exit(1); + } + + p->pool = g_thread_pool_new(v9fs_thread_routine, p, -1, FALSE, NULL); + p->rfd = notifier_fds[0]; + p->wfd = notifier_fds[1]; + + fcntl(p->rfd, F_SETFL, O_NONBLOCK); + fcntl(p->wfd, F_SETFL, O_NONBLOCK); + + qemu_set_fd_handler(p->rfd, v9fs_qemu_process_req_done, NULL, NULL); + + (void) v9fs_qemu_submit_request; + return &s->vdev; } diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index 2bfbe62..699d3ab 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -510,5 +510,4 @@ static inline size_t do_pdu_unpack(void *dst, struct iovec *sg, int sg_count, } extern void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq); - #endif