From: Jeffle Xu <jefflexu@linux.alibaba.com>
To: vgoyal@redhat.com, stefanha@redhat.com, miklos@szeredi.hu
Cc: linux-fsdevel@vger.kernel.org,
virtualization@lists.linux-foundation.org, virtio-fs@redhat.com,
joseph.qi@linux.alibaba.com, bo.liu@linux.alibaba.com
Subject: [virtiofsd PATCH v4 1/4] virtiofsd: add .ioctl() support
Date: Tue, 17 Aug 2021 10:23:44 +0800 [thread overview]
Message-ID: <20210817022347.18098-2-jefflexu@linux.alibaba.com> (raw)
In-Reply-To: <20210817022347.18098-1-jefflexu@linux.alibaba.com>
Add .ioctl() support for passthrough, in prep for the following support
for following per-file DAX feature.
Once advertising support for per-file DAX feature, virtiofsd should
support storing FS_DAX_FL flag persistently passed by
FS_IOC_SETFLAGS/FS_IOC_FSSETXATTR ioctl, and set FUSE_ATTR_DAX in
FUSE_LOOKUP accordingly if the file is capable of per-file DAX.
When it comes to passthrough, it passes corresponding ioctls to host
directly. Currently only these ioctls that are needed for per-file DAX
feature, i.e., FS_IOC_GETFLAGS/FS_IOC_SETFLAGS and
FS_IOC_FSGETXATTR/FS_IOC_FSSETXATTR are supported. Later we can restrict
the flags/attributes allowed to be set to reinforce the security, or
extend the scope of allowed ioctls if it is really needed later.
Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
---
tools/virtiofsd/passthrough_ll.c | 53 +++++++++++++++++++++++++++
tools/virtiofsd/passthrough_seccomp.c | 1 +
2 files changed, 54 insertions(+)
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index b76d878509..e170b17adb 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -54,6 +54,7 @@
#include <sys/wait.h>
#include <sys/xattr.h>
#include <syslog.h>
+#include <linux/fs.h>
#include "qemu/cutils.h"
#include "passthrough_helpers.h"
@@ -2105,6 +2106,57 @@ out:
fuse_reply_err(req, saverr);
}
+static void lo_ioctl(fuse_req_t req, fuse_ino_t ino, unsigned int cmd, void *arg,
+ struct fuse_file_info *fi, unsigned flags, const void *in_buf,
+ size_t in_bufsz, size_t out_bufsz)
+{
+ int fd = lo_fi_fd(req, fi);
+ int res;
+ int saverr = ENOSYS;
+
+ fuse_log(FUSE_LOG_DEBUG, "lo_ioctl(ino=%" PRIu64 ", cmd=0x%x, flags=0x%x, "
+ "in_bufsz = %lu, out_bufsz = %lu)\n",
+ ino, cmd, flags, in_bufsz, out_bufsz);
+
+ /* unrestricted ioctl is not supported yet */
+ if (flags & FUSE_IOCTL_UNRESTRICTED)
+ goto out;
+
+ /*
+ * Currently only those ioctls needed to support per-file DAX feature,
+ * i.e., FS_IOC_GETFLAGS/FS_IOC_SETFLAGS and
+ * FS_IOC_FSGETXATTR/FS_IOC_FSSETXATTR are supported.
+ */
+ if (cmd == FS_IOC_SETFLAGS || cmd == FS_IOC_FSSETXATTR) {
+ res = ioctl(fd, cmd, in_buf);
+ if (res < 0)
+ goto out_err;
+
+ fuse_reply_ioctl(req, 0, NULL, 0);
+ }
+ else if (cmd == FS_IOC_GETFLAGS || cmd == FS_IOC_FSGETXATTR) {
+ /* reused for 'unsigned int' for FS_IOC_GETFLAGS */
+ struct fsxattr attr;
+
+ res = ioctl(fd, cmd, &attr);
+ if (res < 0)
+ goto out_err;
+
+ fuse_reply_ioctl(req, 0, &attr, out_bufsz);
+ }
+ else {
+ fuse_log(FUSE_LOG_DEBUG, "Unsupported ioctl 0x%x\n", cmd);
+ goto out;
+ }
+
+ return;
+
+out_err:
+ saverr = errno;
+out:
+ fuse_reply_err(req, saverr);
+}
+
static void lo_fsyncdir(fuse_req_t req, fuse_ino_t ino, int datasync,
struct fuse_file_info *fi)
{
@@ -3279,6 +3331,7 @@ static struct fuse_lowlevel_ops lo_oper = {
.create = lo_create,
.getlk = lo_getlk,
.setlk = lo_setlk,
+ .ioctl = lo_ioctl,
.open = lo_open,
.release = lo_release,
.flush = lo_flush,
diff --git a/tools/virtiofsd/passthrough_seccomp.c b/tools/virtiofsd/passthrough_seccomp.c
index 62441cfcdb..2a5f7614fc 100644
--- a/tools/virtiofsd/passthrough_seccomp.c
+++ b/tools/virtiofsd/passthrough_seccomp.c
@@ -62,6 +62,7 @@ static const int syscall_allowlist[] = {
SCMP_SYS(gettid),
SCMP_SYS(gettimeofday),
SCMP_SYS(getxattr),
+ SCMP_SYS(ioctl),
SCMP_SYS(linkat),
SCMP_SYS(listxattr),
SCMP_SYS(lseek),
--
2.27.0
next prev parent reply other threads:[~2021-08-17 2:23 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-17 2:22 [PATCH v4 0/8] fuse,virtiofs: support per-file DAX Jeffle Xu
2021-08-17 2:22 ` [PATCH v4 1/8] fuse: add fuse_should_enable_dax() helper Jeffle Xu
2021-08-17 2:22 ` [PATCH v4 2/8] fuse: Make DAX mount option a tri-state Jeffle Xu
2021-08-17 2:22 ` [PATCH v4 3/8] fuse: support per-file DAX Jeffle Xu
2021-08-17 2:22 ` [PATCH v4 4/8] fuse: negotiate if server/client supports " Jeffle Xu
2021-08-17 2:22 ` [PATCH v4 5/8] fuse: enable " Jeffle Xu
2021-08-17 2:22 ` [PATCH v4 6/8] fuse: mark inode DONT_CACHE when per-file DAX indication changes Jeffle Xu
2021-08-17 10:26 ` [Virtio-fs] " Dr. David Alan Gilbert
2021-08-17 13:23 ` JeffleXu
2021-08-17 2:22 ` [PATCH v4 7/8] fuse: support changing per-file DAX flag inside guest Jeffle Xu
2021-08-17 2:22 ` [PATCH v4 8/8] fuse: show '-o dax=inode' option only when FUSE server supports Jeffle Xu
2021-08-17 2:23 ` [virtiofsd PATCH v4 0/4] virtiofsd: support per-file DAX Jeffle Xu
2021-08-17 2:23 ` Jeffle Xu [this message]
2021-08-18 17:33 ` [virtiofsd PATCH v4 1/4] virtiofsd: add .ioctl() support Vivek Goyal
2021-08-17 2:23 ` [virtiofsd PATCH v4 2/4] virtiofsd: expand fuse protocol to support per-file DAX Jeffle Xu
2021-08-17 2:23 ` [virtiofsd PATCH v4 3/4] virtiofsd: support per-file DAX negotiation in FUSE_INIT Jeffle Xu
2021-08-17 17:15 ` [Virtio-fs] " Dr. David Alan Gilbert
2021-08-18 5:28 ` JeffleXu
2021-08-19 13:57 ` Dr. David Alan Gilbert
2021-08-18 17:30 ` Vivek Goyal
2021-08-17 2:23 ` [virtiofsd PATCH v4 4/4] virtiofsd: support per-file DAX in FUSE_LOOKUP Jeffle Xu
2021-08-17 19:00 ` [Virtio-fs] " Dr. David Alan Gilbert
2021-08-18 5:46 ` JeffleXu
2021-08-19 13:08 ` Dr. David Alan Gilbert
2021-08-20 5:03 ` JeffleXu
2021-08-24 10:15 ` Greg Kurz
2021-09-08 10:34 ` JeffleXu
2021-08-17 8:06 ` [PATCH v4 0/8] fuse,virtiofs: support per-file DAX Miklos Szeredi
2021-08-17 9:32 ` [Virtio-fs] " Dr. David Alan Gilbert
2021-08-17 10:09 ` Miklos Szeredi
2021-08-17 10:37 ` Dr. David Alan Gilbert
2021-08-17 13:08 ` JeffleXu
2021-08-17 14:11 ` Miklos Szeredi
2021-08-17 15:19 ` Vivek Goyal
2021-08-17 14:54 ` Vivek Goyal
2021-08-18 5:10 ` JeffleXu
2021-08-19 6:14 ` JeffleXu
2021-08-17 12:40 ` Vivek Goyal
2021-09-16 8:21 ` JeffleXu
2021-09-18 3:06 ` JeffleXu
2021-09-19 19:45 ` Vivek Goyal
2021-09-22 8:16 ` JeffleXu
2021-08-17 12:39 ` Vivek Goyal
2021-08-17 13:22 ` JeffleXu
2021-08-17 14:08 ` Miklos Szeredi
2021-08-18 3:39 ` JeffleXu
2021-08-18 5:08 ` Miklos Szeredi
2021-08-18 16:58 ` Vivek Goyal
2021-09-03 5:30 ` JeffleXu
2021-09-07 14:51 ` Miklos Szeredi
2021-08-17 14:57 ` Vivek Goyal
2021-08-18 5:20 ` JeffleXu
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=20210817022347.18098-2-jefflexu@linux.alibaba.com \
--to=jefflexu@linux.alibaba.com \
--cc=bo.liu@linux.alibaba.com \
--cc=joseph.qi@linux.alibaba.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=stefanha@redhat.com \
--cc=vgoyal@redhat.com \
--cc=virtio-fs@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
/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).