From nobody Mon Feb 9 05:43:07 2026 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 1517860375714903.8804702446502; Mon, 5 Feb 2018 11:52:55 -0800 (PST) Received: from localhost ([::1]:54925 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eimow-0000wb-SU for importer@patchew.org; Mon, 05 Feb 2018 14:52:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eimSR-0004dN-Tp for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eimSQ-00054a-8b for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:39 -0500 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:37775) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eimSQ-00054M-1Q for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:38 -0500 Received: by mail-wr0-x22f.google.com with SMTP id a43so23273386wrc.4 for ; Mon, 05 Feb 2018 11:29:37 -0800 (PST) Received: from 640k.lan ([82.84.122.246]) by smtp.gmail.com with ESMTPSA id g8sm20029891wra.18.2018.02.05.11.29.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 11:29:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Jem13yd952MepaFHkWvQJXBwnlImBJSSf/Bn/4DDSR0=; b=hGkBp+7OBERzRp1VgFHJkQ7LTnSoHwaoVLi3iGIxtINqcsQ/o+ps6BVHx19cDX33DO jpuZvKHAHhGUX0L58N1I6jRT77O+86CExK+AJTDzXM577WRR1PnDtayRnS0cKLrJJc1w Mq2fZGm1SR1lSFNUZhhNY6wQBrTmcw314d2L0UtzbZxpvK4+tI4oEJQheq445ysjOp21 v5oHzmZNB2XGjv5CXSDmG5L4fAvSXSzchwgYNSBKXPDtkzCLPc210xQ9jq87GY+fuKl9 B/SU4faYEpwz8Ms6ycI5JTRR+GH8Hn/lJfdVcDykwen5WYkEtgE5Z2hPn4kPaKIUEhII px1g== 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:cc:subject:date:message-id :in-reply-to:references; bh=Jem13yd952MepaFHkWvQJXBwnlImBJSSf/Bn/4DDSR0=; b=r3F9TxHbpiSRb0oGSYpSkfcbNF/tX4oqH9bzu0y/a4gosKPLEJ7n/2aHUz9KN71Gkb qfGxOF11JmyXPxAhVtIC8iU8PVm6koy2/4rrOSFl+4DU69zknskJxhUe43GfIGlRcFxt 36zJ1sglnsfGHlcKXXjY1PW/1wpcEVvUiow+S+/FZ4nqoBGYzAwPBrIxq8BY5fxyNGdl N8Lt2vvxCLKx+qZ9NeyGUmMmLNcXC7nSEaRaC6l623EsxiL8omj0bc6ZA3oT6A8YZzVk y0eS1Cdcr/DX4h8RQ5TargStkVcip31n2qMl9asyN8pZWAl12JAySyPPS5RMl1zOAKDa s6NA== X-Gm-Message-State: AKwxytepO0cNaATcG2zdhfU9v5bgYK7FCLXBonlXQH+x+LTMD1hWfPLf UYDfR+U/p1SAHW3reDMxbI8OxyLA X-Google-Smtp-Source: AH8x224YJjyZ4at99wWVsQsNGqN3kGMoxyXK60HGc7/EKUhvxB46loadXM2z6qVoPim7cZoaeV7qZw== X-Received: by 10.223.184.213 with SMTP id c21mr36356633wrg.57.1517858976629; Mon, 05 Feb 2018 11:29:36 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 20:28:41 +0100 Message-Id: <1517858941-5538-28-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> References: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22f Subject: [Qemu-devel] [PULL 27/47] ivshmem: Always remove irqfd notifiers 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: , Cc: Ladi Prosek Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Ladi Prosek As of commit 660c97eef6f8 ("ivshmem: use kvm irqfd for msi notifications"), QEMU crashes with: ivshmem: msix_set_vector_notifiers failed msix_unset_vector_notifiers: Assertion `dev->msix_vector_use_notifier && de= v->msix_vector_release_notifier' failed. if MSI-X is repeatedly enabled and disabled on the ivshmem device, for exam= ple by loading and unloading the Windows ivshmem driver. This is because msix_unset_vector_notifiers() doesn't call any of the release notifier call= backs since MSI-X is already disabled at that point (msix_enabled() returning fal= se is how this transition is detected in the first place). Thus ivshmem_vector= _mask() doesn't run and when MSI-X is subsequently enabled again ivshmem_vector_unm= ask() fails. This is fixed by keeping track of unmasked vectors and making sure that ivshmem_vector_mask() always runs on MSI-X disable. Fixes: 660c97eef6f8 ("ivshmem: use kvm irqfd for msi notifications") Signed-off-by: Ladi Prosek Reviewed-by: Markus Armbruster Message-Id: <20171211072110.9058-3-lprosek@redhat.com> Signed-off-by: Paolo Bonzini --- hw/misc/ivshmem.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 0b471d9..95e85e4 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -76,6 +76,7 @@ typedef struct Peer { typedef struct MSIVector { PCIDevice *pdev; int virq; + bool unmasked; } MSIVector; =20 typedef struct IVShmemState { @@ -320,6 +321,7 @@ static int ivshmem_vector_unmask(PCIDevice *dev, unsign= ed vector, error_report("ivshmem: vector %d route does not exist", vector); return -EINVAL; } + assert(!v->unmasked); =20 ret =3D kvm_irqchip_update_msi_route(kvm_state, v->virq, msg, dev); if (ret < 0) { @@ -327,7 +329,13 @@ static int ivshmem_vector_unmask(PCIDevice *dev, unsig= ned vector, } kvm_irqchip_commit_routes(kvm_state); =20 - return kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, n, NULL, v->virq); + ret =3D kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, n, NULL, v->virq= ); + if (ret < 0) { + return ret; + } + v->unmasked =3D true; + + return 0; } =20 static void ivshmem_vector_mask(PCIDevice *dev, unsigned vector) @@ -342,11 +350,14 @@ static void ivshmem_vector_mask(PCIDevice *dev, unsig= ned vector) error_report("ivshmem: vector %d route does not exist", vector); return; } + assert(v->unmasked); =20 ret =3D kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, n, v->virq); - if (ret !=3D 0) { + if (ret < 0) { error_report("remove_irqfd_notifier_gsi failed"); + return; } + v->unmasked =3D false; } =20 static void ivshmem_vector_poll(PCIDevice *dev, @@ -816,11 +827,20 @@ static void ivshmem_disable_irqfd(IVShmemState *s) PCIDevice *pdev =3D PCI_DEVICE(s); int i; =20 + msix_unset_vector_notifiers(pdev); + for (i =3D 0; i < s->peers[s->vm_id].nb_eventfds; i++) { + /* + * MSI-X is already disabled here so msix_unset_vector_notifiers() + * didn't call our release notifier. Do it now to keep our masks = and + * unmasks balanced. + */ + if (s->msi_vectors[i].unmasked) { + ivshmem_vector_mask(pdev, i); + } ivshmem_remove_kvm_msi_virq(s, i); } =20 - msix_unset_vector_notifiers(pdev); } =20 static void ivshmem_write_config(PCIDevice *pdev, uint32_t address, --=20 1.8.3.1