From nobody Fri Nov 7 00:44:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544631277439397.81178536294965; Wed, 12 Dec 2018 08:14:37 -0800 (PST) Received: from localhost ([::1]:45863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX79g-0001ZI-7E for importer@patchew.org; Wed, 12 Dec 2018 11:14:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX6NB-0001P7-2A for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:24:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX6N6-0000hL-Fp for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:24:29 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:53174) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gX6N6-0000XH-5D for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:24:24 -0500 Received: by mail-wm1-x341.google.com with SMTP id m1so5559419wml.2 for ; Wed, 12 Dec 2018 07:24:08 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id u10sm15878859wrr.33.2018.12.12.07.24.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Dec 2018 07:24:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kWW+XZv2DbIQ1hqtCKXSa176GVz8bhjRGVjlOeyFC60=; b=WCFoaD3kpoI5nXDULqPf7smxNuqihpiXkx3PcF4w1baySdMP+ox1apZIfMoFnEjwKn rkPB5AbHwDRwA14Ey/TE6YO4+23VAJCvgN2ZxG92+ogp+9cuNrFI6lXB6fGtOF5xdm28 UyhMVbJr3uOtupT6prROEJvvvmIMYl8nqgt+cefzg5drZ+scHVgm5dsbtqm2QEr7mDqM 5AeE0Qk095VWo5EvRJK+hDaAKh1JzOtIApDpz3Sa6KPcgWlbYqrXwPOTZgLue4vmcW4X bGN2wR0Cp4PElCXWSTa2DCnnWo1/C2cqLLzPbBxlnqgOKe/bUwbavBwBxkSs600cvSIP 1o5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kWW+XZv2DbIQ1hqtCKXSa176GVz8bhjRGVjlOeyFC60=; b=oLoJ8K5xq8smNA6wYU1Ag/Q810jooNF4Ls6HhcvO57PhrAkgT6DsR0ibDf8m0+I9C9 bfjULHwxLTu7I/BVffY1qf3sCb2v27BKMunN3jFbqlJR2YyQahW+mANKUWODREmL656+ broE5srUyBfj8wKAq4IDLiMp3zdmYGd7yovK797O/8riM5SUwKxUB4abLstL0ygdtxzz xzNlx8LGGFFaS0wQDFVFybEeUUtkjwkfcEiVD0oy9RQAcBNO+ZuPDrgVRh8WBKl6I616 f+9anwyZ0LKL+iI3Y++tCMhqDIXRQ/CNq0kb8PkWu9k0FVZBve51gsqMfPQ7eHNpsnxx qYew== X-Gm-Message-State: AA+aEWZkgYEnLFYLsQLB7e3RVz4y4OxyN8K0rOLlRojM6JI7YwPDKyu9 LtRvzVw/Z6yg5Rqr0IdBycSVLOIe X-Google-Smtp-Source: AFSGD/Wc/gQeBNfvBWuMs8+1vMo9uEUwSXQhQpjxhW+XGn9cr8nLmk9D7cGAj5RzMa/ZkS/A2S1WVw== X-Received: by 2002:a1c:9cce:: with SMTP id f197mr6725878wme.135.1544628246788; Wed, 12 Dec 2018 07:24:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 12 Dec 2018 16:23:06 +0100 Message-Id: <1544628195-37728-46-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1544628195-37728-1-git-send-email-pbonzini@redhat.com> References: <1544628195-37728-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PULL 45/54] vhost-net: revamp configure logic X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <1543851204-41186-6-git-send-email-pbonzini@redhat.com> --- configure | 89 +++++++++++++++++++++++++++++++------------= ---- hw/virtio/Makefile.objs | 4 +-- hw/virtio/vhost-backend.c | 4 +-- 3 files changed, 63 insertions(+), 34 deletions(-) diff --git a/configure b/configure index b26e4de..b076b43 100755 --- a/configure +++ b/configure @@ -366,10 +366,10 @@ libattr=3D"" xfs=3D"" tcg=3D"yes" membarrier=3D"" -vhost_net=3D"no" -vhost_crypto=3D"no" -vhost_scsi=3D"no" -vhost_vsock=3D"no" +vhost_net=3D"" +vhost_crypto=3D"" +vhost_scsi=3D"" +vhost_vsock=3D"" vhost_user=3D"" kvm=3D"no" hax=3D"no" @@ -774,6 +774,7 @@ case $targetos in MINGW32*) mingw32=3D"yes" hax=3D"yes" + vhost_user=3D"no" audio_possible_drivers=3D"dsound sdl" if check_include dsound.h; then audio_drv_list=3D"dsound" @@ -874,10 +875,6 @@ Linux) linux=3D"yes" linux_user=3D"yes" kvm=3D"yes" - vhost_net=3D"yes" - vhost_crypto=3D"yes" - vhost_scsi=3D"yes" - vhost_vsock=3D"yes" QEMU_INCLUDES=3D"-I\$(SRC_PATH)/linux-headers -I$PWD/linux-headers $QEMU= _INCLUDES" supported_os=3D"yes" libudev=3D"yes" @@ -1255,11 +1252,7 @@ for opt do ;; --disable-vhost-crypto) vhost_crypto=3D"no" ;; - --enable-vhost-crypto) - vhost_crypto=3D"yes" - if test "$mingw32" =3D "yes"; then - error_exit "vhost-crypto isn't available on win32" - fi + --enable-vhost-crypto) vhost_crypto=3D"yes" ;; --disable-vhost-scsi) vhost_scsi=3D"no" ;; @@ -1460,11 +1453,11 @@ for opt do ;; --disable-vhost-user) vhost_user=3D"no" ;; - --enable-vhost-user) - vhost_user=3D"yes" - if test "$mingw32" =3D "yes"; then - error_exit "vhost-user isn't available on win32" - fi + --enable-vhost-user) vhost_user=3D"yes" + ;; + --disable-vhost-kernel) vhost_kernel=3D"no" + ;; + --enable-vhost-kernel) vhost_kernel=3D"yes" ;; --disable-capstone) capstone=3D"no" ;; @@ -1496,14 +1489,6 @@ for opt do esac done =20 -if test "$vhost_user" =3D ""; then - if test "$mingw32" =3D "yes"; then - vhost_user=3D"no" - else - vhost_user=3D"yes" - fi -fi - case "$cpu" in ppc) CPU_CFLAGS=3D"-m32" @@ -1728,8 +1713,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 @@ -1753,7 +1742,6 @@ disabled with --disable-FEATURE, default is enabled i= f 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 @@ -1770,7 +1758,6 @@ disabled with --disable-FEATURE, default is enabled i= f 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 @@ -2157,6 +2144,45 @@ else l2tpv3=3Dno fi =20 +######################################### +# vhost interdependencies and host support + +# vhost backends +test "$vhost_user" =3D "" && vhost_user=3Dyes +if test "$vhost_user" =3D "yes" && test "$mingw32" =3D "yes"; then + error_exit "vhost-user isn't available on win32" +fi +test "$vhost_kernel" =3D "" && vhost_kernel=3D$linux +if test "$vhost_kernel" =3D "yes" && test "$linux" !=3D "yes"; then + error_exit "vhost-kernel is only available on Linux" +fi + +# vhost-kernel devices +test "$vhost_scsi" =3D "" && vhost_scsi=3D$vhost_kernel +if test "$vhost_scsi" =3D "yes" && test "$vhost_kernel" !=3D "yes"; then + error_exit "--enable-vhost-scsi requires --enable-vhost-kernel" +fi +test "$vhost_vsock" =3D "" && vhost_vsock=3D$vhost_kernel +if test "$vhost_vsock" =3D "yes" && test "$vhost_kernel" !=3D "yes"; then + error_exit "--enable-vhost-vsock requires --enable-vhost-kernel" +fi + +# vhost-user backends +test "$vhost_net_user" =3D "" && vhost_net_user=3D$vhost_user +if test "$vhost_net_user" =3D "yes" && test "$vhost_user" =3D "no"; then + error_exit "--enable-vhost-net-user requires --enable-vhost-user" +fi +test "$vhost_crypto" =3D "" && vhost_crypto=3D$vhost_user +if test "$vhost_crypto" =3D "yes" && test "$vhost_user" =3D "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" =3D ""; then + test "$vhost_net_user" =3D "yes" && vhost_net=3Dyes + test "$vhost_kernel" =3D "yes" && vhost_net=3Dyes +fi + ########################################## # MinGW / Mingw-w64 localtime_r/gmtime_r check =20 @@ -6526,6 +6552,9 @@ fi if test "$vhost_vsock" =3D "yes" ; then echo "CONFIG_VHOST_VSOCK=3Dy" >> $config_host_mak fi +if test "$vhost_kernel" =3D "yes" ; then + echo "CONFIG_VHOST_KERNEL=3Dy" >> $config_host_mak +fi if test "$vhost_user" =3D "yes" ; then echo "CONFIG_VHOST_USER=3Dy" >> $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_P= CI)) +=3D virtio-crypto-p =20 obj-$(CONFIG_VHOST_USER) +=3D vhost-user.o obj-$(CONFIG_VHOST_VSOCK) +=3D vhost-vsock.o -obj-$(call lor,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) +=3D vhost.o vhost-ba= ckend.o -common-obj-$(call lnot,$(call lor,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))) += =3D vhost-stub.o +obj-$(call lor,$(CONFIG_VHOST_USER),$(CONFIG_VHOST_KERNEL)) +=3D vhost.o v= host-backend.o +common-obj-$(call lnot,$(call lor,$(CONFIG_VHOST_USER),$(CONFIG_VHOST_KERN= EL))) +=3D vhost-stub.o endif =20 common-obj-$(CONFIG_ALL) +=3D 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" =20 -#ifdef CONFIG_LINUX +#ifdef CONFIG_VHOST_KERNEL #include #include =20 @@ -274,7 +274,7 @@ int vhost_set_backend_type(struct vhost_dev *dev, Vhost= BackendType backend_type) int r =3D 0; =20 switch (backend_type) { -#ifdef CONFIG_LINUX +#ifdef CONFIG_VHOST_KERNEL case VHOST_BACKEND_TYPE_KERNEL: dev->vhost_ops =3D &kernel_ops; break; --=20 1.8.3.1