diff mbox series

[PULL,065/111] virtiofsd: Handle hard reboot

Message ID	20200123115841.138849-66-dgilbert@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 065/111] virtiofsd: Handle hard reboot Date: Thu, 23 Jan 2020 11:57:55 +0000 Message-Id: <20200123115841.138849-66-dgilbert@redhat.com> In-Reply-To: <20200123115841.138849-1-dgilbert@redhat.com> References: <20200123115841.138849-1-dgilbert@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Precedence: list Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	virtiofs queue \| expand [PULL,000/111] virtiofs queue [PULL,001/111] virtiofsd: Pull in upstream headers [PULL,002/111] virtiofsd: Pull in kernel's fuse.h [PULL,003/111] virtiofsd: Add auxiliary .c's [PULL,004/111] virtiofsd: Add fuse_lowlevel.c [PULL,005/111] virtiofsd: Add passthrough_ll [PULL,006/111] virtiofsd: Trim down imported files [PULL,007/111] virtiofsd: Format imported files to qemu style [PULL,008/111] virtiofsd: remove mountpoint dummy argument [PULL,009/111] virtiofsd: remove unused notify reply support [PULL,010/111] virtiofsd: Remove unused enum fuse_buf_copy_flags [PULL,011/111] virtiofsd: Fix fuse_daemonize ignored return values [PULL,012/111] virtiofsd: Fix common header and define for QEMU builds [PULL,013/111] virtiofsd: Trim out compatibility code [PULL,014/111] vitriofsd/passthrough_ll: fix fallocate() ifdefs [PULL,015/111] virtiofsd: Make fsync work even if only inode is passed in [PULL,016/111] virtiofsd: Add options for virtio [PULL,017/111] virtiofsd: add -o source=PATH to help output [PULL,018/111] virtiofsd: Open vhost connection instead of mounting [PULL,019/111] virtiofsd: Start wiring up vhost-user [PULL,020/111] virtiofsd: Add main virtio loop [PULL,021/111] virtiofsd: get/set features callbacks [PULL,022/111] virtiofsd: Start queue threads [PULL,023/111] virtiofsd: Poll kick_fd for queue [PULL,024/111] virtiofsd: Start reading commands from queue [PULL,025/111] virtiofsd: Send replies to messages [PULL,026/111] virtiofsd: Keep track of replies [PULL,027/111] virtiofsd: Add Makefile wiring for virtiofsd contrib [PULL,028/111] virtiofsd: Fast path for virtio read [PULL,029/111] virtiofsd: add --fd=FDNUM fd passing option [PULL,030/111] virtiofsd: make -f (foreground) the default [PULL,031/111] virtiofsd: add vhost-user.json file [PULL,032/111] virtiofsd: add --print-capabilities option [PULL,033/111] virtiofs: Add maintainers entry [PULL,034/111] virtiofsd: passthrough_ll: create new files in caller's context [PULL,035/111] virtiofsd: passthrough_ll: add lo_map for ino/fh indirection [PULL,036/111] virtiofsd: passthrough_ll: add ino_map to hide lo_inode pointers [PULL,037/111] virtiofsd: passthrough_ll: add dirp_map to hide lo_dirp pointers [PULL,038/111] virtiofsd: passthrough_ll: add fd_map to hide file descriptors [PULL,039/111] virtiofsd: passthrough_ll: add fallback for racy ops [PULL,040/111] virtiofsd: validate path components [PULL,041/111] virtiofsd: Plumb fuse_bufvec through to do_write_buf [PULL,042/111] virtiofsd: Pass write iov's all the way through [PULL,043/111] virtiofsd: add fuse_mbuf_iter API [PULL,044/111] virtiofsd: validate input buffer sizes in do_write_buf() [PULL,045/111] virtiofsd: check input buffer size in fuse_lowlevel.c ops [PULL,046/111] virtiofsd: prevent ".." escape in lo_do_lookup() [PULL,047/111] virtiofsd: prevent ".." escape in lo_do_readdir() [PULL,048/111] virtiofsd: use /proc/self/fd/ O_PATH file descriptor [PULL,049/111] virtiofsd: sandbox mount namespace [PULL,050/111] virtiofsd: move to an empty network namespace [PULL,051/111] virtiofsd: move to a new pid namespace [PULL,052/111] virtiofsd: add seccomp whitelist [PULL,053/111] virtiofsd: Parse flag FUSE_WRITE_KILL_PRIV [PULL,054/111] virtiofsd: cap-ng helpers [PULL,055/111] virtiofsd: Drop CAP_FSETID if client asked for it [PULL,056/111] virtiofsd: set maximum RLIMIT_NOFILE limit [PULL,057/111] virtiofsd: fix libfuse information leaks [PULL,058/111] docs: Add docs/tools [PULL,059/111] virtiofsd: add security guide document [PULL,060/111] virtiofsd: add --syslog command-line option [PULL,061/111] virtiofsd: print log only when priority is high enough [PULL,062/111] virtiofsd: Add ID to the log with FUSE_LOG_DEBUG level [PULL,063/111] virtiofsd: Add timestamp to the log with FUSE_LOG_DEBUG level [PULL,064/111] virtiofsd: Handle reinit [PULL,065/111] virtiofsd: Handle hard reboot [PULL,066/111] virtiofsd: Kill threads when queues are stopped [PULL,067/111] vhost-user: Print unexpected slave message types [PULL,068/111] contrib/libvhost-user: Protect slave fd with mutex [PULL,069/111] virtiofsd: passthrough_ll: add renameat2 support [PULL,070/111] virtiofsd: passthrough_ll: disable readdirplus on cache=never [PULL,071/111] virtiofsd: passthrough_ll: control readdirplus [PULL,072/111] virtiofsd: rename unref_inode() to unref_inode_lolocked() [PULL,073/111] virtiofsd: fail when parent inode isn't known in lo_do_lookup() [PULL,074/111] virtiofsd: extract root inode init into setup_root() [PULL,075/111] virtiofsd: passthrough_ll: clean up cache related options [PULL,076/111] virtiofsd: passthrough_ll: use hashtable [PULL,077/111] virtiofsd: Clean up inodes on destroy [PULL,078/111] virtiofsd: support nanosecond resolution for file timestamp [PULL,079/111] virtiofsd: fix error handling in main() [PULL,080/111] virtiofsd: cleanup allocated resource in se [PULL,081/111] virtiofsd: fix memory leak on lo.source [PULL,082/111] virtiofsd: add helper for lo_data cleanup [PULL,083/111] virtiofsd: Prevent multiply running with same vhost_user_socket [PULL,084/111] virtiofsd: enable PARALLEL_DIROPS during INIT [PULL,085/111] virtiofsd: fix incorrect error handling in lo_do_lookup [PULL,086/111] Virtiofsd: fix memory leak on fuse queueinfo [PULL,087/111] virtiofsd: Support remote posix locks [PULL,088/111] virtiofsd: use fuse_lowlevel_is_virtio() in fuse_session_destroy() [PULL,089/111] virtiofsd: prevent fv_queue_thread() vs virtio_loop() races [PULL,090/111] virtiofsd: make lo_release() atomic [PULL,091/111] virtiofsd: prevent races with lo_dirp_put() [PULL,092/111] virtiofsd: rename inode->refcount to inode->nlookup [PULL,093/111] libvhost-user: Fix some memtable remap cases [PULL,094/111] virtiofsd: add man page [PULL,095/111] virtiofsd: passthrough_ll: fix refcounting on remove/rename [PULL,096/111] virtiofsd: introduce inode refcount to prevent use-after-free [PULL,097/111] virtiofsd: do not always set FUSE_FLOCK_LOCKS [PULL,098/111] virtiofsd: convert more fprintf and perror to use fuse log infra [PULL,099/111] virtiofsd: Reset O_DIRECT flag during file open [PULL,100/111] virtiofsd: Fix data corruption with O_APPEND write in writeback mode [PULL,101/111] virtiofsd: passthrough_ll: Use cache_readdir for directory open [PULL,102/111] virtiofsd: add definition of fuse_buf_writev() [PULL,103/111] virtiofsd: use fuse_buf_writev to replace fuse_buf_write for better performance [PULL,104/111] virtiofsd: process requests in a thread pool [PULL,105/111] virtiofsd: prevent FUSE_INIT/FUSE_DESTROY races [PULL,106/111] virtiofsd: fix lo_destroy() resource leaks [PULL,107/111] virtiofsd: add --thread-pool-size=NUM option [PULL,108/111] virtiofsd: Convert lo_destroy to take the lo->mutex lock itself [PULL,109/111] virtiofsd/passthrough_ll: Pass errno to fuse_reply_err() [PULL,110/111] virtiofsd: stop all queue threads on exit in virtio_loop() [PULL,111/111] virtiofsd: add some options to the help message

