From: Vivek Goyal <vgoyal@redhat.com>
To: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
Cc: virtio-fs@redhat.com, marcandre.lureau@redhat.com,
qemu-devel@nongnu.org, stefanha@redhat.com, mst@redhat.com
Subject: Re: [PATCH 12/24] DAX: virtiofsd: Wire up passthrough_ll's lo_setupmapping
Date: Thu, 11 Feb 2021 11:05:08 -0500 [thread overview]
Message-ID: <20210211160508.GA3259@redhat.com> (raw)
In-Reply-To: <20210209190224.62827-13-dgilbert@redhat.com>
On Tue, Feb 09, 2021 at 07:02:12PM +0000, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> Wire up passthrough_ll's setupmapping to allocate, send to virtio
> and then reply OK.
>
> Guest might not pass file pointer. In that case using inode info, open
> the file again, mmap() and close fd.
>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
> With fix from:
> Signed-off-by: Fotis Xenakis <foxen@windowslive.com>
> ---
> tools/virtiofsd/fuse_lowlevel.c | 13 ++++++--
> tools/virtiofsd/passthrough_ll.c | 52 ++++++++++++++++++++++++++++++--
> 2 files changed, 61 insertions(+), 4 deletions(-)
>
> diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
> index 0d3768b7d0..f74583e095 100644
> --- a/tools/virtiofsd/fuse_lowlevel.c
> +++ b/tools/virtiofsd/fuse_lowlevel.c
> @@ -1897,8 +1897,17 @@ static void do_setupmapping(fuse_req_t req, fuse_ino_t nodeid,
> }
>
> if (req->se->op.setupmapping) {
> - req->se->op.setupmapping(req, nodeid, arg->foffset, arg->len,
> - arg->moffset, genflags, &fi);
> + /*
> + * TODO: Add a flag to request which tells if arg->fh is
> + * valid or not.
> + */
> + if (fi.fh == (uint64_t)-1) {
> + req->se->op.setupmapping(req, nodeid, arg->foffset, arg->len,
> + arg->moffset, genflags, NULL);
> + } else {
> + req->se->op.setupmapping(req, nodeid, arg->foffset, arg->len,
> + arg->moffset, genflags, &fi);
> + }
> } else {
> fuse_reply_err(req, ENOSYS);
> }
> diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
> index 31c43d67a0..0493f00756 100644
> --- a/tools/virtiofsd/passthrough_ll.c
> +++ b/tools/virtiofsd/passthrough_ll.c
> @@ -2967,8 +2967,56 @@ static void lo_setupmapping(fuse_req_t req, fuse_ino_t ino, uint64_t foffset,
> uint64_t len, uint64_t moffset, uint64_t flags,
> struct fuse_file_info *fi)
> {
> - /* TODO */
> - fuse_reply_err(req, ENOSYS);
> + struct lo_data *lo = lo_data(req);
> + int ret = 0, fd;
> + VhostUserFSSlaveMsg msg = { 0 };
> + uint64_t vhu_flags;
> + char *buf;
> + bool writable = flags & O_RDWR;
> +
> + fuse_log(FUSE_LOG_DEBUG,
> + "lo_setupmapping(ino=%" PRIu64 ", fi=0x%p,"
> + " foffset=%" PRIu64 ", len=%" PRIu64 ", moffset=%" PRIu64
> + ", flags=%" PRIu64 ")\n",
> + ino, (void *)fi, foffset, len, moffset, flags);
> +
> + vhu_flags = VHOST_USER_FS_FLAG_MAP_R;
> + if (writable) {
> + vhu_flags |= VHOST_USER_FS_FLAG_MAP_W;
> + }
> +
> + msg.fd_offset[0] = foffset;
> + msg.len[0] = len;
> + msg.c_offset[0] = moffset;
> + msg.flags[0] = vhu_flags;
> +
> + if (fi) {
> + fd = lo_fi_fd(req, fi);
> + } else {
> + ret = asprintf(&buf, "%i", lo_fd(req, ino));
> + if (ret == -1) {
> + return (void)fuse_reply_err(req, errno);
> + }
> +
> + fd = openat(lo->proc_self_fd, buf, flags);
> + free(buf);
We can probably now use lo_inode_open() instead here now?
Vivek
next prev parent reply other threads:[~2021-02-11 16:09 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-09 19:02 [PATCH 00/24] virtiofs dax patches Dr. David Alan Gilbert (git)
2021-02-09 19:02 ` [PATCH 01/24] DAX: vhost-user: Rework slave return values Dr. David Alan Gilbert (git)
2021-02-11 9:59 ` Stefan Hajnoczi
2021-02-11 15:27 ` Vivek Goyal
2021-02-18 12:18 ` Dr. David Alan Gilbert
2021-02-09 19:02 ` [PATCH 02/24] DAX: libvhost-user: Route slave message payload Dr. David Alan Gilbert (git)
2021-02-11 10:05 ` Stefan Hajnoczi
2021-02-09 19:02 ` [PATCH 03/24] DAX: libvhost-user: Allow popping a queue element with bad pointers Dr. David Alan Gilbert (git)
2021-02-11 10:12 ` Stefan Hajnoczi
2021-02-09 19:02 ` [PATCH 04/24] DAX subprojects/libvhost-user: Add virtio-fs slave types Dr. David Alan Gilbert (git)
2021-02-11 10:16 ` Stefan Hajnoczi
2021-02-09 19:02 ` [PATCH 05/24] DAX: virtio: Add shared memory capability Dr. David Alan Gilbert (git)
2021-02-11 10:17 ` Stefan Hajnoczi
2021-02-09 19:02 ` [PATCH 06/24] DAX: virtio-fs: Add cache BAR Dr. David Alan Gilbert (git)
2021-02-11 10:25 ` Stefan Hajnoczi
2021-02-18 17:33 ` Dr. David Alan Gilbert
2021-02-09 19:02 ` [PATCH 07/24] DAX: virtio-fs: Add vhost-user slave commands for mapping Dr. David Alan Gilbert (git)
2021-02-11 10:32 ` Stefan Hajnoczi
2021-03-08 17:04 ` Dr. David Alan Gilbert
2021-02-15 10:35 ` [Virtio-fs] " Chirantan Ekbote
2021-02-15 13:25 ` Dr. David Alan Gilbert
2021-02-15 14:24 ` Vivek Goyal
2021-03-11 12:15 ` Dr. David Alan Gilbert
2021-03-11 13:50 ` Vivek Goyal
2021-03-11 18:52 ` Dr. David Alan Gilbert
2021-02-09 19:02 ` [PATCH 08/24] DAX: virtio-fs: Fill in " Dr. David Alan Gilbert (git)
2021-02-11 10:57 ` Stefan Hajnoczi
2021-02-18 10:59 ` Dr. David Alan Gilbert
2021-02-09 19:02 ` [PATCH 09/24] DAX: virtiofsd Add cache accessor functions Dr. David Alan Gilbert (git)
2021-02-11 12:31 ` Stefan Hajnoczi
2021-02-09 19:02 ` [PATCH 10/24] DAX: virtiofsd: Add setup/remove mappings fuse commands Dr. David Alan Gilbert (git)
2021-02-11 12:37 ` Stefan Hajnoczi
2021-02-11 16:39 ` Dr. David Alan Gilbert
2021-02-11 18:30 ` Vivek Goyal
2021-02-11 19:50 ` Dr. David Alan Gilbert
2021-02-11 20:15 ` Vivek Goyal
2021-02-09 19:02 ` [PATCH 11/24] DAX: virtiofsd: Add setup/remove mapping handlers to passthrough_ll Dr. David Alan Gilbert (git)
2021-02-11 12:37 ` Stefan Hajnoczi
2021-02-09 19:02 ` [PATCH 12/24] DAX: virtiofsd: Wire up passthrough_ll's lo_setupmapping Dr. David Alan Gilbert (git)
2021-02-11 12:41 ` Stefan Hajnoczi
2021-02-11 16:05 ` Vivek Goyal [this message]
2021-02-09 19:02 ` [PATCH 13/24] DAX: virtiofsd: Make lo_removemapping() work Dr. David Alan Gilbert (git)
2021-02-11 12:41 ` Stefan Hajnoczi
2021-02-09 19:02 ` [PATCH 14/24] DAX: virtiofsd: route se down to destroy method Dr. David Alan Gilbert (git)
2021-02-11 12:42 ` Stefan Hajnoczi
2021-02-09 19:02 ` [PATCH 15/24] DAX: virtiofsd: Perform an unmap on destroy Dr. David Alan Gilbert (git)
2021-02-11 12:42 ` Stefan Hajnoczi
2021-02-09 19:02 ` [PATCH 16/24] DAX/unmap: virtiofsd: Add VHOST_USER_SLAVE_FS_IO Dr. David Alan Gilbert (git)
2021-02-11 14:17 ` Stefan Hajnoczi
2021-03-16 19:59 ` Dr. David Alan Gilbert
2021-03-31 10:12 ` Stefan Hajnoczi
2021-02-09 19:02 ` [PATCH 17/24] DAX/unmap virtiofsd: Add wrappers for VHOST_USER_SLAVE_FS_IO Dr. David Alan Gilbert (git)
2021-02-11 14:18 ` Stefan Hajnoczi
2021-02-09 19:02 ` [PATCH 18/24] DAX/unmap virtiofsd: Parse unmappable elements Dr. David Alan Gilbert (git)
2021-02-11 14:29 ` Stefan Hajnoczi
2021-02-25 10:19 ` Dr. David Alan Gilbert
2021-03-31 10:14 ` Stefan Hajnoczi
2021-03-17 10:33 ` Dr. David Alan Gilbert
2021-02-09 19:02 ` [PATCH 19/24] DAX/unmap virtiofsd: Route unmappable reads Dr. David Alan Gilbert (git)
2021-02-09 19:02 ` [PATCH 20/24] DAX/unmap virtiofsd: route unmappable write to slave command Dr. David Alan Gilbert (git)
2021-02-09 19:02 ` [PATCH 21/24] DAX:virtiofsd: implement FUSE_INIT map_alignment field Dr. David Alan Gilbert (git)
2021-02-09 19:02 ` [PATCH 22/24] vhost-user-fs: Extend VhostUserFSSlaveMsg to pass additional info Dr. David Alan Gilbert (git)
2021-02-09 19:02 ` [PATCH 23/24] vhost-user-fs: Implement drop CAP_FSETID functionality Dr. David Alan Gilbert (git)
2021-02-11 14:35 ` Stefan Hajnoczi
2021-02-11 14:40 ` Vivek Goyal
2021-02-15 15:57 ` Stefan Hajnoczi
2021-02-16 15:57 ` Vivek Goyal
2021-02-22 16:53 ` Stefan Hajnoczi
2021-02-09 19:02 ` [PATCH 24/24] virtiofsd: Ask qemu to drop CAP_FSETID if client asked for it Dr. David Alan Gilbert (git)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210211160508.GA3259@redhat.com \
--to=vgoyal@redhat.com \
--cc=dgilbert@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=virtio-fs@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).