From nobody Tue Feb 10 01:16:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603709800; cv=none; d=zohomail.com; s=zohoarc; b=NJxcz/Elzt8hFlrqenwQ9fKvG7tSC2Y2pH+NZMMmlSkr271uAoeef/NKB7N+fgrCpcGP0Uo1vXWNPsmMxluwSz3p3xW2L22EknFbwhML1mcnoUi9OOu8CwkfDIb5iBM4Y+n1v2vOpOAqjpkJzJSsmqnvspeY2fJqtYb1PTlVqRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603709800; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=owqIkSbFHgdfPD7uMP3x2r37Kgl7CGcfC6ZJAfrhmJc=; b=Mp9CzfDvAuLzbF6fsr4L29iSxoT+MCGFhegggHd0XvndUcZy1uT6bO2s5oCpjkmh2q4ZutmaJl9zGbhTw4oENns+HCwOo3Kmf8WW6tJy47xzOK0T+I7IM3owvBhL2bYhBEBmzpayZNTImi3j9ZjbE8xmVejkaEVmq4aJP/0jyIU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603709800094731.7198112928033; Mon, 26 Oct 2020 03:56:40 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-308-qUGN-wcvMUGYcvqwElCzzg-1; Mon, 26 Oct 2020 06:56:35 -0400 Received: by mail-wr1-f72.google.com with SMTP id k14so8193022wrd.6 for ; Mon, 26 Oct 2020 03:56:35 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id k18sm21115302wrx.96.2020.10.26.03.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 03:56:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603709799; 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=owqIkSbFHgdfPD7uMP3x2r37Kgl7CGcfC6ZJAfrhmJc=; b=CW1JXs/784fF5OGSpUPX2bNvFna8Xjfx3enXkDIC1yAGXyYWw/uwtHtKAnfMNpQMnpjdQP vnMHvCRe6d6fgHqQ8nC2l+tG5ZGSss6XQbmfG1dS1MzVanLc2WkZa6KujiVEO2wVKtpO+m nY/NajctC+ySfK+Qs9rxIFBr7Cz5yNw= X-MC-Unique: qUGN-wcvMUGYcvqwElCzzg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=owqIkSbFHgdfPD7uMP3x2r37Kgl7CGcfC6ZJAfrhmJc=; b=W0Tk00t2iB59GjkB+7thOgw6d0IPoTtOWSsZeYJ6pmo5wkpAcME9wXciMcvlUF6MiI DO3drXheS+r7FhlNwhZVvVvfsmigWtXU42pkYtvILAtpZI8WgzPXF6Z74zDzZJtkUy7v MZvLy9+Yz533RyZe+fH14taF5rxxvhe2KFRoa59rWzwdci5xmxt9CUfGzSCqfBLb1L+3 Om9+7pWPcWn0d4oq99AaSor30da15aKDG6dG2WvsSPzCBEUGTFkkJ7i+ixrjivcPY/bm jVPZEhHB04UrHyCs3p2rRrvoG6qIFlVwMef/1puBbMIYMs0Ht0J4nH1wQlSkr1GijFt9 P8ug== X-Gm-Message-State: AOAM533MZ6f6Z8csl45g2KqSNRMhsfoA4VwvVI1Bn/FQ3HxwXyx3qcWc 9qb6z8SeSYFmBo8+CinbV6W/X08Vbx7aHgO0o7dhHd4ct1j0o9Mip6PQEk2MW2aizPyzXY8U5mN wG0E9zqH5FOKdUg== X-Received: by 2002:adf:cd8d:: with SMTP id q13mr16960609wrj.268.1603709794046; Mon, 26 Oct 2020 03:56:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyStCr9GxFzTzPbqA2g6ofgt9QpElmIywQhpDNkYRmZvTibmFmzj5jiI6159FHxiZD587MCGQ== X-Received: by 2002:adf:cd8d:: with SMTP id q13mr16960590wrj.268.1603709793897; Mon, 26 Oct 2020 03:56:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Auger , Alex Williamson , qemu-block@nongnu.org, Fam Zheng , Max Reitz , Stefan Hajnoczi , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 18/19] block/nvme: Switch to using the MSIX API Date: Mon, 26 Oct 2020 11:55:03 +0100 Message-Id: <20201026105504.4023620-19-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201026105504.4023620-1-philmd@redhat.com> References: <20201026105504.4023620-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) In preparation of using multiple IRQs, switch to using the recently introduced MSIX API. Instead of allocating and assigning IRQ in a single step, we now have to use two distinct calls. Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/nvme.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/block/nvme.c b/block/nvme.c index 46b09b3a3a7..191678540b6 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -693,6 +693,7 @@ static int nvme_init(BlockDriverState *bs, const char *= device, int namespace, size_t device_page_size_min; size_t device_page_size_max; size_t iommu_page_size_min =3D 4096; + unsigned irq_count =3D MSIX_IRQ_COUNT; =20 qemu_co_mutex_init(&s->dma_map_lock); qemu_co_queue_init(&s->dma_flush_queue); @@ -809,8 +810,17 @@ static int nvme_init(BlockDriverState *bs, const char = *device, int namespace, } } =20 - ret =3D qemu_vfio_pci_init_irq(s->vfio, s->irq_notifier, - VFIO_PCI_MSIX_IRQ_INDEX, errp); + ret =3D qemu_vfio_pci_msix_init_irqs(s->vfio, &irq_count, errp); + if (ret) { + if (ret =3D=3D -EOVERFLOW) { + error_append_hint(errp, "%u IRQs requested but only %u availab= le\n", + MSIX_IRQ_COUNT, irq_count); + } + goto out; + } + + ret =3D qemu_vfio_pci_msix_set_irq(s->vfio, MSIX_SHARED_IRQ_IDX, + s->irq_notifier, errp); if (ret) { goto out; } --=20 2.26.2