Commit a43efa34 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20200123b' into staging 



virtiofsd first pull v2

Import our virtiofsd.
This pulls in the daemon to drive a file system connected to the
existing qemu virtiofsd device.
It's derived from upstream libfuse with lots of changes (and a lot
trimmed out).
The daemon lives in the newly created qemu/tools/virtiofsd

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>

v2
  drop the docs while we discuss where they should live
  and we need to redo the manpage in anything but texi

# gpg: Signature made Thu 23 Jan 2020 16:45:18 GMT
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert-gitlab/tags/pull-virtiofs-20200123b: (108 commits)
  virtiofsd: add some options to the help message
  virtiofsd: stop all queue threads on exit in virtio_loop()
  virtiofsd/passthrough_ll: Pass errno to fuse_reply_err()
  virtiofsd: Convert lo_destroy to take the lo->mutex lock itself
  virtiofsd: add --thread-pool-size=NUM option
  virtiofsd: fix lo_destroy() resource leaks
  virtiofsd: prevent FUSE_INIT/FUSE_DESTROY races
  virtiofsd: process requests in a thread pool
  virtiofsd: use fuse_buf_writev to replace fuse_buf_write for better performance
  virtiofsd: add definition of fuse_buf_writev()
  virtiofsd: passthrough_ll: Use cache_readdir for directory open
  virtiofsd: Fix data corruption with O_APPEND write in writeback mode
  virtiofsd: Reset O_DIRECT flag during file open
  virtiofsd: convert more fprintf and perror to use fuse log infra
  virtiofsd: do not always set FUSE_FLOCK_LOCKS
  virtiofsd: introduce inode refcount to prevent use-after-free
  virtiofsd: passthrough_ll: fix refcounting on remove/rename
  libvhost-user: Fix some memtable remap cases
  virtiofsd: rename inode->refcount to inode->nlookup
  virtiofsd: prevent races with lo_dirp_put()
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c0248b36 1d59b1b2

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
/config-target.*

/config.status

/config-temp

/tools/virtiofsd/50-qemu-virtiofsd.json

/elf2dmp

/trace-events-all

/trace/generated-events.h

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -1595,6 +1595,14 @@ T: git https://github.com/cohuck/qemu.git s390-next 
T: git https://github.com/borntraeger/qemu.git s390-next

L: qemu-s390x@nongnu.org



virtiofs

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

M: Stefan Hajnoczi <stefanha@redhat.com>

S: Supported

F: tools/virtiofsd/*

F: hw/virtio/vhost-user-fs*

F: include/hw/virtio/vhost-user-fs.h



virtio-input

M: Gerd Hoffmann <kraxel@redhat.com>

S: Maintained

Makefile

+12 −0
Original line number Diff line number Diff line
@@ -327,6 +327,11 @@ HELPERS-y += vhost-user-gpu$(EXESUF) 
vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json

endif



ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)

HELPERS-y += virtiofsd$(EXESUF)

vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json

endif



# Sphinx does not allow building manuals into the same directory as

# the source files, so if we're doing an in-tree QEMU build we must

# build the manuals into a subdirectory (and then install them from
@@ -431,6 +436,7 @@ dummy := $(call unnest-vars,, \ 
                elf2dmp-obj-y \

                ivshmem-client-obj-y \

                ivshmem-server-obj-y \

                virtiofsd-obj-y \

                rdmacm-mux-obj-y \

                libvhost-user-obj-y \

                vhost-user-scsi-obj-y \
@@ -670,6 +676,12 @@ rdmacm-mux$(EXESUF): LIBS += "-libumad" 
rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)

	$(call LINK, $^)



# relies on Linux-specific syscalls

ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)

virtiofsd$(EXESUF): $(virtiofsd-obj-y) libvhost-user.a $(COMMON_LDADDS)

	$(call LINK, $^)

endif



vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) $(libvhost-user-obj-y) libqemuutil.a libqemustub.a

	$(call LINK, $^)

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ vhost-user-blk-obj-y = contrib/vhost-user-blk/ 
rdmacm-mux-obj-y = contrib/rdmacm-mux/

vhost-user-input-obj-y = contrib/vhost-user-input/

vhost-user-gpu-obj-y = contrib/vhost-user-gpu/

virtiofsd-obj-y = tools/virtiofsd/



######################################################################

trace-events-subdirs =

configure

+16 −0
Original line number Diff line number Diff line
@@ -5197,6 +5197,19 @@ if compile_prog "" "" ; then 
    strchrnul=yes

fi



#########################################

# check if we have st_atim



st_atim=no

cat > $TMPC << EOF

#include <sys/stat.h>

#include <stddef.h>

int main(void) { return offsetof(struct stat, st_atim); }

EOF

if compile_prog "" "" ; then

    st_atim=yes

fi



##########################################

# check if trace backend exists
@@ -6895,6 +6908,9 @@ fi 
if test "$strchrnul" = "yes" ; then

  echo "HAVE_STRCHRNUL=y" >> $config_host_mak

fi

if test "$st_atim" = "yes" ; then

  echo "HAVE_STRUCT_STAT_ST_ATIM=y" >> $config_host_mak

fi

if test "$byteswap_h" = "yes" ; then

  echo "CONFIG_BYTESWAP_H=y" >> $config_host_mak

fi