From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56764 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P64pm-0001zx-3r for qemu-devel@nongnu.org; Wed, 13 Oct 2010 13:09:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P64pk-0005D9-SC for qemu-devel@nongnu.org; Wed, 13 Oct 2010 13:09:45 -0400 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:50133) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P64pk-0005D1-71 for qemu-devel@nongnu.org; Wed, 13 Oct 2010 13:09:44 -0400 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by e28smtp03.in.ibm.com (8.14.4/8.13.1) with ESMTP id o9DH9eEM005679 for ; Wed, 13 Oct 2010 22:39:40 +0530 Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o9DH9dWj1802360 for ; Wed, 13 Oct 2010 22:39:39 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o9DH9dfY025102 for ; Thu, 14 Oct 2010 04:09:39 +1100 Received: from localhost6.localdomain6 ([9.77.203.166]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o9DH9bdx025032 for ; Thu, 14 Oct 2010 04:09:38 +1100 From: Arun R Bharadwaj Date: Wed, 13 Oct 2010 22:39:34 +0530 Message-ID: <20101013170934.23885.19279.stgit@localhost6.localdomain6> In-Reply-To: <20101013165321.23885.81012.stgit@localhost6.localdomain6> References: <20101013165321.23885.81012.stgit@localhost6.localdomain6> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 1/6] This patch converts v9fs_stat() to make use of the threadlets infrastructure. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Gautham R Shenoy Every call to v9fs_stat() is processed in the context of the vcpu thread before offloading the actual stat operation onto an async-thread. The post operation is handled in the context of the io-thread which in turn does the complete() operation for this particular v9fs_stat() operation. Signed-off-by: Gautham R Shenoy --- hw/virtio-9p.c | 34 ++++++++++++++++++++++------------ hw/virtio-9p.h | 6 ++++++ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index 174300d..5f6ce56 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -1356,26 +1356,38 @@ out: v9fs_string_free(&aname); } -static void v9fs_stat_post_lstat(V9fsState *s, V9fsStatState *vs, int err) +static void v9fs_stat_post_lstat(void *opaque) { - if (err == -1) { - err = -errno; + V9fsStatState *vs = (V9fsStatState *)opaque; + + if (vs->err == -1) { + vs->err = -(vs->v9fs_errno); goto out; } - err = stat_to_v9stat(s, &vs->fidp->path, &vs->stbuf, &vs->v9stat); - if (err) { + vs->err = stat_to_v9stat(vs->s, &vs->fidp->path, &vs->stbuf, &vs->v9stat); + if (vs->err) { goto out; } vs->offset += pdu_marshal(vs->pdu, vs->offset, "wS", 0, &vs->v9stat); - err = vs->offset; + vs->err = vs->offset; out: - complete_pdu(s, vs->pdu, err); + complete_pdu(vs->s, vs->pdu, vs->err); v9fs_stat_free(&vs->v9stat); qemu_free(vs); } +static void v9fs_stat_do_lstat(ThreadletWork *work) +{ + V9fsStatState *vs = container_of(work, V9fsStatState, work); + + vs->err = v9fs_do_lstat(vs->s, &vs->fidp->path, &vs->stbuf); + vs->v9fs_errno = errno; + + v9fs_async_helper_done(vs->post_fn, vs); +} + static void v9fs_stat(V9fsState *s, V9fsPDU *pdu) { int32_t fid; @@ -1385,6 +1397,7 @@ static void v9fs_stat(V9fsState *s, V9fsPDU *pdu) vs = qemu_malloc(sizeof(*vs)); vs->pdu = pdu; vs->offset = 7; + vs->s = s; memset(&vs->v9stat, 0, sizeof(vs->v9stat)); @@ -1396,8 +1409,8 @@ static void v9fs_stat(V9fsState *s, V9fsPDU *pdu) goto out; } - err = v9fs_do_lstat(s, &vs->fidp->path, &vs->stbuf); - v9fs_stat_post_lstat(s, vs, err); + v9fs_do_async_posix(&vs->work, v9fs_stat_do_lstat, &vs->post_fn, + v9fs_stat_post_lstat); return; out: @@ -3882,8 +3895,5 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf) qemu_mutex_init(&(v9fs_async_struct.lock)); /* Create async queue. */ - (void)v9fs_do_async_posix; - (void)v9fs_async_helper_done; - return &s->vdev; } diff --git a/hw/virtio-9p.h b/hw/virtio-9p.h index 6c23319..769d3fc 100644 --- a/hw/virtio-9p.h +++ b/hw/virtio-9p.h @@ -7,6 +7,7 @@ #include #include "file-op-9p.h" +#include "qemu-threadlets.h" /* The feature bitmap for virtio 9P */ /* The mount point is specified in a config variable */ @@ -246,6 +247,11 @@ typedef struct V9fsStatState { V9fsStat v9stat; V9fsFidState *fidp; struct stat stbuf; + V9fsState *s; + int err; + int v9fs_errno; + ThreadletWork work; + void (*post_fn)(void *arg); } V9fsStatState; typedef struct V9fsStatDotl {