From patchwork Wed Aug 17 20:05:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 597866 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b345:0:0:0:0 with SMTP id w5csp3537864maz; Wed, 17 Aug 2022 13:09:03 -0700 (PDT) X-Google-Smtp-Source: AA6agR7jh+sRC3BqFJkywYO8z6zrhDePvJ9fkPbFiMBKPykQNaEkFeWyWD3Unt9dUgQYFYLCAsqn X-Received: by 2002:a05:620a:bc9:b0:6b6:66b2:d417 with SMTP id s9-20020a05620a0bc900b006b666b2d417mr19650768qki.3.1660766942959; Wed, 17 Aug 2022 13:09:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660766942; cv=none; d=google.com; s=arc-20160816; b=bjz6ZHxI3NrgAcmtGCB2i+s9G9FDprCIz9anJvxyKMoRlFEwgDmCpp/gzX0faaUTyQ X7Zguxm0DAJBog8Rx+4oOzbvzYyjtqhEZhs/svQ1nSfPpOf5PlERNRyxrf6XOkUI8yLZ Y/HTncMvwShyULlhlzsyQK+gvjbfKFs46RdbG1N9JGT42I1ZvKRwThv0ZodDhinwMge6 h0kUtsJvgwNswSugJR8WlnKmooi+dbm3aWXTk2yZtc4sH3yQWcgpSe0vp4/hlMQ9K0yY iJVdDOTUfOK5yCWvly0lJKUXsT1Zfl5s7oswlK4avVhYx+xd34B0Y+h1bGEtE5SE2nHP S8zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=DV2CGvKwhVU6MHqdfffqDvMvVM56xezMHq/D8UxHfEk=; b=vvtrQLpXZrZfw0pSWvx7UkUR3sksnEz/OUfswm2CgLmQ8x7C6KR8gy5U9+SpEWdRiT l2nVxXqnvKUu0cM+b59lZ3lvCxq22fs5blF+momzm7TT1pLbHCjXR4f3B5nnhkAsWtTe 4HRzbxyfRat+apEGS+d8+BfPZa2iRSem8ANb2q57nVIBS3YA7gFNLF15PoDr4DK9n+I+ Hd6vcZ0vUFcpz8FEEa3YCb3l177eAdeGoVd6RN/eo0XWvAqnjaMMil8yI4e5z3Xq8uZA Iu/OHA+t2QV8kTORNm6acx6NGRCR4SVf3n6FjYtifjPZDEKXweLTvMwoul5TsLgMdvXq k9Mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bd9lb73+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id dv25-20020a05620a1b9900b006bb4e956a73si4301686qkb.256.2022.08.17.13.09.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Aug 2022 13:09:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bd9lb73+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:54462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oOPLa-0003tQ-H8 for patch@linaro.org; Wed, 17 Aug 2022 16:09:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOPIi-0002tG-Jm for qemu-devel@nongnu.org; Wed, 17 Aug 2022 16:06:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:49850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOPIf-0000E6-Vu for qemu-devel@nongnu.org; Wed, 17 Aug 2022 16:06:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660766761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DV2CGvKwhVU6MHqdfffqDvMvVM56xezMHq/D8UxHfEk=; b=bd9lb73+sWzYFP92gYK4P74XVsqYYSAo6h+ZB4SH0rugJsdou++oFmO/dRB9/ZHD8sNkX5 vMfurZm3hBBba0LrZJdxbbJVHjmcay5x5AanwY4znaLgztVSY1QXkcZHqJG9LwHCedrGBs aJiX329LQY5wM8zr9d+IjC1wmbmo7b0= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-286-JDqFfRhWPVeeLT6RoARiwQ-1; Wed, 17 Aug 2022 16:05:59 -0400 X-MC-Unique: JDqFfRhWPVeeLT6RoARiwQ-1 Received: by mail-wm1-f69.google.com with SMTP id j22-20020a05600c485600b003a5e4420552so1533567wmo.8 for ; Wed, 17 Aug 2022 13:05:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc; bh=DV2CGvKwhVU6MHqdfffqDvMvVM56xezMHq/D8UxHfEk=; b=ozctaTGrGQ5LQRIWk0B/C1392INCQSMAXN2eILD1/6hGbeTWAGTMBKF8qepaOea02L HqLBv2QrSm5fTOVfsQjPEjtEtJOS0ctJ4PFFg+oUFy28AbkaMr3CaqOr4ETExPd1BsP2 w1+1JFkjFkV0ygtLAUAKWwMQgUxB53SznSEmVq9MHP1HvMOxN+/SviE/eXTKedOtXIk8 +5OIY8Ax8DS4PBX893jLPr9W7+6VWqNtjze/nPrJnOsLokiZJpEU9v3UcThQ6+1VaeIp /yEv8Lsz7I6usWN+b/oesSr6cOdtOvAAbr/+kRZFe6zOxATr7HSi6BN9g0IvHs+HKoe8 u96g== X-Gm-Message-State: ACgBeo0gvgfGFHnCm/FYpBZCo4iE1D1SULwyMGdWX4Hfvnf/La1B6IBy GZHaxOrAXTd11xMERBm7shS1818A4xwrLbuJ6dL/5RXveKGCW4SkHjK+C6FNLW1oYBul7VLt8Tp o27I13dnme1csNL5Wh3Ir1Wa4phTfxX34AHB9B+o6DBecKQM7TQuZ4fPkol9j X-Received: by 2002:adf:ecce:0:b0:225:2c58:246f with SMTP id s14-20020adfecce000000b002252c58246fmr660139wro.460.1660766758201; Wed, 17 Aug 2022 13:05:58 -0700 (PDT) X-Received: by 2002:adf:ecce:0:b0:225:2c58:246f with SMTP id s14-20020adfecce000000b002252c58246fmr660133wro.460.1660766757923; Wed, 17 Aug 2022 13:05:57 -0700 (PDT) Received: from redhat.com ([2.55.4.37]) by smtp.gmail.com with ESMTPSA id u26-20020a05600c00da00b003a4f1385f0asm3061151wmm.24.2022.08.17.13.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 13:05:57 -0700 (PDT) Date: Wed, 17 Aug 2022 16:05:54 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Alex =?utf-8?q?Benn=C3=A9e?= Subject: [PULL 02/12] hw/virtio: gracefully handle unset vhost_dev vdev Message-ID: <20220817200536.350795-3-mst@redhat.com> References: <20220817200536.350795-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220817200536.350795-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée I've noticed asserts firing because we query the status of vdev after a vhost connection is closed down. Rather than faulting on the NULL indirect just quietly reply false. Signed-off-by: Alex Bennée Message-Id: <20220728135503.1060062-3-alex.bennee@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 0827d631c0..f758f177bb 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -306,7 +306,7 @@ static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size) dev->log_size = size; } -static int vhost_dev_has_iommu(struct vhost_dev *dev) +static bool vhost_dev_has_iommu(struct vhost_dev *dev) { VirtIODevice *vdev = dev->vdev; @@ -316,8 +316,12 @@ static int vhost_dev_has_iommu(struct vhost_dev *dev) * does not have IOMMU, there's no need to enable this feature * which may cause unnecessary IOTLB miss/update transactions. */ - return virtio_bus_device_iommu_enabled(vdev) && - virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM); + if (vdev) { + return virtio_bus_device_iommu_enabled(vdev) && + virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM); + } else { + return false; + } } static void *vhost_memory_map(struct vhost_dev *dev, hwaddr addr,