From patchwork Tue Jun 1 14:17:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohan Kumar M X-Patchwork-Id: 54210 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 CC8C0B7D16 for ; Wed, 2 Jun 2010 00:19:16 +1000 (EST) Received: from localhost ([127.0.0.1]:54371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJSJD-0006G6-Q3 for incoming@patchwork.ozlabs.org; Tue, 01 Jun 2010 10:19:11 -0400 Received: from [140.186.70.92] (port=55415 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJSHb-0006DE-OH for qemu-devel@nongnu.org; Tue, 01 Jun 2010 10:17:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJSHa-0002pe-Eu for qemu-devel@nongnu.org; Tue, 01 Jun 2010 10:17:31 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:49514) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJSHY-0002nC-Jt for qemu-devel@nongnu.org; Tue, 01 Jun 2010 10:17:30 -0400 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by e28smtp04.in.ibm.com (8.14.4/8.13.1) with ESMTP id o51EHG6x014593 for ; Tue, 1 Jun 2010 19:47:16 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o51EHF732842756 for ; Tue, 1 Jun 2010 19:47:15 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o51EHFDw028840 for ; Wed, 2 Jun 2010 00:17:15 +1000 Received: from localhost.localdomain ([9.77.202.116]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o51EHEJI028825; Wed, 2 Jun 2010 00:17:15 +1000 From: "M. Mohan Kumar" To: qemu-devel@nongnu.org, v9fs-developer@lists.sourceforge.net Date: Tue, 1 Jun 2010 19:47:14 +0530 Message-Id: <1275401834-27520-1-git-send-email-mohan@in.ibm.com> X-Mailer: git-send-email 1.6.6.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Subject: [Qemu-devel] qemu:virtio-9p: [RFC] [PATCH 01/02] Send iounit to client for read/write operations 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 Compute iounit based on the host filesystem block size and pass it to client with open/create response. Also return iounit as statfs's f_bsize for optimal block size transfers. Signed-off-by: M. Mohan Kumar --- hw/virtio-9p.c | 56 ++++++++++++++++++++++++++++++++++++++++++-------------- hw/virtio-9p.h | 3 +++ 2 files changed, 45 insertions(+), 14 deletions(-) diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index f087122..4357f1f 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -1,4 +1,4 @@ -/* + /* * Virtio 9p backend * * Copyright IBM, Corp. 2010 @@ -269,6 +269,11 @@ static int v9fs_do_fsync(V9fsState *s, int fd) return s->ops->fsync(&s->ctx, fd); } +static int v9fs_do_statfs(V9fsState *s, V9fsString *path, struct statfs *stbuf) +{ + return s->ops->statfs(&s->ctx, path->data, stbuf); +} + static void v9fs_string_init(V9fsString *str) { str->data = NULL; @@ -1035,11 +1040,10 @@ static void v9fs_fix_path(V9fsString *dst, V9fsString *src, int len) static void v9fs_version(V9fsState *s, V9fsPDU *pdu) { - int32_t msize; V9fsString version; size_t offset = 7; - pdu_unmarshal(pdu, offset, "ds", &msize, &version); + pdu_unmarshal(pdu, offset, "ds", &s->msize, &version); if (!strcmp(version.data, "9P2000.u")) { s->proto_version = V9FS_PROTO_2000U; @@ -1049,7 +1053,7 @@ static void v9fs_version(V9fsState *s, V9fsPDU *pdu) v9fs_string_sprintf(&version, "unknown"); } - offset += pdu_marshal(pdu, offset, "ds", msize, &version); + offset += pdu_marshal(pdu, offset, "ds", s->msize, &version); complete_pdu(s, pdu, offset); v9fs_string_free(&version); @@ -1304,6 +1308,20 @@ out: v9fs_walk_complete(s, vs, err); } +static int32_t get_iounit(V9fsState *s, V9fsString *name) +{ + struct statfs stbuf; + int32_t iounit = 0; + + + if (!v9fs_do_statfs(s, name, &stbuf)) { + iounit = stbuf.f_bsize; + iounit *= (s->msize - P9_IOHDRSZ)/stbuf.f_bsize; + } + + return iounit; +} + static void v9fs_open_post_opendir(V9fsState *s, V9fsOpenState *vs, int err) { if (vs->fidp->dir == NULL) { @@ -1321,12 +1339,15 @@ out: static void v9fs_open_post_open(V9fsState *s, V9fsOpenState *vs, int err) { + int32_t iounit; + if (vs->fidp->fd == -1) { err = -errno; goto out; } - vs->offset += pdu_marshal(vs->pdu, vs->offset, "Qd", &vs->qid, 0); + iounit = get_iounit(s, &vs->fidp->path); + vs->offset += pdu_marshal(vs->pdu, vs->offset, "Qd", &vs->qid, iounit); err = vs->offset; out: complete_pdu(s, vs->pdu, err); @@ -1800,11 +1821,16 @@ out: static void v9fs_post_create(V9fsState *s, V9fsCreateState *vs, int err) { + int32_t iounit; + + iounit = get_iounit(s, &vs->fidp->path); + if (err == 0) { v9fs_string_copy(&vs->fidp->path, &vs->fullname); stat_to_qid(&vs->stbuf, &vs->qid); - vs->offset += pdu_marshal(vs->pdu, vs->offset, "Qd", &vs->qid, 0); + vs->offset += pdu_marshal(vs->pdu, vs->offset, "Qd", &vs->qid, + iounit); err = vs->offset; } @@ -2295,23 +2321,25 @@ out: qemu_free(vs); } -static int v9fs_do_statfs(V9fsState *s, V9fsString *path, struct statfs *stbuf) -{ - return s->ops->statfs(&s->ctx, path->data, stbuf); -} - static void v9fs_statfs_post_statfs(V9fsState *s, V9fsStatfsState *vs, int err) { + int32_t bsize_factor; + if (err) { err = -errno; goto out; } + bsize_factor = (s->msize - P9_IOHDRSZ)/vs->stbuf.f_bsize; + if (!bsize_factor) { + bsize_factor = 1; + } vs->v9statfs.f_type = vs->stbuf.f_type; vs->v9statfs.f_bsize = vs->stbuf.f_bsize; - vs->v9statfs.f_blocks = vs->stbuf.f_blocks; - vs->v9statfs.f_bfree = vs->stbuf.f_bfree; - vs->v9statfs.f_bavail = vs->stbuf.f_bavail; + vs->v9statfs.f_bsize *= bsize_factor; + vs->v9statfs.f_blocks = vs->stbuf.f_blocks/bsize_factor; + vs->v9statfs.f_bfree = vs->stbuf.f_bfree/bsize_factor; + vs->v9statfs.f_bavail = vs->stbuf.f_bavail/bsize_factor; vs->v9statfs.f_files = vs->stbuf.f_files; vs->v9statfs.f_ffree = vs->stbuf.f_ffree; vs->v9statfs.fsid_val = (unsigned int) vs->stbuf.f_fsid.__val[0] | diff --git a/hw/virtio-9p.h b/hw/virtio-9p.h index 6b3d4a4..9264163 100644 --- a/hw/virtio-9p.h +++ b/hw/virtio-9p.h @@ -72,6 +72,8 @@ enum p9_proto_version { #define P9_NOFID (u32)(~0) #define P9_MAXWELEM 16 +#define P9_IOHDRSZ 24 + typedef struct V9fsPDU V9fsPDU; struct V9fsPDU @@ -156,6 +158,7 @@ typedef struct V9fsState uint8_t *tag; size_t config_size; enum p9_proto_version proto_version; + int32_t msize; } V9fsState; typedef struct V9fsCreateState {