From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47057) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRKFR-0002on-6w for qemu-devel@nongnu.org; Mon, 26 Nov 2018 12:00:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gRKFJ-0008E9-I9 for qemu-devel@nongnu.org; Mon, 26 Nov 2018 12:00:37 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:33946) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gRKFJ-0008DJ-3Q for qemu-devel@nongnu.org; Mon, 26 Nov 2018 12:00:29 -0500 Received: by mail-wr1-f68.google.com with SMTP id j2so19747675wrw.1 for ; Mon, 26 Nov 2018 09:00:28 -0800 (PST) References: <1543238443-4993-1-git-send-email-pbonzini@redhat.com> <1543238443-4993-6-git-send-email-pbonzini@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <56140dad-403e-e0a7-7d0e-8f9f879ffe6e@redhat.com> Date: Mon, 26 Nov 2018 18:00:13 +0100 MIME-Version: 1.0 In-Reply-To: <1543238443-4993-6-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 5/5] vhost-net: revamp configure logic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org Cc: =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , "Michael S. Tsirkin" On 26/11/18 14:20, Paolo Bonzini wrote: > Detect all invalid configurations (e.g. mingw32 with vhost-user, > non-Linux with vhost-kernel). As a collateral benefit, all vhost-kernel > backends can be now disabled if one wants to reduce the attack surface. > > Signed-off-by: Paolo Bonzini > --- > configure | 88 +++++++++++++++++++++++++++++++---------------- > hw/virtio/Makefile.objs | 4 +-- > hw/virtio/vhost-backend.c | 4 +-- > 3 files changed, 62 insertions(+), 34 deletions(-) > > diff --git a/configure b/configure > index b3b4464..a15f143 100755 > --- a/configure > +++ b/configure > @@ -366,10 +366,10 @@ libattr="" > xfs="" > tcg="yes" > membarrier="" > -vhost_net="no" > -vhost_crypto="no" > -vhost_scsi="no" > -vhost_vsock="no" > +vhost_net="" > +vhost_crypto="" > +vhost_scsi="" > +vhost_vsock="" > vhost_user="" > kvm="no" > hax="no" > @@ -774,6 +774,7 @@ case $targetos in > MINGW32*) > mingw32="yes" > hax="yes" > + vhost_user="no" > audio_possible_drivers="dsound sdl" > if check_include dsound.h; then > audio_drv_list="dsound" > @@ -874,10 +875,6 @@ Linux) > linux="yes" > linux_user="yes" > kvm="yes" > - vhost_net="yes" > - vhost_crypto="yes" > - vhost_scsi="yes" > - vhost_vsock="yes" > QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$PWD/linux-headers $QEMU_INCLUDES" > supported_os="yes" > libudev="yes" > @@ -1258,11 +1255,7 @@ for opt do > ;; > --disable-vhost-crypto) vhost_crypto="no" > ;; > - --enable-vhost-crypto) > - vhost_crypto="yes" > - if test "$mingw32" = "yes"; then > - error_exit "vhost-crypto isn't available on win32" > - fi > + --enable-vhost-crypto) vhost_crypto="yes" > ;; > --disable-vhost-scsi) vhost_scsi="no" > ;; > @@ -1463,11 +1456,11 @@ for opt do > ;; > --disable-vhost-user) vhost_user="no" > ;; > - --enable-vhost-user) > - vhost_user="yes" > - if test "$mingw32" = "yes"; then > - error_exit "vhost-user isn't available on win32" > - fi > + --enable-vhost-user) vhost_user="yes" > + ;; > + --disable-vhost-kernel) vhost_kernel="no" > + ;; > + --enable-vhost-kernel) vhost_kernel="yes" > ;; > --disable-capstone) capstone="no" > ;; > @@ -1499,14 +1492,6 @@ for opt do > esac > done > > -if test "$vhost_user" = ""; then > - if test "$mingw32" = "yes"; then > - vhost_user="no" > - else > - vhost_user="yes" > - fi > -fi > - > case "$cpu" in > ppc) > CPU_CFLAGS="-m32" > @@ -1731,8 +1716,12 @@ disabled with --disable-FEATURE, default is enabled if available: > linux-aio Linux AIO support > cap-ng libcap-ng support > attr attr and xattr support > - vhost-net vhost-net acceleration support > - vhost-crypto vhost-crypto acceleration support > + vhost-net vhost-net kernel acceleration support > + vhost-vsock virtio sockets device support > + vhost-scsi vhost-scsi kernel target support > + vhost-crypto vhost-user-crypto backend support > + vhost-kernel vhost kernel backend support > + vhost-user vhost-user backend support > spice spice > rbd rados block device (rbd) > libiscsi iscsi support > @@ -1756,7 +1744,6 @@ disabled with --disable-FEATURE, default is enabled if available: > jemalloc jemalloc support > avx2 AVX2 optimization support > replication replication support > - vhost-vsock virtio sockets device support > opengl opengl support > virglrenderer virgl rendering support > xfsctl xfsctl support > @@ -1773,7 +1760,6 @@ disabled with --disable-FEATURE, default is enabled if available: > parallels parallels image format support > sheepdog sheepdog block driver support > crypto-afalg Linux AF_ALG crypto backend driver > - vhost-user vhost-user support > capstone capstone disassembler support > debug-mutex mutex debugging support > libpmem libpmem support > @@ -2150,6 +2136,45 @@ else > l2tpv3=no > fi > > +######################################### > +# vhost interdependencies and host support > + > +# vhost backends > +test "$vhost_user" = "" && vhost_user=yes > +if test "$vhost_user" = "yes" && test "$mingw32" = "yes"; then > + error_exit "vhost-user isn't available on win32" > +fi > +test "$vhost_kernel" = "" && vhost_kernel=$linux > +if test "$vhost_kernel" = "yes" && test "$linux" != "yes"; then > + error_exit "vhost-kernel is only available on Linux" > +fi > + > +# vhost-kernel devices > +test "$vhost_scsi" = "" && vhost_scsi=$vhost_kernel > +if test "$vhost_scsi" = "yes" && test "$vhost_kernel" != "yes"; then > + error_exit "--enable-vhost-scsi requires --enable-vhost-kernel" > +fi > +test "$vhost_vsock" = "" && vhost_vsock=$vhost_kernel > +if test "$vhost_vsock" = "yes" && test "$vhost_kernel" != "yes"; then > + error_exit "--enable-vhost-vsock requires --enable-vhost-kernel" > +fi > + > +# vhost-user backends > +test "$vhost_net_user" = "" && vhost_net_user=$vhost_user > +if test "$vhost_net_user" = "yes" && test "$vhost_user" = "no"; then > + error_exit "--enable-vhost-net-user requires --enable-vhost-user" > +fi > +test "$vhost_crypto" = "" && vhost_crypto=$vhost_user > +if test "$vhost_crypto" = "yes" && test "$vhost_user" = "no"; then > + error_exit "--enable-vhost-crypto requires --enable-vhost-user" > +fi > + > +# OR the vhost-kernel and vhost-user values for simplicity > +if test "$vhost_net" = ""; then > + test "$vhost_net_user" = "yes" && vhost_net=yes > + test "$vhost_kernel" = "yes" && vhost_net=yes > +fi Easier to review, thanks. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé > + > ########################################## > # MinGW / Mingw-w64 localtime_r/gmtime_r check > > @@ -6524,6 +6549,9 @@ fi > if test "$vhost_vsock" = "yes" ; then > echo "CONFIG_VHOST_VSOCK=y" >> $config_host_mak > fi > +if test "$vhost_kernel" = "yes" ; then > + echo "CONFIG_VHOST_KERNEL=y" >> $config_host_mak > +fi > if test "$vhost_user" = "yes" ; then > echo "CONFIG_VHOST_USER=y" >> $config_host_mak > fi > diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs > index e8eff80..87402d1 100644 > --- a/hw/virtio/Makefile.objs > +++ b/hw/virtio/Makefile.objs > @@ -11,8 +11,8 @@ obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-p > > obj-$(CONFIG_VHOST_USER) += vhost-user.o > obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o > -obj-$(call lor,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) += vhost.o vhost-backend.o > -common-obj-$(call lnot,$(call lor,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))) += vhost-stub.o > +obj-$(call lor,$(CONFIG_VHOST_USER),$(CONFIG_VHOST_KERNEL)) += vhost.o vhost-backend.o > +common-obj-$(call lnot,$(call lor,$(CONFIG_VHOST_USER),$(CONFIG_VHOST_KERNEL))) += vhost-stub.o > endif > > common-obj-$(CONFIG_ALL) += vhost-stub.o > diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c > index b5d2e30..46d388b 100644 > --- a/hw/virtio/vhost-backend.c > +++ b/hw/virtio/vhost-backend.c > @@ -13,7 +13,7 @@ > #include "hw/virtio/vhost-backend.h" > #include "qemu/error-report.h" > > -#ifdef CONFIG_LINUX > +#ifdef CONFIG_VHOST_KERNEL > #include > #include > > @@ -274,7 +274,7 @@ int vhost_set_backend_type(struct vhost_dev *dev, VhostBackendType backend_type) > int r = 0; > > switch (backend_type) { > -#ifdef CONFIG_LINUX > +#ifdef CONFIG_VHOST_KERNEL > case VHOST_BACKEND_TYPE_KERNEL: > dev->vhost_ops = &kernel_ops; > break; >