qemu-kvm/kvm-virtiofsd-passthrough_ll-add-dirp_map-to-hide-lo_dir.patch

239 lines
6.6 KiB
Diff
Raw Normal View History

* Fri Jan 31 2020 Miroslav Rezanina <mrezanin@redhat.com> - 4.2.0-8.el8 - kvm-target-arm-arch_dump-Add-SVE-notes.patch [bz#1725084] - kvm-vhost-Add-names-to-section-rounded-warning.patch [bz#1779041] - kvm-vhost-Only-align-sections-for-vhost-user.patch [bz#1779041] - kvm-vhost-coding-style-fix.patch [bz#1779041] - kvm-virtio-fs-fix-MSI-X-nvectors-calculation.patch [bz#1694164] - kvm-vhost-user-fs-remove-vhostfd-property.patch [bz#1694164] - kvm-build-rename-CONFIG_LIBCAP-to-CONFIG_LIBCAP_NG.patch [bz#1694164] - kvm-virtiofsd-Pull-in-upstream-headers.patch [bz#1694164] - kvm-virtiofsd-Pull-in-kernel-s-fuse.h.patch [bz#1694164] - kvm-virtiofsd-Add-auxiliary-.c-s.patch [bz#1694164] - kvm-virtiofsd-Add-fuse_lowlevel.c.patch [bz#1694164] - kvm-virtiofsd-Add-passthrough_ll.patch [bz#1694164] - kvm-virtiofsd-Trim-down-imported-files.patch [bz#1694164] - kvm-virtiofsd-Format-imported-files-to-qemu-style.patch [bz#1694164] - kvm-virtiofsd-remove-mountpoint-dummy-argument.patch [bz#1694164] - kvm-virtiofsd-remove-unused-notify-reply-support.patch [bz#1694164] - kvm-virtiofsd-Remove-unused-enum-fuse_buf_copy_flags.patch [bz#1694164] - kvm-virtiofsd-Fix-fuse_daemonize-ignored-return-values.patch [bz#1694164] - kvm-virtiofsd-Fix-common-header-and-define-for-QEMU-buil.patch [bz#1694164] - kvm-virtiofsd-Trim-out-compatibility-code.patch [bz#1694164] - kvm-vitriofsd-passthrough_ll-fix-fallocate-ifdefs.patch [bz#1694164] - kvm-virtiofsd-Make-fsync-work-even-if-only-inode-is-pass.patch [bz#1694164] - kvm-virtiofsd-Add-options-for-virtio.patch [bz#1694164] - kvm-virtiofsd-add-o-source-PATH-to-help-output.patch [bz#1694164] - kvm-virtiofsd-Open-vhost-connection-instead-of-mounting.patch [bz#1694164] - kvm-virtiofsd-Start-wiring-up-vhost-user.patch [bz#1694164] - kvm-virtiofsd-Add-main-virtio-loop.patch [bz#1694164] - kvm-virtiofsd-get-set-features-callbacks.patch [bz#1694164] - kvm-virtiofsd-Start-queue-threads.patch [bz#1694164] - kvm-virtiofsd-Poll-kick_fd-for-queue.patch [bz#1694164] - kvm-virtiofsd-Start-reading-commands-from-queue.patch [bz#1694164] - kvm-virtiofsd-Send-replies-to-messages.patch [bz#1694164] - kvm-virtiofsd-Keep-track-of-replies.patch [bz#1694164] - kvm-virtiofsd-Add-Makefile-wiring-for-virtiofsd-contrib.patch [bz#1694164] - kvm-virtiofsd-Fast-path-for-virtio-read.patch [bz#1694164] - kvm-virtiofsd-add-fd-FDNUM-fd-passing-option.patch [bz#1694164] - kvm-virtiofsd-make-f-foreground-the-default.patch [bz#1694164] - kvm-virtiofsd-add-vhost-user.json-file.patch [bz#1694164] - kvm-virtiofsd-add-print-capabilities-option.patch [bz#1694164] - kvm-virtiofs-Add-maintainers-entry.patch [bz#1694164] - kvm-virtiofsd-passthrough_ll-create-new-files-in-caller-.patch [bz#1694164] - kvm-virtiofsd-passthrough_ll-add-lo_map-for-ino-fh-indir.patch [bz#1694164] - kvm-virtiofsd-passthrough_ll-add-ino_map-to-hide-lo_inod.patch [bz#1694164] - kvm-virtiofsd-passthrough_ll-add-dirp_map-to-hide-lo_dir.patch [bz#1694164] - kvm-virtiofsd-passthrough_ll-add-fd_map-to-hide-file-des.patch [bz#1694164] - kvm-virtiofsd-passthrough_ll-add-fallback-for-racy-ops.patch [bz#1694164] - kvm-virtiofsd-validate-path-components.patch [bz#1694164] - kvm-virtiofsd-Plumb-fuse_bufvec-through-to-do_write_buf.patch [bz#1694164] - kvm-virtiofsd-Pass-write-iov-s-all-the-way-through.patch [bz#1694164] - kvm-virtiofsd-add-fuse_mbuf_iter-API.patch [bz#1694164] - kvm-virtiofsd-validate-input-buffer-sizes-in-do_write_bu.patch [bz#1694164] - kvm-virtiofsd-check-input-buffer-size-in-fuse_lowlevel.c.patch [bz#1694164] - kvm-virtiofsd-prevent-.-escape-in-lo_do_lookup.patch [bz#1694164] - kvm-virtiofsd-prevent-.-escape-in-lo_do_readdir.patch [bz#1694164] - kvm-virtiofsd-use-proc-self-fd-O_PATH-file-descriptor.patch [bz#1694164] - kvm-virtiofsd-sandbox-mount-namespace.patch [bz#1694164] - kvm-virtiofsd-move-to-an-empty-network-namespace.patch [bz#1694164] - kvm-virtiofsd-move-to-a-new-pid-namespace.patch [bz#1694164] - kvm-virtiofsd-add-seccomp-whitelist.patch [bz#1694164] - kvm-virtiofsd-Parse-flag-FUSE_WRITE_KILL_PRIV.patch [bz#1694164] - kvm-virtiofsd-cap-ng-helpers.patch [bz#1694164] - kvm-virtiofsd-Drop-CAP_FSETID-if-client-asked-for-it.patch [bz#1694164] - kvm-virtiofsd-set-maximum-RLIMIT_NOFILE-limit.patch [bz#1694164] - kvm-virtiofsd-fix-libfuse-information-leaks.patch [bz#1694164] - kvm-virtiofsd-add-syslog-command-line-option.patch [bz#1694164] - kvm-virtiofsd-print-log-only-when-priority-is-high-enoug.patch [bz#1694164] - kvm-virtiofsd-Add-ID-to-the-log-with-FUSE_LOG_DEBUG-leve.patch [bz#1694164] - kvm-virtiofsd-Add-timestamp-to-the-log-with-FUSE_LOG_DEB.patch [bz#1694164] - kvm-virtiofsd-Handle-reinit.patch [bz#1694164] - kvm-virtiofsd-Handle-hard-reboot.patch [bz#1694164] - kvm-virtiofsd-Kill-threads-when-queues-are-stopped.patch [bz#1694164] - kvm-vhost-user-Print-unexpected-slave-message-types.patch [bz#1694164] - kvm-contrib-libvhost-user-Protect-slave-fd-with-mutex.patch [bz#1694164] - kvm-virtiofsd-passthrough_ll-add-renameat2-support.patch [bz#1694164] - kvm-virtiofsd-passthrough_ll-disable-readdirplus-on-cach.patch [bz#1694164] - kvm-virtiofsd-passthrough_ll-control-readdirplus.patch [bz#1694164] - kvm-virtiofsd-rename-unref_inode-to-unref_inode_lolocked.patch [bz#1694164] - kvm-virtiofsd-fail-when-parent-inode-isn-t-known-in-lo_d.patch [bz#1694164] - kvm-virtiofsd-extract-root-inode-init-into-setup_root.patch [bz#1694164] - kvm-virtiofsd-passthrough_ll-clean-up-cache-related-opti.patch [bz#1694164] - kvm-virtiofsd-passthrough_ll-use-hashtable.patch [bz#1694164] - kvm-virtiofsd-Clean-up-inodes-on-destroy.patch [bz#1694164] - kvm-virtiofsd-support-nanosecond-resolution-for-file-tim.patch [bz#1694164] - kvm-virtiofsd-fix-error-handling-in-main.patch [bz#1694164] - kvm-virtiofsd-cleanup-allocated-resource-in-se.patch [bz#1694164] - kvm-virtiofsd-fix-memory-leak-on-lo.source.patch [bz#1694164] - kvm-virtiofsd-add-helper-for-lo_data-cleanup.patch [bz#1694164] - kvm-virtiofsd-Prevent-multiply-running-with-same-vhost_u.patch [bz#1694164] - kvm-virtiofsd-enable-PARALLEL_DIROPS-during-INIT.patch [bz#1694164] - kvm-virtiofsd-fix-incorrect-error-handling-in-lo_do_look.patch [bz#1694164] - kvm-Virtiofsd-fix-memory-leak-on-fuse-queueinfo.patch [bz#1694164] - kvm-virtiofsd-Support-remote-posix-locks.patch [bz#1694164] - kvm-virtiofsd-use-fuse_lowlevel_is_virtio-in-fuse_sessio.patch [bz#1694164] - kvm-virtiofsd-prevent-fv_queue_thread-vs-virtio_loop-rac.patch [bz#1694164] - kvm-virtiofsd-make-lo_release-atomic.patch [bz#1694164] - kvm-virtiofsd-prevent-races-with-lo_dirp_put.patch [bz#1694164] - kvm-virtiofsd-rename-inode-refcount-to-inode-nlookup.patch [bz#1694164] - kvm-libvhost-user-Fix-some-memtable-remap-cases.patch [bz#1694164] - kvm-virtiofsd-passthrough_ll-fix-refcounting-on-remove-r.patch [bz#1694164] - kvm-virtiofsd-introduce-inode-refcount-to-prevent-use-af.patch [bz#1694164] - kvm-virtiofsd-do-not-always-set-FUSE_FLOCK_LOCKS.patch [bz#1694164] - kvm-virtiofsd-convert-more-fprintf-and-perror-to-use-fus.patch [bz#1694164] - kvm-virtiofsd-Reset-O_DIRECT-flag-during-file-open.patch [bz#1694164] - kvm-virtiofsd-Fix-data-corruption-with-O_APPEND-write-in.patch [bz#1694164] - kvm-virtiofsd-passthrough_ll-Use-cache_readdir-for-direc.patch [bz#1694164] - kvm-virtiofsd-add-definition-of-fuse_buf_writev.patch [bz#1694164] - kvm-virtiofsd-use-fuse_buf_writev-to-replace-fuse_buf_wr.patch [bz#1694164] - kvm-virtiofsd-process-requests-in-a-thread-pool.patch [bz#1694164] - kvm-virtiofsd-prevent-FUSE_INIT-FUSE_DESTROY-races.patch [bz#1694164] - kvm-virtiofsd-fix-lo_destroy-resource-leaks.patch [bz#1694164] - kvm-virtiofsd-add-thread-pool-size-NUM-option.patch [bz#1694164] - kvm-virtiofsd-Convert-lo_destroy-to-take-the-lo-mutex-lo.patch [bz#1694164] - kvm-virtiofsd-passthrough_ll-Pass-errno-to-fuse_reply_er.patch [bz#1694164] - kvm-virtiofsd-stop-all-queue-threads-on-exit-in-virtio_l.patch [bz#1694164] - kvm-virtiofsd-add-some-options-to-the-help-message.patch [bz#1694164] - kvm-redhat-ship-virtiofsd-vhost-user-device-backend.patch [bz#1694164] - Resolves: bz#1694164 (virtio-fs: host<->guest shared file system (qemu)) - Resolves: bz#1725084 (aarch64: support dumping SVE registers) - Resolves: bz#1779041 (netkvm: no connectivity Windows guest with q35 + hugepages + vhost + hv_synic)
2020-01-31 10:12:06 +00:00
From 474d0adafed4d73720d6413b2903d6c4b529e5e6 Mon Sep 17 00:00:00 2001
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Date: Mon, 27 Jan 2020 19:01:15 +0100
Subject: [PATCH 044/116] virtiofsd: passthrough_ll: add dirp_map to hide
lo_dirp pointers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-id: <20200127190227.40942-41-dgilbert@redhat.com>
Patchwork-id: 93495
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 040/112] virtiofsd: passthrough_ll: add dirp_map to hide lo_dirp pointers
Bugzilla: 1694164
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
From: Stefan Hajnoczi <stefanha@redhat.com>
Do not expose lo_dirp pointers to clients.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
(cherry picked from commit b39bce121bfad8757eec0ee41f14607b883935d3)
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
---
tools/virtiofsd/passthrough_ll.c | 103 +++++++++++++++++++++++++++++----------
1 file changed, 76 insertions(+), 27 deletions(-)
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index a3ebf74..5f5a72f 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -56,27 +56,10 @@
#include "passthrough_helpers.h"
-/*
- * We are re-using pointers to our `struct lo_inode`
- * elements as inodes. This means that we must be able to
- * store uintptr_t values in a fuse_ino_t variable. The following
- * incantation checks this condition at compile time.
- */
-#if defined(__GNUC__) && \
- (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 6) && \
- !defined __cplusplus
-_Static_assert(sizeof(fuse_ino_t) >= sizeof(uintptr_t),
- "fuse_ino_t too small to hold uintptr_t values!");
-#else
-struct _uintptr_to_must_hold_fuse_ino_t_dummy_struct {
- unsigned _uintptr_to_must_hold_fuse_ino_t
- : ((sizeof(fuse_ino_t) >= sizeof(uintptr_t)) ? 1 : -1);
-};
-#endif
-
struct lo_map_elem {
union {
struct lo_inode *inode;
+ struct lo_dirp *dirp;
ssize_t freelist;
};
bool in_use;
@@ -123,6 +106,7 @@ struct lo_data {
int timeout_set;
struct lo_inode root; /* protected by lo->mutex */
struct lo_map ino_map; /* protected by lo->mutex */
+ struct lo_map dirp_map; /* protected by lo->mutex */
};
static const struct fuse_opt lo_opts[] = {
@@ -253,6 +237,20 @@ static void lo_map_remove(struct lo_map *map, size_t key)
}
/* Assumes lo->mutex is held */
+static ssize_t lo_add_dirp_mapping(fuse_req_t req, struct lo_dirp *dirp)
+{
+ struct lo_map_elem *elem;
+
+ elem = lo_map_alloc_elem(&lo_data(req)->dirp_map);
+ if (!elem) {
+ return -1;
+ }
+
+ elem->dirp = dirp;
+ return elem - lo_data(req)->dirp_map.elems;
+}
+
+/* Assumes lo->mutex is held */
static ssize_t lo_add_inode_mapping(fuse_req_t req, struct lo_inode *inode)
{
struct lo_map_elem *elem;
@@ -861,9 +859,19 @@ struct lo_dirp {
off_t offset;
};
-static struct lo_dirp *lo_dirp(struct fuse_file_info *fi)
+static struct lo_dirp *lo_dirp(fuse_req_t req, struct fuse_file_info *fi)
{
- return (struct lo_dirp *)(uintptr_t)fi->fh;
+ struct lo_data *lo = lo_data(req);
+ struct lo_map_elem *elem;
+
+ pthread_mutex_lock(&lo->mutex);
+ elem = lo_map_get(&lo->dirp_map, fi->fh);
+ pthread_mutex_unlock(&lo->mutex);
+ if (!elem) {
+ return NULL;
+ }
+
+ return elem->dirp;
}
static void lo_opendir(fuse_req_t req, fuse_ino_t ino,
@@ -873,6 +881,7 @@ static void lo_opendir(fuse_req_t req, fuse_ino_t ino,
struct lo_data *lo = lo_data(req);
struct lo_dirp *d;
int fd;
+ ssize_t fh;
d = calloc(1, sizeof(struct lo_dirp));
if (d == NULL) {
@@ -892,7 +901,14 @@ static void lo_opendir(fuse_req_t req, fuse_ino_t ino,
d->offset = 0;
d->entry = NULL;
- fi->fh = (uintptr_t)d;
+ pthread_mutex_lock(&lo->mutex);
+ fh = lo_add_dirp_mapping(req, d);
+ pthread_mutex_unlock(&lo->mutex);
+ if (fh == -1) {
+ goto out_err;
+ }
+
+ fi->fh = fh;
if (lo->cache == CACHE_ALWAYS) {
fi->keep_cache = 1;
}
@@ -903,6 +919,9 @@ out_errno:
error = errno;
out_err:
if (d) {
+ if (d->dp) {
+ closedir(d->dp);
+ }
if (fd != -1) {
close(fd);
}
@@ -920,17 +939,21 @@ static int is_dot_or_dotdot(const char *name)
static void lo_do_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
off_t offset, struct fuse_file_info *fi, int plus)
{
- struct lo_dirp *d = lo_dirp(fi);
- char *buf;
+ struct lo_dirp *d;
+ char *buf = NULL;
char *p;
size_t rem = size;
- int err;
+ int err = ENOMEM;
(void)ino;
+ d = lo_dirp(req, fi);
+ if (!d) {
+ goto error;
+ }
+
buf = calloc(1, size);
if (!buf) {
- err = ENOMEM;
goto error;
}
p = buf;
@@ -1028,8 +1051,21 @@ static void lo_readdirplus(fuse_req_t req, fuse_ino_t ino, size_t size,
static void lo_releasedir(fuse_req_t req, fuse_ino_t ino,
struct fuse_file_info *fi)
{
- struct lo_dirp *d = lo_dirp(fi);
+ struct lo_data *lo = lo_data(req);
+ struct lo_dirp *d;
+
(void)ino;
+
+ d = lo_dirp(req, fi);
+ if (!d) {
+ fuse_reply_err(req, EBADF);
+ return;
+ }
+
+ pthread_mutex_lock(&lo->mutex);
+ lo_map_remove(&lo->dirp_map, fi->fh);
+ pthread_mutex_unlock(&lo->mutex);
+
closedir(d->dp);
free(d);
fuse_reply_err(req, 0);
@@ -1081,8 +1117,18 @@ static void lo_fsyncdir(fuse_req_t req, fuse_ino_t ino, int datasync,
struct fuse_file_info *fi)
{
int res;
- int fd = dirfd(lo_dirp(fi)->dp);
+ struct lo_dirp *d;
+ int fd;
+
(void)ino;
+
+ d = lo_dirp(req, fi);
+ if (!d) {
+ fuse_reply_err(req, EBADF);
+ return;
+ }
+
+ fd = dirfd(d->dp);
if (datasync) {
res = fdatasync(fd);
} else {
@@ -1614,6 +1660,8 @@ int main(int argc, char *argv[])
root_elem = lo_map_reserve(&lo.ino_map, lo.root.fuse_ino);
root_elem->inode = &lo.root;
+ lo_map_init(&lo.dirp_map);
+
if (fuse_parse_cmdline(&args, &opts) != 0) {
return 1;
}
@@ -1710,6 +1758,7 @@ err_out2:
err_out1:
fuse_opt_free_args(&args);
+ lo_map_destroy(&lo.dirp_map);
lo_map_destroy(&lo.ino_map);
if (lo.root.fd >= 0) {
--
1.8.3.1