From patchwork Mon Jun 28 21:55:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 57211 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 5DC88B6EE9 for ; Tue, 29 Jun 2010 08:16:20 +1000 (EST) Received: from localhost ([127.0.0.1]:37151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTMci-000420-Mh for incoming@patchwork.ozlabs.org; Mon, 28 Jun 2010 18:16:16 -0400 Received: from [140.186.70.92] (port=59086 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTMF7-00057X-9J for qemu-devel@nongnu.org; Mon, 28 Jun 2010 17:51:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OTMF4-0006py-4h for qemu-devel@nongnu.org; Mon, 28 Jun 2010 17:51:52 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:32949) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OTMF3-0006ph-Ob for qemu-devel@nongnu.org; Mon, 28 Jun 2010 17:51:50 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e37.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o5SLo0k3029684 for ; Mon, 28 Jun 2010 15:50:00 -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 o5SLpkOf116674 for ; Mon, 28 Jun 2010 15:51:46 -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 o5SLpjLv027260 for ; Mon, 28 Jun 2010 15:51:46 -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 o5SLpX8D026203; Mon, 28 Jun 2010 15:51:44 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Mon, 28 Jun 2010 14:55:14 -0700 Message-Id: <1277762117-11212-17-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1277762117-11212-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1277762117-11212-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: aliguori@us.ibm.com, "Aneesh Kumar K.V" Subject: [Qemu-devel] [PATCH 17/20] virtio-9p: Add fidtype so that we can do type specific operation 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: Aneesh Kumar K.V We want to add type specific operation during read/write Signed-off-by: Aneesh Kumar K.V --- hw/virtio-9p.c | 110 ++++++++++++++++++++++++++++++-------------------------- hw/virtio-9p.h | 24 +++++++++++- 2 files changed, 81 insertions(+), 53 deletions(-) diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index a9da10f..79d9195 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -408,8 +408,7 @@ static V9fsFidState *alloc_fid(V9fsState *s, int32_t fid) f = qemu_mallocz(sizeof(V9fsFidState)); f->fid = fid; - f->fd = -1; - f->dir = NULL; + f->fid_type = P9_FID_NONE; f->next = s->fid_list; s->fid_list = f; @@ -434,11 +433,20 @@ static int free_fid(V9fsState *s, int32_t fid) fidp = *fidpp; *fidpp = fidp->next; - if (fidp->fd != -1) { - v9fs_do_close(s, fidp->fd); + if (fidp->fid_type == P9_FID_FILE) { + if (fidp->fs.fd != -1) { + v9fs_do_close(s, fidp->fs.fd); + } + } + if (fidp->fid_type == P9_FID_DIR) { + if (fidp->fs.dir) { + v9fs_do_closedir(s, fidp->fs.dir); + } } - if (fidp->dir) { - v9fs_do_closedir(s, fidp->dir); + if (fidp->fid_type == P9_FID_XATTR) { + if (fidp->fs.xattr.value) { + qemu_free(fidp->fs.xattr.value); + } } v9fs_string_free(&fidp->path); qemu_free(fidp); @@ -1489,8 +1497,7 @@ static void v9fs_walk(V9fsState *s, V9fsPDU *pdu) /* FIXME: is this really valid? */ if (fid == newfid) { - BUG_ON(vs->fidp->fd != -1); - BUG_ON(vs->fidp->dir); + BUG_ON(vs->fidp->fid_type != P9_FID_NONE); v9fs_string_init(&vs->path); vs->name_idx = 0; @@ -1554,11 +1561,12 @@ static int32_t get_iounit(V9fsState *s, V9fsString *name) static void v9fs_open_post_opendir(V9fsState *s, V9fsOpenState *vs, int err) { - if (vs->fidp->dir == NULL) { + if (vs->fidp->fs.dir == NULL) { err = -errno; goto out; } + vs->fidp->fid_type = P9_FID_DIR; vs->offset += pdu_marshal(vs->pdu, vs->offset, "Qd", &vs->qid, 0); err = vs->offset; out: @@ -1578,11 +1586,11 @@ static void v9fs_open_post_getiounit(V9fsState *s, V9fsOpenState *vs) static void v9fs_open_post_open(V9fsState *s, V9fsOpenState *vs, int err) { - if (vs->fidp->fd == -1) { + if (vs->fidp->fs.fd == -1) { err = -errno; goto out; } - + vs->fidp->fid_type = P9_FID_FILE; vs->iounit = get_iounit(s, &vs->fidp->path); v9fs_open_post_getiounit(s, vs); return; @@ -1612,7 +1620,7 @@ static void v9fs_open_post_lstat(V9fsState *s, V9fsOpenState *vs, int err) stat_to_qid(&vs->stbuf, &vs->qid); if (S_ISDIR(vs->stbuf.st_mode)) { - vs->fidp->dir = v9fs_do_opendir(s, &vs->fidp->path); + vs->fidp->fs.dir = v9fs_do_opendir(s, &vs->fidp->path); v9fs_open_post_opendir(s, vs, err); } else { if (s->proto_version == V9FS_PROTO_2000L) { @@ -1624,7 +1632,7 @@ static void v9fs_open_post_lstat(V9fsState *s, V9fsOpenState *vs, int err) } else { flags = omode_to_uflags(vs->mode); } - vs->fidp->fd = v9fs_do_open(s, &vs->fidp->path, flags); + vs->fidp->fs.fd = v9fs_do_open(s, &vs->fidp->path, flags); v9fs_open_post_open(s, vs, err); } return; @@ -1652,8 +1660,7 @@ static void v9fs_open(V9fsState *s, V9fsPDU *pdu) goto out; } - BUG_ON(vs->fidp->fd != -1); - BUG_ON(vs->fidp->dir); + BUG_ON(vs->fidp->fid_type != P9_FID_NONE); err = v9fs_do_lstat(s, &vs->fidp->path, &vs->stbuf); @@ -1698,7 +1705,7 @@ out: static void v9fs_lcreate_post_do_open2(V9fsState *s, V9fsLcreateState *vs, int err) { - if (vs->fidp->fd == -1) { + if (vs->fidp->fs.fd == -1) { err = -errno; goto out; } @@ -1735,7 +1742,7 @@ static void v9fs_lcreate(V9fsState *s, V9fsPDU *pdu) v9fs_string_sprintf(&vs->fullname, "%s/%s", vs->fidp->path.data, vs->name.data); - vs->fidp->fd = v9fs_do_open2(s, vs->fullname.data, vs->fidp->uid, + vs->fidp->fs.fd = v9fs_do_open2(s, vs->fullname.data, vs->fidp->uid, gid, flags, mode); v9fs_lcreate_post_do_open2(s, vs, err); return; @@ -1799,7 +1806,7 @@ static void v9fs_read_post_dir_lstat(V9fsState *s, V9fsReadState *vs, &vs->v9stat); if ((vs->len != (vs->v9stat.size + 2)) || ((vs->count + vs->len) > vs->max_count)) { - v9fs_do_seekdir(s, vs->fidp->dir, vs->dir_pos); + v9fs_do_seekdir(s, vs->fidp->fs.dir, vs->dir_pos); v9fs_read_post_seekdir(s, vs, err); return; } @@ -1807,11 +1814,11 @@ static void v9fs_read_post_dir_lstat(V9fsState *s, V9fsReadState *vs, v9fs_stat_free(&vs->v9stat); v9fs_string_free(&vs->name); vs->dir_pos = vs->dent->d_off; - vs->dent = v9fs_do_readdir(s, vs->fidp->dir); + vs->dent = v9fs_do_readdir(s, vs->fidp->fs.dir); v9fs_read_post_readdir(s, vs, err); return; out: - v9fs_do_seekdir(s, vs->fidp->dir, vs->dir_pos); + v9fs_do_seekdir(s, vs->fidp->fs.dir, vs->dir_pos); v9fs_read_post_seekdir(s, vs, err); return; @@ -1839,7 +1846,7 @@ static void v9fs_read_post_readdir(V9fsState *s, V9fsReadState *vs, ssize_t err) static void v9fs_read_post_telldir(V9fsState *s, V9fsReadState *vs, ssize_t err) { - vs->dent = v9fs_do_readdir(s, vs->fidp->dir); + vs->dent = v9fs_do_readdir(s, vs->fidp->fs.dir); v9fs_read_post_readdir(s, vs, err); return; } @@ -1847,7 +1854,7 @@ static void v9fs_read_post_telldir(V9fsState *s, V9fsReadState *vs, ssize_t err) static void v9fs_read_post_rewinddir(V9fsState *s, V9fsReadState *vs, ssize_t err) { - vs->dir_pos = v9fs_do_telldir(s, vs->fidp->dir); + vs->dir_pos = v9fs_do_telldir(s, vs->fidp->fs.dir); v9fs_read_post_telldir(s, vs, err); return; } @@ -1866,7 +1873,7 @@ static void v9fs_read_post_readv(V9fsState *s, V9fsReadState *vs, ssize_t err) if (0) { print_sg(vs->sg, vs->cnt); } - vs->len = v9fs_do_readv(s, vs->fidp->fd, vs->sg, vs->cnt); + vs->len = v9fs_do_readv(s, vs->fidp->fs.fd, vs->sg, vs->cnt); } while (vs->len == -1 && errno == EINTR); if (vs->len == -1) { err = -errno; @@ -1896,7 +1903,7 @@ static void v9fs_read_post_lseek(V9fsState *s, V9fsReadState *vs, ssize_t err) if (0) { print_sg(vs->sg, vs->cnt); } - vs->len = v9fs_do_readv(s, vs->fidp->fd, vs->sg, vs->cnt); + vs->len = v9fs_do_readv(s, vs->fidp->fs.fd, vs->sg, vs->cnt); } while (vs->len == -1 && errno == EINTR); if (vs->len == -1) { err = -errno; @@ -1930,18 +1937,18 @@ static void v9fs_read(V9fsState *s, V9fsPDU *pdu) goto out; } - if (vs->fidp->dir) { + if (vs->fidp->fs.dir) { vs->max_count = vs->count; vs->count = 0; if (vs->off == 0) { - v9fs_do_rewinddir(s, vs->fidp->dir); + v9fs_do_rewinddir(s, vs->fidp->fs.dir); } v9fs_read_post_rewinddir(s, vs, err); return; - } else if (vs->fidp->fd != -1) { + } else if (vs->fidp->fs.fd != -1) { vs->sg = vs->iov; pdu_marshal(vs->pdu, vs->offset + 4, "v", vs->sg, &vs->cnt); - err = v9fs_do_lseek(s, vs->fidp->fd, vs->off, SEEK_SET); + err = v9fs_do_lseek(s, vs->fidp->fs.fd, vs->off, SEEK_SET); v9fs_read_post_lseek(s, vs, err); return; } else { @@ -1990,7 +1997,7 @@ static void v9fs_readdir_post_readdir(V9fsState *s, V9fsReadDirState *vs) if ((vs->count + V9_READDIR_DATA_SZ) > vs->max_count) { /* Ran out of buffer. Set dir back to old position and return */ - v9fs_do_seekdir(s, vs->fidp->dir, vs->saved_dir_pos); + v9fs_do_seekdir(s, vs->fidp->fs.dir, vs->saved_dir_pos); v9fs_readdir_post_seekdir(s, vs); return; } @@ -2011,7 +2018,7 @@ static void v9fs_readdir_post_readdir(V9fsState *s, V9fsReadDirState *vs) vs->count += len; v9fs_string_free(&vs->name); vs->saved_dir_pos = vs->dent->d_off; - vs->dent = v9fs_do_readdir(s, vs->fidp->dir); + vs->dent = v9fs_do_readdir(s, vs->fidp->fs.dir); v9fs_readdir_post_readdir(s, vs); return; } @@ -2025,14 +2032,14 @@ static void v9fs_readdir_post_readdir(V9fsState *s, V9fsReadDirState *vs) static void v9fs_readdir_post_telldir(V9fsState *s, V9fsReadDirState *vs) { - vs->dent = v9fs_do_readdir(s, vs->fidp->dir); + vs->dent = v9fs_do_readdir(s, vs->fidp->fs.dir); v9fs_readdir_post_readdir(s, vs); return; } static void v9fs_readdir_post_setdir(V9fsState *s, V9fsReadDirState *vs) { - vs->saved_dir_pos = v9fs_do_telldir(s, vs->fidp->dir); + vs->saved_dir_pos = v9fs_do_telldir(s, vs->fidp->fs.dir); v9fs_readdir_post_telldir(s, vs); return; } @@ -2053,15 +2060,15 @@ static void v9fs_readdir(V9fsState *s, V9fsPDU *pdu) &vs->max_count); vs->fidp = lookup_fid(s, fid); - if (vs->fidp == NULL || !(vs->fidp->dir)) { + if (vs->fidp == NULL || !(vs->fidp->fs.dir)) { err = -EINVAL; goto out; } if (vs->initial_offset == 0) { - v9fs_do_rewinddir(s, vs->fidp->dir); + v9fs_do_rewinddir(s, vs->fidp->fs.dir); } else { - v9fs_do_seekdir(s, vs->fidp->dir, vs->initial_offset); + v9fs_do_seekdir(s, vs->fidp->fs.dir, vs->initial_offset); } v9fs_readdir_post_setdir(s, vs); @@ -2088,7 +2095,7 @@ static void v9fs_write_post_writev(V9fsState *s, V9fsWriteState *vs, if (0) { print_sg(vs->sg, vs->cnt); } - vs->len = v9fs_do_writev(s, vs->fidp->fd, vs->sg, vs->cnt); + vs->len = v9fs_do_writev(s, vs->fidp->fs.fd, vs->sg, vs->cnt); } while (vs->len == -1 && errno == EINTR); if (vs->len == -1) { err = -errno; @@ -2117,7 +2124,7 @@ static void v9fs_write_post_lseek(V9fsState *s, V9fsWriteState *vs, ssize_t err) if (0) { print_sg(vs->sg, vs->cnt); } - vs->len = v9fs_do_writev(s, vs->fidp->fd, vs->sg, vs->cnt); + vs->len = v9fs_do_writev(s, vs->fidp->fs.fd, vs->sg, vs->cnt); } while (vs->len == -1 && errno == EINTR); if (vs->len == -1) { err = -errno; @@ -2154,12 +2161,12 @@ static void v9fs_write(V9fsState *s, V9fsPDU *pdu) goto out; } - if (vs->fidp->fd == -1) { + if (vs->fidp->fs.fd == -1) { err = -EINVAL; goto out; } - err = v9fs_do_lseek(s, vs->fidp->fd, vs->off, SEEK_SET); + err = v9fs_do_lseek(s, vs->fidp->fs.fd, vs->off, SEEK_SET); v9fs_write_post_lseek(s, vs, err); return; @@ -2211,9 +2218,10 @@ static void v9fs_create_post_perms(V9fsState *s, V9fsCreateState *vs, int err) static void v9fs_create_post_opendir(V9fsState *s, V9fsCreateState *vs, int err) { - if (!vs->fidp->dir) { + if (!vs->fidp->fs.dir) { err = -errno; } + vs->fidp->fid_type = P9_FID_DIR; v9fs_post_create(s, vs, err); } @@ -2225,7 +2233,7 @@ static void v9fs_create_post_dir_lstat(V9fsState *s, V9fsCreateState *vs, goto out; } - vs->fidp->dir = v9fs_do_opendir(s, &vs->fullname); + vs->fidp->fs.dir = v9fs_do_opendir(s, &vs->fullname); v9fs_create_post_opendir(s, vs, err); return; @@ -2251,7 +2259,7 @@ out: static void v9fs_create_post_fstat(V9fsState *s, V9fsCreateState *vs, int err) { if (err) { - vs->fidp->fd = -1; + vs->fidp->fs.fd = -1; err = -errno; } @@ -2261,12 +2269,12 @@ static void v9fs_create_post_fstat(V9fsState *s, V9fsCreateState *vs, int err) static void v9fs_create_post_open2(V9fsState *s, V9fsCreateState *vs, int err) { - if (vs->fidp->fd == -1) { + if (vs->fidp->fs.fd == -1) { err = -errno; goto out; } - - err = v9fs_do_fstat(s, vs->fidp->fd, &vs->stbuf); + vs->fidp->fid_type = P9_FID_FILE; + err = v9fs_do_fstat(s, vs->fidp->fs.fd, &vs->stbuf); v9fs_create_post_fstat(s, vs, err); return; @@ -2337,7 +2345,7 @@ static void v9fs_create_post_lstat(V9fsState *s, V9fsCreateState *vs, int err) 0, vs->fidp->uid, -1); v9fs_post_create(s, vs, err); } else { - vs->fidp->fd = v9fs_do_open2(s, vs->fullname.data, vs->fidp->uid, + vs->fidp->fs.fd = v9fs_do_open2(s, vs->fullname.data, vs->fidp->uid, -1, omode_to_uflags(vs->mode)|O_CREAT, vs->perm); v9fs_create_post_open2(s, vs, err); @@ -2581,8 +2589,8 @@ static int v9fs_complete_rename(V9fsState *s, V9fsRenameState *vs) goto out; } - BUG_ON(dirfidp->fd != -1); - BUG_ON(dirfidp->dir); + BUG_ON(dirfidp->fs.fd != -1); + BUG_ON(dirfidp->fs.dir); new_name = qemu_mallocz(dirfidp->path.size + vs->name.size + 2); @@ -2693,8 +2701,8 @@ static void v9fs_rename(V9fsState *s, V9fsPDU *pdu) goto out; } - BUG_ON(vs->fidp->fd != -1); - BUG_ON(vs->fidp->dir); + BUG_ON(vs->fidp->fs.fd != -1); + BUG_ON(vs->fidp->fs.dir); err = v9fs_complete_rename(s, vs); v9fs_rename_post_rename(s, vs, err); @@ -2821,7 +2829,7 @@ static void v9fs_wstat(V9fsState *s, V9fsPDU *pdu) /* do we need to sync the file? */ if (donttouch_stat(&vs->v9stat)) { - err = v9fs_do_fsync(s, vs->fidp->fd); + err = v9fs_do_fsync(s, vs->fidp->fs.fd); v9fs_wstat_post_fsync(s, vs, err); return; } diff --git a/hw/virtio-9p.h b/hw/virtio-9p.h index 0c79400..e51918c 100644 --- a/hw/virtio-9p.h +++ b/hw/virtio-9p.h @@ -155,12 +155,32 @@ typedef struct V9fsStat int32_t n_muid; } V9fsStat; +enum { + P9_FID_NONE = 0, + P9_FID_FILE, + P9_FID_DIR, + P9_FID_XATTR, +}; + +typedef struct V9fsXattr +{ + int64_t copied_len; + int64_t len; + void *value; + V9fsString name; + int flags; +} V9fsXattr; + struct V9fsFidState { + int fid_type; int32_t fid; V9fsString path; - int fd; - DIR *dir; + union { + int fd; + DIR *dir; + V9fsXattr xattr; + } fs; uid_t uid; V9fsFidState *next; };