From patchwork Thu Jul 22 15:57:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 59586 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 C8CD9B6ED0 for ; Fri, 23 Jul 2010 01:59:08 +1000 (EST) Received: from localhost ([127.0.0.1]:52519 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ObyAj-0006Nm-QD for incoming@patchwork.ozlabs.org; Thu, 22 Jul 2010 11:58:57 -0400 Received: from [140.186.70.92] (port=53591 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oby7O-0004ua-M7 for qemu-devel@nongnu.org; Thu, 22 Jul 2010 11:55:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oby7M-0001Xi-Nt for qemu-devel@nongnu.org; Thu, 22 Jul 2010 11:55:30 -0400 Received: from e38.co.us.ibm.com ([32.97.110.159]:32777) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oby7M-0001XV-Gg for qemu-devel@nongnu.org; Thu, 22 Jul 2010 11:55:28 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e38.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o6MFmNsM031405 for ; Thu, 22 Jul 2010 09:48:23 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o6MFtF8C069714 for ; Thu, 22 Jul 2010 09:55:15 -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 o6MFtBHY031166 for ; Thu, 22 Jul 2010 09:55:14 -0600 Received: from localhost.localdomain (elm9m80.beaverton.ibm.com [9.47.81.80]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o6MFt9hm030809; Thu, 22 Jul 2010 09:55:11 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Thu, 22 Jul 2010 08:57:49 -0700 Message-Id: <1279814291-8301-3-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1279814291-8301-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1279814291-8301-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) Cc: Sripathi Kodi , aliguori@us.ibm.com, "M. Mohan Kumar" , Venkateswararao Jujjuri Subject: [Qemu-devel] [PATCH-V3 02/24] qemu: virtio-9p: Implement statfs support in server 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: M. Mohan Kumar Implement statfs support in qemu server based on Sripathi's initial statfs patch. Signed-off-by: M. Mohan Kumar Signed-off-by: Sripathi Kodi Signed-off-by: Venkateswararao Jujjuri --- hw/file-op-9p.h | 1 + hw/virtio-9p-local.c | 6 ++++ hw/virtio-9p.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ hw/virtio-9p.h | 24 +++++++++++++++++++ 4 files changed, 94 insertions(+), 0 deletions(-) diff --git a/hw/file-op-9p.h b/hw/file-op-9p.h index a741c93..dd82ac7 100644 --- a/hw/file-op-9p.h +++ b/hw/file-op-9p.h @@ -74,6 +74,7 @@ typedef struct FileOperations int (*rename)(FsContext *, const char *, const char *); int (*truncate)(FsContext *, const char *, off_t); int (*fsync)(FsContext *, int); + int (*statfs)(FsContext *s, const char *path, struct statfs *stbuf); void *opaque; } FileOperations; #endif diff --git a/hw/virtio-9p-local.c b/hw/virtio-9p-local.c index 04f7f6f..8ae5b07 100644 --- a/hw/virtio-9p-local.c +++ b/hw/virtio-9p-local.c @@ -469,6 +469,11 @@ static int local_fsync(FsContext *ctx, int fd) return fsync(fd); } +static int local_statfs(FsContext *s, const char *path, struct statfs *stbuf) +{ + return statfs(rpath(s, path), stbuf); +} + FileOperations local_ops = { .lstat = local_lstat, .readlink = local_readlink, @@ -496,4 +501,5 @@ FileOperations local_ops = { .utime = local_utime, .remove = local_remove, .fsync = local_fsync, + .statfs = local_statfs, }; diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index e41c51e..20560e5 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -2145,9 +2145,72 @@ 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) +{ + if (err) { + err = -errno; + goto out; + } + + 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_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] | + (unsigned long long)vs->stbuf.f_fsid.__val[1] << 32; + vs->v9statfs.f_namelen = vs->stbuf.f_namelen; + + vs->offset += pdu_marshal(vs->pdu, vs->offset, "ddqqqqqqd", + vs->v9statfs.f_type, vs->v9statfs.f_bsize, vs->v9statfs.f_blocks, + vs->v9statfs.f_bfree, vs->v9statfs.f_bavail, vs->v9statfs.f_files, + vs->v9statfs.f_ffree, vs->v9statfs.fsid_val, + vs->v9statfs.f_namelen); + +out: + complete_pdu(s, vs->pdu, vs->offset); + qemu_free(vs); +} + +static void v9fs_statfs(V9fsState *s, V9fsPDU *pdu) +{ + V9fsStatfsState *vs; + ssize_t err = 0; + + vs = qemu_malloc(sizeof(*vs)); + vs->pdu = pdu; + vs->offset = 7; + + memset(&vs->v9statfs, 0, sizeof(vs->v9statfs)); + + pdu_unmarshal(vs->pdu, vs->offset, "d", &vs->fid); + + vs->fidp = lookup_fid(s, vs->fid); + if (vs->fidp == NULL) { + err = -ENOENT; + goto out; + } + + err = v9fs_do_statfs(s, &vs->fidp->path, &vs->stbuf); + v9fs_statfs_post_statfs(s, vs, err); + return; + +out: + complete_pdu(s, vs->pdu, err); + qemu_free(vs); +} + typedef void (pdu_handler_t)(V9fsState *s, V9fsPDU *pdu); static pdu_handler_t *pdu_handlers[] = { + [P9_TSTATFS] = v9fs_statfs, [P9_TVERSION] = v9fs_version, [P9_TATTACH] = v9fs_attach, [P9_TSTAT] = v9fs_stat, diff --git a/hw/virtio-9p.h b/hw/virtio-9p.h index 9286f59..992c765 100644 --- a/hw/virtio-9p.h +++ b/hw/virtio-9p.h @@ -13,6 +13,8 @@ #define VIRTIO_9P_MOUNT_TAG 0 enum { + P9_TSTATFS = 8, + P9_RSTATFS, P9_TVERSION = 100, P9_RVERSION, P9_TAUTH = 102, @@ -252,6 +254,28 @@ struct virtio_9p_config uint8_t tag[0]; } __attribute__((packed)); +typedef struct V9fsStatfs +{ + uint32_t f_type; + uint32_t f_bsize; + uint64_t f_blocks; + uint64_t f_bfree; + uint64_t f_bavail; + uint64_t f_files; + uint64_t f_ffree; + uint64_t fsid_val; + uint32_t f_namelen; +} V9fsStatfs; + +typedef struct V9fsStatfsState { + V9fsPDU *pdu; + size_t offset; + int32_t fid; + V9fsStatfs v9statfs; + V9fsFidState *fidp; + struct statfs stbuf; +} V9fsStatfsState; + extern size_t pdu_packunpack(void *addr, struct iovec *sg, int sg_count, size_t offset, size_t size, int pack);