From patchwork Tue Mar 16 09:15:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 47838 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 AAEE8B7DA7 for ; Tue, 16 Mar 2010 21:31:17 +1100 (EST) Received: from localhost ([127.0.0.1]:40424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NrTmg-0007jH-4P for incoming@patchwork.ozlabs.org; Tue, 16 Mar 2010 06:13:58 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NrSsv-00026W-FP for qemu-devel@nongnu.org; Tue, 16 Mar 2010 05:16:21 -0400 Received: from [199.232.76.173] (port=57578 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NrSsu-00025O-EC for qemu-devel@nongnu.org; Tue, 16 Mar 2010 05:16:20 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NrSss-0001Yz-Gt for qemu-devel@nongnu.org; Tue, 16 Mar 2010 05:16:20 -0400 Received: from mx20.gnu.org ([199.232.41.8]:47224) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NrSsr-0001Es-5a for qemu-devel@nongnu.org; Tue, 16 Mar 2010 05:16:17 -0400 Received: from e23smtp06.au.ibm.com ([202.81.31.148]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NrSsV-0001XZ-I7 for qemu-devel@nongnu.org; Tue, 16 Mar 2010 05:15:56 -0400 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp06.au.ibm.com (8.14.3/8.13.1) with ESMTP id o2G9FgVW026205 for ; Tue, 16 Mar 2010 20:15:42 +1100 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o2G9Fnrd1577048 for ; Tue, 16 Mar 2010 20:15:49 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o2G9FneO006667 for ; Tue, 16 Mar 2010 20:15:49 +1100 Received: from localhost.localdomain ([9.124.214.164]) by d23av02.au.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id o2G9FRvH005290; Tue, 16 Mar 2010 20:15:47 +1100 From: "Aneesh Kumar K.V" To: qemu-devel@nongnu.org Date: Tue, 16 Mar 2010 14:45:08 +0530 Message-Id: <1268730920-14584-11-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.2.273.gc2413 In-Reply-To: <1268730920-14584-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1268730920-14584-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-detected-operating-system: by monty-python.gnu.org: Error: This connection is not (no longer?) in the cache. Cc: ericvh@gmail.com, aliguori@us.ibm.com, "Aneesh Kumar K.V" , Gautham R Shenoy Subject: [Qemu-devel] [PATCH -v2 10/22] virtio-9p: Implement P9_TCREATE 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: Anthony Liguori [jvrao@linux.vnet.ibm.com: strdup to qemu_strdup conversion] Signed-off-by: Anthony Liguori Signed-off-by: Gautham R Shenoy Signed-off-by: Aneesh Kumar K.V --- hw/virtio-9p-local.c | 80 +++++++++++++++ hw/virtio-9p.c | 266 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 344 insertions(+), 2 deletions(-) diff --git a/hw/virtio-9p-local.c b/hw/virtio-9p-local.c index c5d1db3..cdae5c0 100644 --- a/hw/virtio-9p-local.c +++ b/hw/virtio-9p-local.c @@ -135,6 +135,78 @@ static ssize_t local_writev(void *opaque, int fd, const struct iovec *iov, return writev(fd, iov, iovcnt); } +static int local_chmod(void *opaque, const char *path, mode_t mode) +{ + return chmod(rpath(path), mode); +} + +static int local_mknod(void *opaque, const char *path, mode_t mode, dev_t dev) +{ + return mknod(rpath(path), mode, dev); +} + +static int local_mksock(void *opaque, const char *path) +{ + struct sockaddr_un addr; + int s; + + addr.sun_family = AF_UNIX; + snprintf(addr.sun_path, 108, "%s", rpath(path)); + + s = socket(PF_UNIX, SOCK_STREAM, 0); + if (s == -1) + return -1; + + if (bind(s, (struct sockaddr *)&addr, sizeof(addr))) { + close(s); + return -1; + } + + close(s); + return 0; +} + +static int local_mkdir(void *opaque, const char *path, mode_t mode) +{ + return mkdir(rpath(path), mode); +} + +static int local_fstat(void *opaque, int fd, struct stat *stbuf) +{ + return fstat(fd, stbuf); +} + +static int local_open2(void *opaque, const char *path, int flags, mode_t mode) +{ + return open(rpath(path), flags, mode); +} + +static int local_symlink(void *opaque, const char *oldpath, + const char *newpath) +{ + return symlink(oldpath, rpath(newpath)); +} + +static int local_link(void *opaque, const char *oldpath, const char *newpath) +{ + char *tmp = qemu_strdup(rpath(oldpath)); + int err, serrno = 0; + + if (tmp == NULL) + return -ENOMEM; + + err = link(tmp, rpath(newpath)); + if (err == -1) + serrno = errno; + + qemu_free(tmp); + + if (err == -1) + errno = serrno; + + return err; +} + static V9fsPosixFileOperations ops = { .lstat = local_lstat, .setuid = local_setuid, @@ -150,6 +222,14 @@ static V9fsPosixFileOperations ops = { .readv = local_readv, .lseek = local_lseek, .writev = local_writev, + .chmod = local_chmod, + .mknod = local_mknod, + .mksock = local_mksock, + .mkdir = local_mkdir, + .fstat = local_fstat, + .open2 = local_open2, + .symlink = local_symlink, + .link = local_link, }; V9fsPosixFileOperations *virtio_9p_init_local(const char *path) diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index bc26d66..067cc85 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -174,6 +174,47 @@ static int posix_writev(V9fsState *s, int fd, const struct iovec *iov, return s->ops->writev(s->ops->opaque, fd, iov, iovcnt); } +static int posix_chmod(V9fsState *s, V9fsString *path, mode_t mode) +{ + return s->ops->chmod(s->ops->opaque, path->data, mode); +} + +static int posix_mknod(V9fsState *s, V9fsString *path, mode_t mode, dev_t dev) +{ + return s->ops->mknod(s->ops->opaque, path->data, mode, dev); +} + +static int posix_mksock(V9fsState *s, V9fsString *path) +{ + return s->ops->mksock(s->ops->opaque, path->data); +} + +static int posix_mkdir(V9fsState *s, V9fsString *path, mode_t mode) +{ + return s->ops->mkdir(s->ops->opaque, path->data, mode); +} + +static int posix_fstat(V9fsState *s, int fd, struct stat *stbuf) +{ + return s->ops->fstat(s->ops->opaque, fd, stbuf); +} + +static int posix_open2(V9fsState *s, V9fsString *path, int flags, mode_t mode) +{ + return s->ops->open2(s->ops->opaque, path->data, flags, mode); +} + +static int posix_symlink(V9fsState *s, V9fsString *oldpath, + V9fsString *newpath) +{ + return s->ops->symlink(s->ops->opaque, oldpath->data, newpath->data); +} + +static int posix_link(V9fsState *s, V9fsString *oldpath, V9fsString *newpath) +{ + return s->ops->link(s->ops->opaque, oldpath->data, newpath->data); +} + static void v9fs_string_init(V9fsString *str) { str->data = NULL; @@ -1418,10 +1459,231 @@ out: qemu_free(vs); } +typedef struct V9fsCreateState { + V9fsPDU *pdu; + size_t offset; + int32_t fid; + V9fsFidState *fidp; + V9fsQID qid; + int32_t perm; + int8_t mode; + struct stat stbuf; + V9fsString name; + V9fsString extension; + V9fsString fullname; +} V9fsCreateState; + +static void v9fs_post_create(V9fsState *s, V9fsCreateState *vs, int err) +{ + 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); + + err = vs->offset; + } + + complete_pdu(s, vs->pdu, err); + v9fs_string_free(&vs->name); + v9fs_string_free(&vs->extension); + v9fs_string_free(&vs->fullname); + qemu_free(vs); +} + +static void v9fs_create_post_perms(V9fsState *s, V9fsCreateState *vs, int err) +{ + if (err) { + err = -errno; + } + v9fs_post_create(s, vs, err); +} + +static void v9fs_create_post_opendir(V9fsState *s, V9fsCreateState *vs, + int err) +{ + if (!vs->fidp->dir) { + err = -errno; + } + v9fs_post_create(s, vs, err); +} + +static void v9fs_create_post_dir_lstat(V9fsState *s, V9fsCreateState *vs, + int err) +{ + if (err) { + err = -errno; + goto out; + } + + vs->fidp->dir = posix_opendir(s, &vs->fullname); + v9fs_create_post_opendir(s, vs, err); + return; + +out: + v9fs_post_create(s, vs, err); +} + +static void v9fs_create_post_mkdir(V9fsState *s, V9fsCreateState *vs, int err) +{ + if (err) { + err = -errno; + goto out; + } + + err = posix_lstat(s, &vs->fullname, &vs->stbuf); + v9fs_create_post_dir_lstat(s, vs, err); + return; + +out: + v9fs_post_create(s, vs, err); +} + +static void v9fs_create_post_mksock(V9fsState *s, V9fsCreateState *vs, + int err) +{ + if (err) { + err = -errno; + goto out; + } + + err = posix_chmod(s, &vs->fullname, vs->perm & 0777); + v9fs_create_post_perms(s, vs, err); + return; + +out: + v9fs_post_create(s, vs, err); +} + +static void v9fs_create_post_fstat(V9fsState *s, V9fsCreateState *vs, int err) +{ + if (err) { + vs->fidp->fd = -1; + err = -errno; + } + + v9fs_post_create(s, vs, err); + return; +} + +static void v9fs_create_post_open2(V9fsState *s, V9fsCreateState *vs, int err) +{ + if (vs->fidp->fd == -1) { + err = -errno; + goto out; + } + + err = posix_fstat(s, vs->fidp->fd, &vs->stbuf); + v9fs_create_post_fstat(s, vs, err); + + return; + +out: + v9fs_post_create(s, vs, err); + +} + +static void v9fs_create_post_lstat(V9fsState *s, V9fsCreateState *vs, int err) +{ + + if ( err == 0 || errno != ENOENT) { + err = -EEXIST; + goto out; + } + + if (vs->perm & P9_STAT_MODE_DIR) { + err = posix_mkdir(s, &vs->fullname, vs->perm & 0777); + v9fs_create_post_mkdir(s, vs, err); + } else if (vs->perm & P9_STAT_MODE_SYMLINK) { + err = posix_symlink(s, &vs->extension, &vs->fullname); + v9fs_create_post_perms(s, vs, err); + } else if (vs->perm & P9_STAT_MODE_LINK) { + int32_t nfid = atoi(vs->extension.data); + V9fsFidState *nfidp = lookup_fid(s, nfid); + + if (nfidp == NULL) { + err = -errno; + v9fs_post_create(s, vs, err); + } + + err = posix_link(s, &nfidp->path, &vs->fullname); + v9fs_create_post_perms(s, vs, err); + } else if (vs->perm & P9_STAT_MODE_DEVICE) { + char ctype; + uint32_t major, minor; + mode_t nmode = 0; + + if (sscanf(vs->extension.data, "%c %u %u", &ctype, &major, &minor) != 3) { + err = -errno; + v9fs_post_create(s, vs, err); + } + + switch (ctype) { + case 'c': + nmode = S_IFCHR; + break; + case 'b': + nmode = S_IFBLK; + break; + default: + err = -EIO; + v9fs_post_create(s, vs, err); + } + + nmode |= vs->perm & 0777; + err = posix_mknod(s, &vs->fullname, nmode, makedev(major, minor)); + v9fs_create_post_perms(s, vs, err); + } else if (vs->perm & P9_STAT_MODE_NAMED_PIPE) { + err = posix_mknod(s, &vs->fullname, S_IFIFO | (vs->mode & 0777), 0); + v9fs_post_create(s, vs, err); + } else if (vs->perm & P9_STAT_MODE_SOCKET) { + err = posix_mksock(s, &vs->fullname); + v9fs_create_post_mksock(s, vs, err); + } else { + vs->fidp->fd = posix_open2(s, &vs->fullname, + omode_to_uflags(vs->mode) | O_CREAT, + vs->perm & 0777); + v9fs_create_post_open2(s, vs, err); + } + + return; + +out: + v9fs_post_create(s, vs, err); +} + static void v9fs_create(V9fsState *s, V9fsPDU *pdu) { - if (debug_9p_pdu) - pprint_pdu(pdu); + V9fsCreateState *vs; + int err = 0; + + vs = qemu_malloc(sizeof(*vs)); + vs->pdu = pdu; + vs->offset = 7; + + v9fs_string_init(&vs->fullname); + + pdu_unmarshal(vs->pdu, vs->offset, "dsdbs", &vs->fid, &vs->name, + &vs->perm, &vs->mode, &vs->extension); + + vs->fidp = lookup_fid(s, vs->fid); + if (vs->fidp == NULL) { + err = -EINVAL; + goto out; + } + + v9fs_string_sprintf(&vs->fullname, "%s/%s", vs->fidp->path.data, + vs->name.data); + + err = posix_lstat(s, &vs->fullname, &vs->stbuf); + v9fs_create_post_lstat(s, vs, err); + return; + +out: + complete_pdu(s, vs->pdu, err); + v9fs_string_free(&vs->name); + v9fs_string_free(&vs->extension); + qemu_free(vs); } static void v9fs_flush(V9fsState *s, V9fsPDU *pdu)