From nobody Mon Feb 9 01:22:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597853228; cv=none; d=zohomail.com; s=zohoarc; b=byL9ToDklih8a8IyVUmp3W9kIVKIqqrcGq0+OtC+gfLw5evBWoUeMnbVtzQ/tr6O75SLRGt6YS0l/JE1pnpMKhIE10df1nSURHvehzqygNRkUXJdAAT6mTEWxu341uC2vhPxnKD4LUbyEDz/7CG8m9lu1k3Q+el2427U2hsRMl0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597853228; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ho8cPWJii6sWnwNRTVS2YPSPCOdB9KXiAmhGWCYo8UY=; b=M+UiacuQ8atvkY0uo31FYzkJPNfaDCXC9y+1rQ5wGgPZzmUvaXR3hGnjMntO7m8JDSaK8sdvai766fuNNi9aQFENLf78KSs8HKu3vN+o77ze4rglsK3yM1kDeWkgLBGAmacVcbLY83ScAk0bcdbrIHF3TVKxhuPvzgjDHTTk5T4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597853228810290.3332779426638; Wed, 19 Aug 2020 09:07:08 -0700 (PDT) Received: from localhost ([::1]:46700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8QcF-0007Ny-Ic for importer@patchew.org; Wed, 19 Aug 2020 12:07:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8QYq-0003HO-53 for qemu-devel@nongnu.org; Wed, 19 Aug 2020 12:03:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59011) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k8QYn-0005qn-CA for qemu-devel@nongnu.org; Wed, 19 Aug 2020 12:03:35 -0400 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-513-Huj2gJToMA6q-3vCc9jQ4w-1; Wed, 19 Aug 2020 12:03:28 -0400 Received: by mail-wr1-f72.google.com with SMTP id m7so9498882wrb.20 for ; Wed, 19 Aug 2020 09:03:27 -0700 (PDT) Received: from x1w.redhat.com (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id b139sm6467980wmd.19.2020.08.19.09.03.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2020 09:03:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597853009; 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=ho8cPWJii6sWnwNRTVS2YPSPCOdB9KXiAmhGWCYo8UY=; b=POPlAowZ4iwxK7QpJOrVtZAT8R1j0ei8Wz3VijlH0wJp/4CbOYxq7t+2EOqPPGveFcOz+d wIQmiPDegEfXhsqA6LjXagFMDGSQvUl+1CTu6zlzlncQk2VnYyl9G6VCDghLjLfT1S8NAw IDZrT+iDFI6EWuwN9EZ7T81oQwcw+VM= X-MC-Unique: Huj2gJToMA6q-3vCc9jQ4w-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=ho8cPWJii6sWnwNRTVS2YPSPCOdB9KXiAmhGWCYo8UY=; b=HuzgznC3Idu14HPEf9JaYQiw6rYYMTGRil8vNd/phwDerFzu5W8pCm0xzS82/ykhIO EBj/ZlLO0nsx93MBO+ykyjhyV2WfBbfKAwGirbQwQbuhVCL0JXxuKcK6Nzrq+TOs0aOT FH328o63eF8YbT3oCslwryJkX+z02V2UOhsxMof2UKFMOQsBEseWW6Ayk+mvO6uwjEmI VzVHLet/IBewGCcXWl8TMeJP73GVuCnJMUQnAyAJEdaBVJizc+7oD6gSK99V6ArXNcFW DeiZoHmlVqgQ2COlvHRb9GkZQoLcTcIKXk7MAJAa9IetVIvTL1CxB2JIVbBh4/0uFx8i pgCA== X-Gm-Message-State: AOAM5303DdrYQEkoJzdmgA7xEE47d8cmwU33/pfdcw5WcEWLQkbLPZRW FdypYKybFF3RHwgzy0DVC1J0XdXaZiM7T1QP5rXDTDdmcTGNYpgViUr+faMxUUdZoTovsNb5s3g Jd9nCW7Z4AKtHEgE= X-Received: by 2002:adf:94c5:: with SMTP id 63mr25511521wrr.34.1597853006637; Wed, 19 Aug 2020 09:03:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNqUEm+bDUZC9e3w6+dqc8xClQ7dDYRbGlbLG5o8Ddy0JJNEh+ci7VK/3RrSw8rnzuaM2HkQ== X-Received: by 2002:adf:94c5:: with SMTP id 63mr25511492wrr.34.1597853006420; Wed, 19 Aug 2020 09:03:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v4 1/5] block/nvme: Use an array of EventNotifier Date: Wed, 19 Aug 2020 18:03:14 +0200 Message-Id: <20200819160318.835292-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200819160318.835292-1-philmd@redhat.com> References: <20200819160318.835292-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.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/19 10:07:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Max Reitz , Alex Williamson , Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) In preparation of using multiple IRQ (thus multiple eventfds) make BDRVNVMeState::irq_notifier an array (for now of a single element, the admin queue notifier). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Hajnoczi --- block/nvme.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/block/nvme.c b/block/nvme.c index a61e86a83eb..fe8a40b7ede 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -106,6 +106,12 @@ QEMU_BUILD_BUG_ON(offsetof(NVMeRegs, doorbells) !=3D 0= x1000); #define INDEX_ADMIN 0 #define INDEX_IO(n) (1 + n) =20 +/* This driver shares a single MSIX IRQ for the admin and I/O queues */ +enum { + MSIX_SHARED_IRQ_IDX =3D 0, + MSIX_IRQ_COUNT =3D 1 +}; + struct BDRVNVMeState { AioContext *aio_context; QEMUVFIOState *vfio; @@ -120,7 +126,7 @@ struct BDRVNVMeState { /* How many uint32_t elements does each doorbell entry take. */ size_t doorbell_scale; bool write_cache_supported; - EventNotifier irq_notifier; + EventNotifier irq_notifier[MSIX_IRQ_COUNT]; =20 uint64_t nsze; /* Namespace size reported by identify command */ int nsid; /* The namespace id to read/write data. */ @@ -631,7 +637,8 @@ static bool nvme_poll_queues(BDRVNVMeState *s) =20 static void nvme_handle_event(EventNotifier *n) { - BDRVNVMeState *s =3D container_of(n, BDRVNVMeState, irq_notifier); + BDRVNVMeState *s =3D container_of(n, BDRVNVMeState, + irq_notifier[MSIX_SHARED_IRQ_IDX]); =20 trace_nvme_handle_event(s); event_notifier_test_and_clear(n); @@ -683,7 +690,8 @@ out_error: static bool nvme_poll_cb(void *opaque) { EventNotifier *e =3D opaque; - BDRVNVMeState *s =3D container_of(e, BDRVNVMeState, irq_notifier); + BDRVNVMeState *s =3D container_of(e, BDRVNVMeState, + irq_notifier[MSIX_SHARED_IRQ_IDX]); =20 trace_nvme_poll_cb(s); return nvme_poll_queues(s); @@ -705,7 +713,7 @@ static int nvme_init(BlockDriverState *bs, const char *= device, int namespace, s->device =3D g_strdup(device); s->nsid =3D namespace; s->aio_context =3D bdrv_get_aio_context(bs); - ret =3D event_notifier_init(&s->irq_notifier, 0); + ret =3D event_notifier_init(&s->irq_notifier[MSIX_SHARED_IRQ_IDX], 0); if (ret) { error_setg(errp, "Failed to init event notifier"); return ret; @@ -784,12 +792,13 @@ static int nvme_init(BlockDriverState *bs, const char= *device, int namespace, } } =20 - ret =3D qemu_vfio_pci_init_irq(s->vfio, &s->irq_notifier, + ret =3D qemu_vfio_pci_init_irq(s->vfio, s->irq_notifier, VFIO_PCI_MSIX_IRQ_INDEX, errp); if (ret) { goto out; } - aio_set_event_notifier(bdrv_get_aio_context(bs), &s->irq_notifier, + aio_set_event_notifier(bdrv_get_aio_context(bs), + &s->irq_notifier[MSIX_SHARED_IRQ_IDX], false, nvme_handle_event, nvme_poll_cb); =20 nvme_identify(bs, namespace, &local_err); @@ -872,9 +881,10 @@ static void nvme_close(BlockDriverState *bs) nvme_free_queue_pair(s->queues[i]); } g_free(s->queues); - aio_set_event_notifier(bdrv_get_aio_context(bs), &s->irq_notifier, + aio_set_event_notifier(bdrv_get_aio_context(bs), + &s->irq_notifier[MSIX_SHARED_IRQ_IDX], false, NULL, NULL); - event_notifier_cleanup(&s->irq_notifier); + event_notifier_cleanup(&s->irq_notifier[MSIX_SHARED_IRQ_IDX]); qemu_vfio_pci_unmap_bar(s->vfio, 0, (void *)s->regs, 0, NVME_BAR_SIZE); qemu_vfio_close(s->vfio); =20 @@ -1381,7 +1391,8 @@ static void nvme_detach_aio_context(BlockDriverState = *bs) q->completion_bh =3D NULL; } =20 - aio_set_event_notifier(bdrv_get_aio_context(bs), &s->irq_notifier, + aio_set_event_notifier(bdrv_get_aio_context(bs), + &s->irq_notifier[MSIX_SHARED_IRQ_IDX], false, NULL, NULL); } =20 @@ -1391,7 +1402,7 @@ static void nvme_attach_aio_context(BlockDriverState = *bs, BDRVNVMeState *s =3D bs->opaque; =20 s->aio_context =3D new_context; - aio_set_event_notifier(new_context, &s->irq_notifier, + aio_set_event_notifier(new_context, &s->irq_notifier[MSIX_SHARED_IRQ_I= DX], false, nvme_handle_event, nvme_poll_cb); =20 for (int i =3D 0; i < s->nr_queues; i++) { --=20 2.26.2 From nobody Mon Feb 9 01:22:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597853216; cv=none; d=zohomail.com; s=zohoarc; b=VJo+bhyBrtndn6O1HWy33Irt5Ozzd6k3LTCWYP1IKtgmxKrJoTZreVLSL+7x4JkFwJ3kFX8KAWuOdqyMuOhV0GG68gSNTOtO0rmVeP9znJT+mg99+GfH3nD98Q2iqHWiEFOdRUnrddxk1eP1iSktgqoZYoQaoXwK+cs7jOVrezk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597853216; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9O15VX2DFK35iLFC0RSB8xSgR+TCb7ZNW9WsEjB+21k=; b=Twy8m1JThMA8bioVBWHP9/hHH9PbB2e/i0/UdUZeO5t5s9gHH3GhZUrB1c2ntzWaIs31hlslFt48xT5SBKbzcJe0/0vlsrQo6ClxnJEtCvhmV92RoQrVbj5zLJJ2Jke76EgI4ezHl1QH88VKhuAqA7bHl/k2U0Cgu3ItBpU5Tdg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597853216804620.3319707035228; Wed, 19 Aug 2020 09:06:56 -0700 (PDT) Received: from localhost ([::1]:45742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8Qc2-0006yH-Jc for importer@patchew.org; Wed, 19 Aug 2020 12:06:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8QYw-0003UW-4J for qemu-devel@nongnu.org; Wed, 19 Aug 2020 12:03:42 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:47083 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k8QYu-0005rr-IJ for qemu-devel@nongnu.org; Wed, 19 Aug 2020 12:03:41 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-146-2yvh-WbuObmpIZjrJjpEiw-1; Wed, 19 Aug 2020 12:03:33 -0400 Received: by mail-wr1-f69.google.com with SMTP id r14so9543839wrq.3 for ; Wed, 19 Aug 2020 09:03:33 -0700 (PDT) Received: from x1w.redhat.com (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id 128sm6149049wmz.43.2020.08.19.09.03.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2020 09:03:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597853019; 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=9O15VX2DFK35iLFC0RSB8xSgR+TCb7ZNW9WsEjB+21k=; b=du1G9TUTddJUE2a75CUzCaTMRMb1qIdrnfbsXanCjQyyz/EFLa5+CH0t2zb2yNnsvmkjXd x8aKLBzdZ+oOH16J61pBT+Mqvcc7wlHycyoFEq4AhtfUOFSt+SqHxuKmvsE1y3AblUqCot f/TQVq4VX8hwwBXqBXUrYJcJyKhIGgw= X-MC-Unique: 2yvh-WbuObmpIZjrJjpEiw-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=9O15VX2DFK35iLFC0RSB8xSgR+TCb7ZNW9WsEjB+21k=; b=T7z2hfRCwE8yoX94zYBXxTRufiTiD14WefSc009miejIxmpVvQ50AgB63KvqFMdSjP ZdvULrNwhyjeabAUAtQpZHXQgt8CxR+P1uNDBseVD5FTCWr3mJVZF1DmWZQj9zyDrsJr NH355QCEqmoj/OcBZOwrPMh9fVaagtPOMCd8x3V5exoxng79nauX85EOzZdmXuHoGMmT nCEbkcro14Zl1Ngv9ia234bnBj7G4m99G3YIp9CSJ6i7fZPrVDg42Gqqd13HC2mIyBnB tZROjqYeGzdNq/37GqbN/K8dbjg8ePdwJwtU2mp06eCthM0yw0K38f6la4JxkJcz+xFR kHog== X-Gm-Message-State: AOAM533OLU/sNW9JWwdCvxexfQDM6vbls+8OMQ4Ei6JGQ+iSJMKUznf+ 2Uj8AyW3EFPnyfztYBYqGTDR1hiHFT4Dr7Y1Gx9si6Zo7M8HBzxAQ6fx/2l/hd+C65+siJn/94K RwtCgzWHuPoG1UwY= X-Received: by 2002:a7b:cf2f:: with SMTP id m15mr5462660wmg.69.1597853011783; Wed, 19 Aug 2020 09:03:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysHluD3qJEOPzuP/ieMVbQZdvyPdTRQa9d/tedAA0fTG5mpQAGZ/n77/9Nz+kT0qOMlH62DQ== X-Received: by 2002:a7b:cf2f:: with SMTP id m15mr5462648wmg.69.1597853011616; Wed, 19 Aug 2020 09:03:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v4 2/5] util/vfio-helpers: Improve reporting unsupported IOMMU type Date: Wed, 19 Aug 2020 18:03:15 +0200 Message-Id: <20200819160318.835292-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200819160318.835292-1-philmd@redhat.com> References: <20200819160318.835292-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.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/18 23:05:17 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Max Reitz , Alex Williamson , Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Change the confuse "VFIO IOMMU check failed" error message by the explicit "VFIO IOMMU Type1 is not supported" once. Example on POWER: $ qemu-system-ppc64 -drive if=3Dnone,id=3Dnvme0,file=3Dnvme://0001:01:00.0= /1,format=3Draw qemu-system-ppc64: -drive if=3Dnone,id=3Dnvme0,file=3Dnvme://0001:01:00.0/= 1,format=3Draw: VFIO IOMMU Type1 is not supported Suggested-by: Alex Williamson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- util/vfio-helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index e399e330e26..9a83e6084e5 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -261,7 +261,7 @@ static int qemu_vfio_init_pci(QEMUVFIOState *s, const c= har *device, } =20 if (!ioctl(s->container, VFIO_CHECK_EXTENSION, VFIO_TYPE1_IOMMU)) { - error_setg_errno(errp, errno, "VFIO IOMMU check failed"); + error_setg_errno(errp, errno, "VFIO IOMMU Type1 is not supported"); ret =3D -EINVAL; goto fail_container; } --=20 2.26.2 From nobody Mon Feb 9 01:22:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597853350; cv=none; d=zohomail.com; s=zohoarc; b=jSZn6CRGp+gUAHJwbfXOq1bQL7pWnJlnj3VbqQ/hjZiHGvU2cmzX/PVbZ7hjjEeGmc8uKbEf68BmuKd9o6j2WTHqII6jlvdx78zVfqZrmb3fSptNW/ZTNHpg9ZKXAsZcOd2FquX7QIzFHMXFA9NDNPIL2Ps7CQH3g8V5LSyg9w8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597853350; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YRQ9mJzxFFnnzbD5pf4D2DkfPqunxufmo1dZugmab6A=; b=UKKLUgQ0VVXdMMHunQKG93KzH65vyei0v29++4JlTvQy4Sx9ozvROAVxciFylL9A2X91BnQOU0ZlW2Fn4O+9+O798+3zIwi7Sd6nUGJAa0KryixzllWI/t1La7DP/eBN98yc3Oxe5czwOkXFpgGyJ7dOGgqd8qF0Aty+XwZknBo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597853350694471.2422278466106; Wed, 19 Aug 2020 09:09:10 -0700 (PDT) Received: from localhost ([::1]:51750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8QeC-0001J2-9q for importer@patchew.org; Wed, 19 Aug 2020 12:09:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8QYx-0003XB-BS for qemu-devel@nongnu.org; Wed, 19 Aug 2020 12:03:43 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:52334 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k8QYv-0005ru-BX for qemu-devel@nongnu.org; Wed, 19 Aug 2020 12:03:43 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-403-vjFQymdINMmAbevngV-aLQ-1; Wed, 19 Aug 2020 12:03:38 -0400 Received: by mail-wm1-f69.google.com with SMTP id c186so1185552wmd.9 for ; Wed, 19 Aug 2020 09:03:37 -0700 (PDT) Received: from x1w.redhat.com (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id p15sm40334929wrj.61.2020.08.19.09.03.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2020 09:03:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597853020; 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=YRQ9mJzxFFnnzbD5pf4D2DkfPqunxufmo1dZugmab6A=; b=fCsTWS/mMipNLtZyr0mBNDXWBYvcMxgxaxjRzD68PUFV0HhB/NEeZQPIdXQS/9sXCbog6o bvM9v0fPV6ly6ZECsPdZlaN8+q5Ktx7FJ5D1XGTsq2eL/ccaOfhNqcTNF+4Inkk3Oby2Rz 4zi1gNzwdyzrq9c8XyLJmv0Avdp9W6Q= X-MC-Unique: vjFQymdINMmAbevngV-aLQ-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=YRQ9mJzxFFnnzbD5pf4D2DkfPqunxufmo1dZugmab6A=; b=Yfy3titUhvC6Cswodnfvj8GL/zdhtMciYYpoQzPRJ0ATpx6PnhWVx9N2Ey4Rr3d39/ uvuIUYqM1dSe7xgsgrgogJvm8+EeGmAEkxhC14RGb6korBNNXUajFhGY4jNn/Nchbr9l dhaptNWLZb4FQnBNcoUgBbCfG9UGIGBoDPaURliBpyB/dw3tBhEqHSFyP3x4g+tOhGve +Wi6BDPyCSlflERXjui43do2kNBNzC8dI9tc0/mIU6/Vt874ElpX0JIFJoFiJrtuFnSW JaK/F17VknBcg/T1oyd2VlfRPU2QmOMmf6vx0J1S1YDrdM5Z6fh6Puvhxndf5EH+2UKz xDZw== X-Gm-Message-State: AOAM5334FL0NfF80c15Z+qU6u3eJwP/m1rU5dWvwVkm8BtZlfAoqF8YM sGljpjWFEoSmYYVrEhFZN136EMg39BQMShbxDPXu5OR6Z7kHk68B2zLo7ejwmq35+c2U1XRcRPn 8ezn5JM1xfkc5oyA= X-Received: by 2002:a1c:6289:: with SMTP id w131mr5792689wmb.41.1597853016819; Wed, 19 Aug 2020 09:03:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxoRrvzyCvbz3ztv5TNpPvcFk98hJtWjid85QONpc+Fpw8/fxtWP9u3Pb3+v0FCcPYjUg39Pw== X-Received: by 2002:a1c:6289:: with SMTP id w131mr5792667wmb.41.1597853016650; Wed, 19 Aug 2020 09:03:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v4 3/5] util/vfio-helpers: Report error when IOMMU page size is not supported Date: Wed, 19 Aug 2020 18:03:16 +0200 Message-Id: <20200819160318.835292-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200819160318.835292-1-philmd@redhat.com> References: <20200819160318.835292-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.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/19 01:46:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Max Reitz , Alex Williamson , Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This driver uses the host page size to align its memory regions, but this size is not always compatible with the IOMMU. Add a check if the size matches, and bails out with listing the sizes the IOMMU supports. Example on Aarch64: $ qemu-system-aarch64 -M virt -drive if=3Dnone,id=3Dnvme0,file=3Dnvme://00= 06:90:00.0/1,format=3Draw qemu-system-aarch64: -drive if=3Dnone,id=3Dnvme0,file=3Dnvme://0006:90:00.= 0/1,format=3Draw: Unsupported IOMMU page size: 4 KiB Available page size: 64 KiB 512 MiB Suggested-by: Alex Williamson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- util/vfio-helpers.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 9a83e6084e5..8f4a3d452ed 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -11,6 +11,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/cutils.h" #include #include #include "qapi/error.h" @@ -316,6 +317,25 @@ static int qemu_vfio_init_pci(QEMUVFIOState *s, const = char *device, ret =3D -errno; goto fail; } + if (!(iommu_info.flags & VFIO_IOMMU_INFO_PGSIZES)) { + error_setg(errp, "Failed to get IOMMU page size info"); + ret =3D -errno; + goto fail; + } + if (!extract64(iommu_info.iova_pgsizes, + ctz64(qemu_real_host_page_size), 1)) { + g_autofree char *host_page_size =3D size_to_str(qemu_real_host_pag= e_size); + error_setg(errp, "Unsupported IOMMU page size: %s", host_page_size= ); + error_append_hint(errp, "Available page size:\n"); + for (int i =3D 0; i < 64; i++) { + if (extract64(iommu_info.iova_pgsizes, i, 1)) { + g_autofree char *iova_pgsizes =3D size_to_str(1UL << i); + error_append_hint(errp, " %s\n", iova_pgsizes); + } + } + ret =3D -EINVAL; + goto fail; + } =20 s->device =3D ioctl(s->group, VFIO_GROUP_GET_DEVICE_FD, device); =20 --=20 2.26.2 From nobody Mon Feb 9 01:22:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597853485; cv=none; d=zohomail.com; s=zohoarc; b=dtqLj7159NLi/a59HtMar0HoDMu44RFNggSwvC1K+4qkjxWgMBXITNnFlNfranIka15gRNqqfzllCxOLdqIQMxyuO3XMdhM3K7c/Q2b1mdPVvkyC3achIOYVk8uFzmp1lSuSaCYHuLjdUpVbXJlSW8cjUV3OcVoC4BgvqWTCWJg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597853485; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iAIS2oTaw8KHQnBQMzKd61Xt0Ca1CzJQZMv3ZWJBLc0=; b=mhxPqhNVZC5DYei8uoAo4rwb4KIVL7v2XJn5mwvWRZ0frYfXsAZeGbBzobexaT8iVM7iiwvNL+Z2Ji8UUti297VcAcPgx64+Ss44Gz7NDg5PhCCIVOcJvyzulLjqn92+VIHdxy2NVszKuhmp8lv+bG9LDnwbYzdZ0n57Lse2K+k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597853485852638.8601055799696; Wed, 19 Aug 2020 09:11:25 -0700 (PDT) Received: from localhost ([::1]:55934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8QgO-0003ey-Jl for importer@patchew.org; Wed, 19 Aug 2020 12:11:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8QZ6-0003jI-5k for qemu-devel@nongnu.org; Wed, 19 Aug 2020 12:03:52 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:39579 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k8QZ4-0005sU-As for qemu-devel@nongnu.org; Wed, 19 Aug 2020 12:03:51 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-297-9wIy-FxiP1qi5cpWxJYUEQ-1; Wed, 19 Aug 2020 12:03:43 -0400 Received: by mail-wm1-f70.google.com with SMTP id k204so1197646wmb.3 for ; Wed, 19 Aug 2020 09:03:43 -0700 (PDT) Received: from x1w.redhat.com (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id 126sm6646552wme.42.2020.08.19.09.03.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2020 09:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597853026; 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=iAIS2oTaw8KHQnBQMzKd61Xt0Ca1CzJQZMv3ZWJBLc0=; b=N65h0nKgVPNpgayFmfGCTR5fzVmfl1+L0cg/lTtx42R+j6jnzxtk0h1yA5LQ2WwwVOOF4Z /bnEuyAT4yem9PXKpsb6LM2ZLNXqSslUnEQOwWSqAh2K0DDyRgUaEOCE5pTclifsRgbMTZ F5axHTZMxBbB6XHGOd+4iR0EMPrYnh8= X-MC-Unique: 9wIy-FxiP1qi5cpWxJYUEQ-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=iAIS2oTaw8KHQnBQMzKd61Xt0Ca1CzJQZMv3ZWJBLc0=; b=JT+3v8kwoprIHPtp3oEd1CsdULYTLCwJQhMxaa6gt43ysG1e0PrdDbOy2cRvwrgDfY HsJoR0zJO6lrBkgEXUl07ltJbTvp/Tbq+4L//+UkjZWpQwMW8c6tMk9lnqY1Vl0UO3W7 /DyGbCOcjoZfP5C1w1Drf03Kt1wPuTHGUzj0xVO/mkXUt9a0BIOoloUPTUJ1smZBCc+Y t5c4pTGmT/C2cDAcv7q1t3InMwl02KRHsxEqMrWbS7EcRksOR6xHS3a7/w4b8eLdwMqU ouxkSgPQWa4VcKCmKDVhBXYxNE7e5ZcdBoj4fnS1TAEARRtIjMH/+SXcxUgvRDAKrBfY LDuw== X-Gm-Message-State: AOAM531qZiAW2Yq7YOUlMzMh404JZeqNV8ejEvYUfwKtGgCC+Gqu7dh3 5+5gzk90Kumc5UZyK1oTAAOF1+qolcxhNbNgpGXBQH/UbgfLIlX3f1A0uis8BxCAykOuQorHmgk w0KylRtpsc8W/wzY= X-Received: by 2002:adf:dfc7:: with SMTP id q7mr25569728wrn.80.1597853022146; Wed, 19 Aug 2020 09:03:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhy9t8bEtMPSS1J76XXdWjgSuWKev5bmIvy7wNcRq4eJjDML5X945784FWXO+Sa9JT1jWhQg== X-Received: by 2002:adf:dfc7:: with SMTP id q7mr25569713wrn.80.1597853021965; Wed, 19 Aug 2020 09:03:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v4 4/5] util/vfio-helpers: Introduce qemu_vfio_pci_init_msix_irqs() Date: Wed, 19 Aug 2020 18:03:17 +0200 Message-Id: <20200819160318.835292-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200819160318.835292-1-philmd@redhat.com> References: <20200819160318.835292-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.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/19 01:46:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Max Reitz , Alex Williamson , Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) qemu_vfio_pci_init_irq() allows us to initialize any type of IRQ, but only one. Introduce qemu_vfio_pci_init_msix_irqs() which is specific to MSIX IRQ type, and allow us to use multiple IRQs (thus passing multiple eventfd notifiers). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/vfio-helpers.h | 2 ++ util/vfio-helpers.c | 57 +++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/include/qemu/vfio-helpers.h b/include/qemu/vfio-helpers.h index 1f057c2b9e4..8e6bd83ea41 100644 --- a/include/qemu/vfio-helpers.h +++ b/include/qemu/vfio-helpers.h @@ -28,5 +28,7 @@ void qemu_vfio_pci_unmap_bar(QEMUVFIOState *s, int index,= void *bar, uint64_t offset, uint64_t size); int qemu_vfio_pci_init_irq(QEMUVFIOState *s, EventNotifier *e, int irq_type, Error **errp); +int qemu_vfio_pci_init_msix_irqs(QEMUVFIOState *s, EventNotifier *e, + unsigned *irq_count, Error **errp); =20 #endif diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 8f4a3d452ed..6f833972587 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -216,6 +216,63 @@ int qemu_vfio_pci_init_irq(QEMUVFIOState *s, EventNoti= fier *e, return 0; } =20 +/** + * Initialize device MSIX IRQs and register event notifiers. + * @irq_count: pointer to number of MSIX IRQs to initialize + * @notifier: Array of @irq_count notifiers (each corresponding to a MSIX = IRQ) + + * If the number of IRQs requested exceeds the available on the device, + * store the number of available IRQs in @irq_count and return -EOVERFLOW. + */ +int qemu_vfio_pci_init_msix_irqs(QEMUVFIOState *s, EventNotifier *notifier, + unsigned *irq_count, Error **errp) +{ + int r; + size_t irq_set_size; + struct vfio_irq_set *irq_set; + struct vfio_irq_info irq_info =3D { + .argsz =3D sizeof(irq_info), + .index =3D VFIO_PCI_MSIX_IRQ_INDEX + }; + + if (ioctl(s->device, VFIO_DEVICE_GET_IRQ_INFO, &irq_info)) { + error_setg_errno(errp, errno, "Failed to get device interrupt info= "); + return -errno; + } + if (irq_info.count < *irq_count) { + error_setg(errp, "Not enough device interrupts available"); + *irq_count =3D irq_info.count; + return -EOVERFLOW; + } + if (!(irq_info.flags & VFIO_IRQ_INFO_EVENTFD)) { + error_setg(errp, "Device interrupt doesn't support eventfd"); + return -EINVAL; + } + + irq_set_size =3D sizeof(*irq_set) + *irq_count * sizeof(int32_t); + irq_set =3D g_malloc0(irq_set_size); + + /* Get to a known IRQ state */ + *irq_set =3D (struct vfio_irq_set) { + .argsz =3D irq_set_size, + .flags =3D VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER, + .index =3D irq_info.index, + .start =3D 0, + .count =3D *irq_count, + }; + + for (unsigned i =3D 0; i < *irq_count; i++) { + ((int32_t *)&irq_set->data)[i] =3D event_notifier_get_fd(¬ifier= [i]); + } + r =3D ioctl(s->device, VFIO_DEVICE_SET_IRQS, irq_set); + g_free(irq_set); + if (r) { + error_setg_errno(errp, errno, "Failed to setup device interrupts"); + return -errno; + } + return 0; +} + static int qemu_vfio_pci_read_config(QEMUVFIOState *s, void *buf, int size, int ofs) { --=20 2.26.2 From nobody Mon Feb 9 01:22:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597853396; cv=none; d=zohomail.com; s=zohoarc; b=WjzhrQlgPS2BQOvJ6Ri/DWr1SLKu6RfzCjKH9RtU/OV1kbUAY/YXzPPPA9uh0q5OQ84FY21/s0Qev1by7js8op4fl5r9SNmI8Cbt0lTo4yUhC7y4EWPvZoRYszT8uRiQKVasr8IgVgficB8W973ca8AXM2TQhrBifX6EZ9Yva/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597853396; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XMq/IR7jWnYFLcjiv5ZIbAiXOU9p9ozhKfQJrVCkul8=; b=l0OIAY00fZq4IuIRf7cv2PjPeB0rJrDIxDxdae8wCyp/Tgy4u6Uo59atiePviWQNu3a8DPGRRJFQ0gw4Tk/tVO1HDqWMptBPNyJMb4XZM+vYEClMKu8ZwWjrHuVQb2kmFs41pfdGh5C/tB2EUXeTxUwCMKXFzESKblagr8FxihQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597853396533210.7089647862142; Wed, 19 Aug 2020 09:09:56 -0700 (PDT) Received: from localhost ([::1]:52436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8Qex-0001fT-6s for importer@patchew.org; Wed, 19 Aug 2020 12:09:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8QZ7-0003mG-HX for qemu-devel@nongnu.org; Wed, 19 Aug 2020 12:03:53 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:44460 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k8QZ5-0005si-FB for qemu-devel@nongnu.org; Wed, 19 Aug 2020 12:03:53 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-426-nqhFs9q6O4GBrbs1vMpfUw-1; Wed, 19 Aug 2020 12:03:48 -0400 Received: by mail-wm1-f71.google.com with SMTP id z1so1084773wmf.9 for ; Wed, 19 Aug 2020 09:03:48 -0700 (PDT) Received: from x1w.redhat.com (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id k10sm42030644wrm.74.2020.08.19.09.03.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2020 09:03:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597853030; 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=XMq/IR7jWnYFLcjiv5ZIbAiXOU9p9ozhKfQJrVCkul8=; b=UoO8K+rwtZkezH+viUzeLAC7FltDG+hsSyfMWKIYYpXU3ooAL4v1yHQGdEro10qhcYjzoK PP0bWeGkti5KPORmyDX7s+JMoywZ6mJ4Fv13bc+4apQDGrIg8mJHad8oRBYL9d/76yV4x4 OPvov6FVKvuKFRuoatinfGJu8slxAvI= X-MC-Unique: nqhFs9q6O4GBrbs1vMpfUw-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=XMq/IR7jWnYFLcjiv5ZIbAiXOU9p9ozhKfQJrVCkul8=; b=Y5woqpAPAhGQhkK0J5jzxxr44fTMUl9W0MSPOoPiB1tKGpmjp6+fdnJBl1mUmImRyN /l+uOVWa3zarmjka4PjFT80fu1qE5iD2+vcS0XtKmoQ73Q55R7Kd3bfQolmDev9t6NsN 3ojkt4gU4nowjG7Wa20IuclCc7UpPORxTA1Ouud96CR3xihzv4mI+ZWzNDQXBsZBF3IU 5wlUiokNgECUlAA2YZK8IetldQsCCy/XuDtSvFIVL0d4M+0xaVLu1MajAdnhujh+h7GG 6QF+OUjy4f2lRxWcVzqqUN4PBnxlETN5QmQBqsv5GqqQpEXVTI/Uj/YpKNLaObhxvwhX fU0g== X-Gm-Message-State: AOAM532OSTKIwIb61ksPMwKLv+tk5q/IQerkz5Kac9VOdxKVI3Q1JDf7 pZsJcA2eZT/mhpAAMDRy/6Fra37l/45U+5Vc3I8R2eAoESPNk88bFzrMIMUQ4lwXcpJbZgdH29Y lwzJ/PNB53L+t/rI= X-Received: by 2002:adf:ce89:: with SMTP id r9mr27416799wrn.116.1597853027307; Wed, 19 Aug 2020 09:03:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw5d9WBPzgvJcaTjW0wutP9XrT/+KrpHr3fKA2d3s0x0o2pVbBqzh3pv+vnxDmp++G8v3ZIrQ== X-Received: by 2002:adf:ce89:: with SMTP id r9mr27416771wrn.116.1597853026994; Wed, 19 Aug 2020 09:03:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v4 5/5] block/nvme: Use qemu_vfio_pci_init_msix_irqs() to initialize our IRQ Date: Wed, 19 Aug 2020 18:03:18 +0200 Message-Id: <20200819160318.835292-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200819160318.835292-1-philmd@redhat.com> References: <20200819160318.835292-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.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/19 04:57:22 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Max Reitz , Alex Williamson , Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Instead of initializing one MSIX IRQ with the generic qemu_vfio_pci_init_irq() function, use the MSIX specific one which ill allow us to use multiple IRQs. For now we provide an array of a single IRQ. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/nvme.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/block/nvme.c b/block/nvme.c index fe8a40b7ede..cafa2cb3f95 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -707,6 +707,7 @@ static int nvme_init(BlockDriverState *bs, const char *= device, int namespace, uint64_t timeout_ms; uint64_t deadline, now; Error *local_err =3D NULL; + unsigned irq_count =3D MSIX_IRQ_COUNT; =20 qemu_co_mutex_init(&s->dma_map_lock); qemu_co_queue_init(&s->dma_flush_queue); @@ -792,9 +793,13 @@ 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_init_msix_irqs(s->vfio, s->irq_notifier, + &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; } aio_set_event_notifier(bdrv_get_aio_context(bs), --=20 2.26.2