Commit Message

Dr. David Alan Gilbert Jan. 23, 2020, 11:57 a.m. UTC

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Handle a
  mount
  hard reboot (without unmount)
  mount

we get another 'init' which FUSE doesn't normally expect.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 tools/virtiofsd/fuse_lowlevel.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
index 7d742b5a72..65f91dabae 100644
--- a/tools/virtiofsd/fuse_lowlevel.c
+++ b/tools/virtiofsd/fuse_lowlevel.c
@@ -2433,7 +2433,21 @@  void fuse_session_process_buf_int(struct fuse_session *se,
             goto reply_err;
         }
     } else if (in->opcode == FUSE_INIT || in->opcode == CUSE_INIT) {
-        goto reply_err;
+        if (fuse_lowlevel_is_virtio(se)) {
+            /*
+             * TODO: This is after a hard reboot typically, we need to do
+             * a destroy, but we can't reply to this request yet so
+             * we can't use do_destroy
+             */
+            fuse_log(FUSE_LOG_DEBUG, "%s: reinit\n", __func__);
+            se->got_destroy = 1;
+            se->got_init = 0;
+            if (se->op.destroy) {
+                se->op.destroy(se->userdata);
+            }
+        } else {
+            goto reply_err;
+        }
     }
 
     err = EACCES;