From patchwork Wed Oct 13 17:10:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Bharadwaj X-Patchwork-Id: 67710 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E477EB70F5 for ; Thu, 14 Oct 2010 04:17:13 +1100 (EST) Received: from localhost ([127.0.0.1]:48847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P64wf-0006DW-He for incoming@patchwork.ozlabs.org; Wed, 13 Oct 2010 13:16:53 -0400 Received: from [140.186.70.92] (port=57643 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P64qh-0002a7-2w for qemu-devel@nongnu.org; Wed, 13 Oct 2010 13:10:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P64qf-0005b9-Cj for qemu-devel@nongnu.org; Wed, 13 Oct 2010 13:10:42 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:36741) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P64qe-0005b1-Jf for qemu-devel@nongnu.org; Wed, 13 Oct 2010 13:10:41 -0400 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp05.au.ibm.com (8.14.4/8.13.1) with ESMTP id o9DH5q8x025261 for ; Thu, 14 Oct 2010 04:05:52 +1100 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o9DHAbdc3227782 for ; Thu, 14 Oct 2010 04:10:37 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o9DHAbHx015831 for ; Thu, 14 Oct 2010 04:10:37 +1100 Received: from localhost6.localdomain6 ([9.77.203.166]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o9DHAXGp015760 for ; Thu, 14 Oct 2010 04:10:35 +1100 To: qemu-devel@nongnu.org From: Arun R Bharadwaj Date: Wed, 13 Oct 2010 22:40:31 +0530 Message-ID: <20101013171031.23885.86603.stgit@localhost6.localdomain6> In-Reply-To: <20101013165321.23885.81012.stgit@localhost6.localdomain6> References: <20101013165321.23885.81012.stgit@localhost6.localdomain6> User-Agent: StGit/0.15 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Subject: [Qemu-devel] [PATCH 6/6] This patch converts v9fs_walk() to make use of the threadlets infrastructure. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Gautham R Shenoy This patch offloads all the blocking calls invoked for v9fs_walk onto the helper threads belonging to the threadlets infrastructure. The handling of the v9fs_post_*walk* calls is done from the io-thread context. Signed-off-by: Gautham R Shenoy --- hw/virtio-9p.c | 78 +++++++++++++++++++++++++++++++++++++------------------- hw/virtio-9p.h | 5 ++++ 2 files changed, 57 insertions(+), 26 deletions(-) diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index 75d4be3..e95bf50 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -1615,6 +1615,29 @@ out: qemu_free(vs); } +/************************* v9fs_walk calls *****************************/ +static void v9fs_walk_do_lstat_old(ThreadletWork *work) +{ + V9fsWalkState *vs; + + vs = container_of(work, V9fsWalkState, 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_walk_do_lstat_new(ThreadletWork *work) +{ + V9fsWalkState *vs; + + vs = container_of(work, V9fsWalkState, work); + vs->err = v9fs_do_lstat(vs->s, &vs->newfidp->path, &vs->stbuf); + vs->v9fs_errno = errno; + + v9fs_async_helper_done(vs->post_fn, vs); +} + static void v9fs_walk_complete(V9fsState *s, V9fsWalkState *vs, int err) { complete_pdu(s, vs->pdu, err); @@ -1640,13 +1663,14 @@ static void v9fs_walk_marshal(V9fsWalkState *vs) } } -static void v9fs_walk_post_newfid_lstat(V9fsState *s, V9fsWalkState *vs, - int err) +static void v9fs_walk_post_newfid_lstat(void *opaque) { - if (err == -1) { - free_fid(s, vs->newfidp->fid); + V9fsWalkState *vs = (V9fsWalkState *)opaque; + + if (vs->err == -1) { + free_fid(vs->s, vs->newfidp->fid); v9fs_string_free(&vs->path); - err = -ENOENT; + vs->err = -ENOENT; goto out; } @@ -1658,24 +1682,25 @@ static void v9fs_walk_post_newfid_lstat(V9fsState *s, V9fsWalkState *vs, vs->wnames[vs->name_idx].data); v9fs_string_copy(&vs->newfidp->path, &vs->path); - err = v9fs_do_lstat(s, &vs->newfidp->path, &vs->stbuf); - v9fs_walk_post_newfid_lstat(s, vs, err); + v9fs_do_async_posix(&vs->work, v9fs_walk_do_lstat_new, &vs->post_fn, + v9fs_walk_post_newfid_lstat); return; } v9fs_string_free(&vs->path); v9fs_walk_marshal(vs); - err = vs->offset; + vs->err = vs->offset; out: - v9fs_walk_complete(s, vs, err); + v9fs_walk_complete(vs->s, vs, vs->err); } -static void v9fs_walk_post_oldfid_lstat(V9fsState *s, V9fsWalkState *vs, - int err) +static void v9fs_walk_post_oldfid_lstat(void *opaque) { - if (err == -1) { + V9fsWalkState *vs = (V9fsWalkState *)opaque; + + if (vs->err == -1) { v9fs_string_free(&vs->path); - err = -ENOENT; + vs->err = -ENOENT; goto out; } @@ -1687,23 +1712,22 @@ static void v9fs_walk_post_oldfid_lstat(V9fsState *s, V9fsWalkState *vs, vs->fidp->path.data, vs->wnames[vs->name_idx].data); v9fs_string_copy(&vs->fidp->path, &vs->path); - err = v9fs_do_lstat(s, &vs->fidp->path, &vs->stbuf); - v9fs_walk_post_oldfid_lstat(s, vs, err); + v9fs_do_async_posix(&vs->work, v9fs_walk_do_lstat_old, &vs->post_fn, + v9fs_walk_post_oldfid_lstat); return; } v9fs_string_free(&vs->path); v9fs_walk_marshal(vs); - err = vs->offset; + vs->err = vs->offset; out: - v9fs_walk_complete(s, vs, err); + v9fs_walk_complete(vs->s, vs, vs->err); } static void v9fs_walk(V9fsState *s, V9fsPDU *pdu) { int32_t fid, newfid; V9fsWalkState *vs; - int err = 0; int i; vs = qemu_malloc(sizeof(*vs)); @@ -1711,6 +1735,8 @@ static void v9fs_walk(V9fsState *s, V9fsPDU *pdu) vs->wnames = NULL; vs->qids = NULL; vs->offset = 7; + vs->err = 0; + vs->s = s; vs->offset += pdu_unmarshal(vs->pdu, vs->offset, "ddw", &fid, &newfid, &vs->nwnames); @@ -1728,7 +1754,7 @@ static void v9fs_walk(V9fsState *s, V9fsPDU *pdu) vs->fidp = lookup_fid(s, fid); if (vs->fidp == NULL) { - err = -ENOENT; + vs->err = -ENOENT; goto out; } @@ -1744,14 +1770,14 @@ static void v9fs_walk(V9fsState *s, V9fsPDU *pdu) vs->fidp->path.data, vs->wnames[vs->name_idx].data); v9fs_string_copy(&vs->fidp->path, &vs->path); - err = v9fs_do_lstat(s, &vs->fidp->path, &vs->stbuf); - v9fs_walk_post_oldfid_lstat(s, vs, err); + v9fs_do_async_posix(&vs->work, v9fs_walk_do_lstat_old, + &vs->post_fn, v9fs_walk_post_oldfid_lstat); return; } } else { vs->newfidp = alloc_fid(s, newfid); if (vs->newfidp == NULL) { - err = -EINVAL; + vs->err = -EINVAL; goto out; } @@ -1765,16 +1791,16 @@ static void v9fs_walk(V9fsState *s, V9fsPDU *pdu) vs->wnames[vs->name_idx].data); v9fs_string_copy(&vs->newfidp->path, &vs->path); - err = v9fs_do_lstat(s, &vs->newfidp->path, &vs->stbuf); - v9fs_walk_post_newfid_lstat(s, vs, err); + v9fs_do_async_posix(&vs->work, v9fs_walk_do_lstat_new, + &vs->post_fn, v9fs_walk_post_newfid_lstat); return; } } v9fs_walk_marshal(vs); - err = vs->offset; + vs->err = vs->offset; out: - v9fs_walk_complete(s, vs, err); + v9fs_walk_complete(s, vs, vs->err); } /********************* v9fs_open calls *********************************/ diff --git a/hw/virtio-9p.h b/hw/virtio-9p.h index 294de83..f88b5fc 100644 --- a/hw/virtio-9p.h +++ b/hw/virtio-9p.h @@ -296,6 +296,11 @@ typedef struct V9fsWalkState { V9fsString path; V9fsString *wnames; struct stat stbuf; + V9fsState *s; + int err; + int v9fs_errno; + ThreadletWork work; + void (*post_fn)(void *arg); } V9fsWalkState; typedef struct V9fsOpenState {