From patchwork Wed Aug 17 20:05:58 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: 597867 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b345:0:0:0:0 with SMTP id w5csp3537872maz; Wed, 17 Aug 2022 13:09:03 -0700 (PDT) X-Google-Smtp-Source: AA6agR6K4/NzUpOm2xBAoKsdmXDW/vpUtN1yoKUAe52ckQpyognv9ylt9R605Z77BZcBaUvJv5cr X-Received: by 2002:a05:620a:2214:b0:6bb:b250:1b92 with SMTP id m20-20020a05620a221400b006bbb2501b92mr269073qkh.571.1660766943468; Wed, 17 Aug 2022 13:09:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660766943; cv=none; d=google.com; s=arc-20160816; b=wgLBfQxYqc8oSB6PKJ60aPbCqbl2mj6MwVVoQDBM7fGGklPe17OjcozHXIt8rZlMzB LyEpJn7yKlAoTxIlYNWEFKsA8PAokY2Yzk913sZPywinJlGmP8EglBAbcyaM3NJoAHHz byE+A4tVHQ4I2UWmxU69ZEyD2MJXkMJsTes5Q2CGHpI+8RXi5LBw0C3GbFbLqbY0i3Ya N1JFLH5eQmM6PLjBTQJt2SAYLntjn06kG1KEKssOpSesWpxluVU6YW7AOjAjft/1AXoF El5XZWg1Dqu5jvdm11BZKfnVnS69y668FyAAlpcp4HvEFpQrKGkBRID/nZX6ozLH1qKz dNNA== 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=ciBt2hYDKhvoSd8DxUzT64ugCS+WT394gSsu02mKQvA=; b=IgeSL3ms0nZT9uws20DDhmWT0ZC/3tt0kHsUZlhhu/x0w+0V0qmS48NuamE1lwXlAq Kqbore+0+5oPRi7ii8X/4cKXIxEZYeKloBvxnzicAzho9a40/ppQ0IaxLVOgzQDocdMc H0UWNjSe/EkpT8O+82ZeYqoP7G/QdsP+E2OGvNCm+nVEnxLaEAmOm+3qT1D/UMyiuKQR y01wXrpvHR4ijvYifZx0vyFjJS2ZGGKxkuuVVbT5NHnf4AmF7bUN+KfLbRZoXpV3DXQR h1F9asQtk7q9oM/ZB9+VesIlraO8h35187Ihw+uK2FffWZZOAukNGzZmHKfMbfBDTPMI QnYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PmmGa4UK; 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 t12-20020ac8530c000000b00304b825a7c6si9340707qtn.66.2022.08.17.13.09.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Aug 2022 13:09:03 -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=PmmGa4UK; 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]:54464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oOPLa-0003wk-Qb for patch@linaro.org; Wed, 17 Aug 2022 16:09:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOPIk-0002wh-V7 for qemu-devel@nongnu.org; Wed, 17 Aug 2022 16:06:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:60419) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOPIj-0000FC-He for qemu-devel@nongnu.org; Wed, 17 Aug 2022 16:06:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660766765; 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=ciBt2hYDKhvoSd8DxUzT64ugCS+WT394gSsu02mKQvA=; b=PmmGa4UKa6cXwpfvuOA5MjWz0AzNt9a9JzO0L+1sxmHNpswhQ8fyuSpz0a1RPeCrx/FYWn rhTisiFVqqh5uFoMyFCfjXqgZhARXyCTI5QMj0Bln9nI2ynxV5D6jYiMC8vDWMdUdlPJAV X+o3c70gmcJjQ8cQasnKY7scJ8oW/BY= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-586-adLoEtLSPf2rIJ3Lp-ETaA-1; Wed, 17 Aug 2022 16:06:03 -0400 X-MC-Unique: adLoEtLSPf2rIJ3Lp-ETaA-1 Received: by mail-wm1-f72.google.com with SMTP id f5-20020a1cc905000000b003a60ef7ec71so601491wmb.4 for ; Wed, 17 Aug 2022 13:06:02 -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=ciBt2hYDKhvoSd8DxUzT64ugCS+WT394gSsu02mKQvA=; b=g9Mi6+Nl8sbGS3tZYK3i11mGyje6qFBLQdLlyCZTtcqrdXtsAz3zRHk8KJ5VxdKO3U DMFjyL8qk+3clIDvbwJFBvzlOQjsN1Xhdf3b05xDchhgoLUH2RxO3W4BMdpQDUAtU0/E yYSlExMDY6mWJro/MP2LcUkhe1VCho3Urw7V/8JtiLqGFKQJ7aH20biNUyRj7JUwAreZ PcQq0HtM2kSfsZaoW6QlBoTQ2+NFEUgl6iznj0y6NMsqe0cIdfzZ32dvEvMxneAGKiMi 6O4o+8kmkzbDKU7Hfp3TZcZF2qW24zvUJbTsTCWHDaiuWP7vnL3lNrjI4AOHaNdyJlnb 6JpQ== X-Gm-Message-State: ACgBeo3kq5AELIZfYuhn7aGZY1QlnGlL6dGv2WbJVBgvhoW/gzCRdZdi 0eAzPHbcl6kZF840y2+5P+jWml5g/4E0TFE0GK+isuJNhEemguQVe6gLHRdAV1xtqJmktvmii2d Rb1tlm8LRjV0Ou37vxNxFIrILd25o31QzdNiKttaDh5GuoSwl/qr4cvw0wJqg X-Received: by 2002:a5d:5a96:0:b0:223:8131:e4f2 with SMTP id bp22-20020a5d5a96000000b002238131e4f2mr15289068wrb.345.1660766761602; Wed, 17 Aug 2022 13:06:01 -0700 (PDT) X-Received: by 2002:a5d:5a96:0:b0:223:8131:e4f2 with SMTP id bp22-20020a5d5a96000000b002238131e4f2mr15289050wrb.345.1660766761329; Wed, 17 Aug 2022 13:06:01 -0700 (PDT) Received: from redhat.com ([2.55.4.37]) by smtp.gmail.com with ESMTPSA id n4-20020a05600c3b8400b003a54fffa809sm2829643wms.17.2022.08.17.13.05.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 13:06:00 -0700 (PDT) Date: Wed, 17 Aug 2022 16:05:58 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Alex =?utf-8?q?Benn=C3=A9e?= Subject: [PULL 03/12] hw/virtio: handle un-configured shutdown in virtio-pci Message-ID: <20220817200536.350795-4-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 The assert() protecting against leakage is a little aggressive and causes needless crashes if a device is shutdown without having been configured. In this case no descriptors are lost because none have been assigned. Signed-off-by: Alex Bennée Message-Id: <20220728135503.1060062-4-alex.bennee@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/virtio-pci.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 45327f0b31..5ce61f9b45 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -996,9 +996,14 @@ static int virtio_pci_set_guest_notifiers(DeviceState *d, int nvqs, bool assign) nvqs = MIN(nvqs, VIRTIO_QUEUE_MAX); - /* When deassigning, pass a consistent nvqs value - * to avoid leaking notifiers. + /* + * When deassigning, pass a consistent nvqs value to avoid leaking + * notifiers. But first check we've actually been configured, exit + * early if we haven't. */ + if (!assign && !proxy->nvqs_with_notifiers) { + return 0; + } assert(assign || nvqs == proxy->nvqs_with_notifiers); proxy->nvqs_with_notifiers = nvqs;