From nobody Fri May 17 02:41:24 2024 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=1604369267; cv=none; d=zohomail.com; s=zohoarc; b=ZGcdaCe1foBm11qov7PLfsd9sEfAz2Cja6mj+4B5Btj3rROdNzLaG5aXwH9zBAxRK+iVkc93YMZ5GYnUT91ZcloMaeSgQmKnXw3hzXLiTwChxJEOicOdSxFXFhZdYCEflyfRsC1VwjVdmMulfNk9ThfXC0+WwaX1mWRsgcxvNo4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604369267; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=v40hj3qY78whRoPdfOU/jnlm9Vu0+VmOWNSL1HaIBaY=; b=WjoDWf2xc2VCANTn0eb0Myctfm6L7ZA6XTnWHYcNZsReEjG/rTVizS1sE0KT1qEEKJg42JW59wzOCw131iGksSr/UxEbcgDj/eUB+4Ke5FP/17cWBaClg6HIyNsc2cnLkXzN9bs/Le5/pkNqPOBdtQ/7MDwKG4Ja3lN7zYZdaMA= 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 1604369267038156.64246694204564; Mon, 2 Nov 2020 18:07:47 -0800 (PST) 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-382-kaedjfTgPqyc8zRfWH83Hg-1; Mon, 02 Nov 2020 21:07:43 -0500 Received: by mail-wr1-f72.google.com with SMTP id t14so7250856wrs.2 for ; Mon, 02 Nov 2020 18:07:43 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id n4sm1270710wmi.32.2020.11.02.18.07.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 18:07:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604369265; 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=v40hj3qY78whRoPdfOU/jnlm9Vu0+VmOWNSL1HaIBaY=; b=DoqOLsmGtEb6DzCfMBFsL6mjm8Iz/eMad8yit2l7Ettpdo5mci4wa+Pdr9u2XcT+wJ+jfx OfQGjgXSjN2UGT4VLShLC0JndEB2is03hjFEatEEOpxLB8a+B9xpz5zFtadtJKtrUD14GG 6NuOKg6oht2jYfynb7NXIJUziiBzDww= X-MC-Unique: kaedjfTgPqyc8zRfWH83Hg-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=v40hj3qY78whRoPdfOU/jnlm9Vu0+VmOWNSL1HaIBaY=; b=prnTCY0AMyKBXruIpq+EOjNa+Usv44mWXRc+LMZPMD8aDDibwHdzfqO9ZcgQEDl4ok uM1f+0Mj095ARDxZhUlpyGAKD9LJMmo9SVpy+XLOEcCyWSt2qoPgORm2MWRQjOvH85j1 GNe8cr8OYrUW3eizUCVkNp2vTiB8+YEVfndHCAIyla9Lk08pj9F0oNvnJIQRbIqStrkS Ue8CkxStN6T9RBthvpqox5KQg5PkK49oESMfWctjSl9V6VJ++7mwOAlCJ9ouXhJ6uerJ nDovERmqFR6LRIQVbWznYci0txoD3V4uZc2iA5jQQhm1LBW9QGfPZdmUiN79VHj/OugZ uAmA== X-Gm-Message-State: AOAM532D55JxkwqXfzaYBgpYETIZwMdf0nZMQ+BOqb8ACrpMv4UJwiyt wfTGfPMZXB45vLxWQ/Gucw2/uOyUWP0LTyigRVFlFIHUU4sEnk0kTeTUZBjZuriVAqJ2aUCIMOa qu5gC3WAArFIvGQ== X-Received: by 2002:a1c:20d0:: with SMTP id g199mr1017673wmg.68.1604369262033; Mon, 02 Nov 2020 18:07:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJz450qaEXBid9Vp8M8JguvttfT2sSjp/RpJ8d68k3Znh00PpBSFmmEbKwWxsNsWH3KJKRcZJA== X-Received: by 2002:a1c:20d0:: with SMTP id g199mr1017655wmg.68.1604369261850; Mon, 02 Nov 2020 18:07:41 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Stefan Hajnoczi , Kevin Wolf , Eric Auger , Max Reitz , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alex Williamson Subject: [PATCH-for-5.2 v3 1/7] util/vfio-helpers: Improve reporting unsupported IOMMU type Date: Tue, 3 Nov 2020 03:07:27 +0100 Message-Id: <20201103020733.2303148-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103020733.2303148-1-philmd@redhat.com> References: <20201103020733.2303148-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) 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 Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Eric Auger --- 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 c469beb0616..14a549510fe 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -300,7 +300,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 Fri May 17 02:41:24 2024 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=1604369271; cv=none; d=zohomail.com; s=zohoarc; b=awc5K2+58xvUN0F3cTpq6YIFmfKFvtMmQju4KOoD7YMArsVAeawvdsYz1jihnN0cds67VeLG/Pv0M3rOfWaVoswh8lQ8rNV5gsEXxoTX4ClSbgllB/XyVOm1XyOQ6BMYshM+i6XAUHDAsbwBwb3jiDpiR8pqqfDxA851qn2w21Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604369271; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=MLkkDB5g34q2sdknoBBkQrWHPPoNrf02h2DP6CTPnmU=; b=NukpabYgRfJ0gUDQRzOSoRqKDlX2X0CNZ+SeoUhu9JY5/Qck+Ziw5bCr2jidT1odwMysDjyvGgbHkmxcmnSN5M8/bQjsTqdfZR6Whx2nvyu1Knefy5yk7QqqM6CyJcOZnHTWnp3sQkBbUJgKh9dTJzNJIJAZO7WEQaVL1sjj4BE= 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 1604369271796246.07098994024716; Mon, 2 Nov 2020 18:07:51 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-514-th6PxAiWPqKZ3H5ZzG1Sxg-1; Mon, 02 Nov 2020 21:07:49 -0500 Received: by mail-wr1-f70.google.com with SMTP id 31so7185930wrg.12 for ; Mon, 02 Nov 2020 18:07:48 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id x21sm1551217wmi.3.2020.11.02.18.07.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 18:07:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604369270; 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=MLkkDB5g34q2sdknoBBkQrWHPPoNrf02h2DP6CTPnmU=; b=c1upiHNKO9Y362AzNtLbOvKdL0+3sFfyV7lJ9O4oioj01cfR8obFmmskq/2p0cAOQ71SVd W2GGHXr2AuyvMoJx2O69k+nNX6lA19OuDT0fIeios7w2375oPFalw70KhiFx3QQKQ2aSyf 9k+ZIAS3G2sYrX0RWg7JdpkalhkmAeU= X-MC-Unique: th6PxAiWPqKZ3H5ZzG1Sxg-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=MLkkDB5g34q2sdknoBBkQrWHPPoNrf02h2DP6CTPnmU=; b=ZJyTSgXQwhcU2N4dpJQ4VcQz2jrPqG3FdTJ3lpm7nYp/Ioq0UM2pRSHQWkhStUTd6T EeP8fgByawKhQd6neJhTA2/61ovXOe46ISdpsXMx1OcLJFXgJ/2HGdm098BE0RoOCeZK +vRzpVUvTjYFaPKUw4FOprSVRFrqQOjnfzYAQEqBzKP3Fr6cLcDjxb+MH91WrNrIVCqy hz4tUT0fVI/7vxSaoMPQIkLPHBscBorfqhs2i0y6BNkW5FX7S7tbJ7Dtwd1qEQkhmH4u IOMYjFk9y6kaduUWmKyAqujdmDr+D4IjHsj9c15O5RriJRcmrIzDyR+y4Cy2VltC9e2h APZw== X-Gm-Message-State: AOAM530wCZhshoAlr5UUTi8+v3aPmC+39G5W+P0nkcI/6tFRpLlIzqMZ TO3jLLTXSHy3vkqZ2Jl+wKg80jcyoidqMDxxxYCAcaz25VUjV+CfAubLxGLctm365a2Z8MJbSde aypeX9S6VsYF2dA== X-Received: by 2002:a1c:3b87:: with SMTP id i129mr985269wma.134.1604369267781; Mon, 02 Nov 2020 18:07:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJxL9WAmq+sWghRddGGS1Ke1/vUvlOf9zvZqrzfrJssBSClaHI3vsFJdCkNmgkd6T7YMJlGUJQ== X-Received: by 2002:a1c:3b87:: with SMTP id i129mr985263wma.134.1604369267628; Mon, 02 Nov 2020 18:07:47 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Stefan Hajnoczi , Kevin Wolf , Eric Auger , Max Reitz , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 v3 2/7] util/vfio-helpers: Trace PCI I/O config accesses Date: Tue, 3 Nov 2020 03:07:28 +0100 Message-Id: <20201103020733.2303148-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103020733.2303148-1-philmd@redhat.com> References: <20201103020733.2303148-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) We sometime get kernel panic with some devices on Aarch64 hosts. Alex Williamson suggests it might be broken PCIe root complex. Add trace event to record the latest I/O access before crashing. In case, assert our accesses are aligned. Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Eric Auger --- util/vfio-helpers.c | 8 ++++++++ util/trace-events | 2 ++ 2 files changed, 10 insertions(+) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 14a549510fe..1d4efafcaa4 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -227,6 +227,10 @@ static int qemu_vfio_pci_read_config(QEMUVFIOState *s,= void *buf, { int ret; =20 + trace_qemu_vfio_pci_read_config(buf, ofs, size, + s->config_region_info.offset, + s->config_region_info.size); + assert(QEMU_IS_ALIGNED(s->config_region_info.offset + ofs, size)); do { ret =3D pread(s->device, buf, size, s->config_region_info.offset += ofs); } while (ret =3D=3D -1 && errno =3D=3D EINTR); @@ -237,6 +241,10 @@ static int qemu_vfio_pci_write_config(QEMUVFIOState *s= , void *buf, int size, int { int ret; =20 + trace_qemu_vfio_pci_write_config(buf, ofs, size, + s->config_region_info.offset, + s->config_region_info.size); + assert(QEMU_IS_ALIGNED(s->config_region_info.offset + ofs, size)); do { ret =3D pwrite(s->device, buf, size, s->config_region_info.offset = + ofs); } while (ret =3D=3D -1 && errno =3D=3D EINTR); diff --git a/util/trace-events b/util/trace-events index 24c31803b01..8d3615e717b 100644 --- a/util/trace-events +++ b/util/trace-events @@ -85,3 +85,5 @@ qemu_vfio_new_mapping(void *s, void *host, size_t size, i= nt index, uint64_t iova qemu_vfio_do_mapping(void *s, void *host, size_t size, uint64_t iova) "s %= p host %p size 0x%zx iova 0x%"PRIx64 qemu_vfio_dma_map(void *s, void *host, size_t size, bool temporary, uint64= _t *iova) "s %p host %p size 0x%zx temporary %d iova %p" qemu_vfio_dma_unmap(void *s, void *host) "s %p host %p" +qemu_vfio_pci_read_config(void *buf, int ofs, int size, uint64_t region_of= s, uint64_t region_size) "read cfg ptr %p ofs 0x%x size 0x%x (region addr 0= x%"PRIx64" size 0x%"PRIx64")" +qemu_vfio_pci_write_config(void *buf, int ofs, int size, uint64_t region_o= fs, uint64_t region_size) "write cfg ptr %p ofs 0x%x size 0x%x (region addr= 0x%"PRIx64" size 0x%"PRIx64")" --=20 2.26.2 From nobody Fri May 17 02:41:24 2024 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=1604369277; cv=none; d=zohomail.com; s=zohoarc; b=NJRvKHbTrbjaRxQ2D6POB26B/VWH+0kHSOeA7SKhy9gMBEDgGwrebZqtjeTqjc3A/CkWktdVrRY+Tfz7bSBUbpD0i7TJZFRuarvgdTVUgpf5ahkeVaje3qyXxG1B90bU0RL1Sv/lbboyEJg6IL2Ma1eR0RSnw1Gu2ATDGaMNpSg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604369277; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=GnhEUSVbX2k40m2RlE9VVXSMEC+QBtiNwMvHdvHW/EI=; b=cBpf4z61AWu08zVYVY6HT/UpjckxtaB3DD4uHs5G4PjFBnPs0pzpBeFU1o8HB6B0hO7h3z8qz0uQoqMOJKBYt0kCiVm6B5ssl7TVRg3V9MXxiGaPb/zAX674ds12jzGA8RgeTd0vfRM4JqODRIIVlb7dFQ2Ht9eNqyZr7DfByPk= 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 1604369277170344.3628121652989; Mon, 2 Nov 2020 18:07:57 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-590-A7AErK-sNnqKvbX8nioWgQ-1; Mon, 02 Nov 2020 21:07:54 -0500 Received: by mail-wm1-f72.google.com with SMTP id s85so2354537wme.3 for ; Mon, 02 Nov 2020 18:07:54 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id p1sm23200762wrx.3.2020.11.02.18.07.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 18:07:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604369276; 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=GnhEUSVbX2k40m2RlE9VVXSMEC+QBtiNwMvHdvHW/EI=; b=fanpEez2hQyalBLWTH0e/EQAXtaaG0PT5e3o1nxlHI3/a8jgjfnAbupL2tWaJz1iQK6BBr 9cW7jrbUfygjhEmZNl9Ha8F1NOg+uP7vMFxxks6Ez8YMER8hZ+DRyS7YdK7UGFCQxKn+mG Hs51FilfprkM9oT+YUDASoWhNbRBFy0= X-MC-Unique: A7AErK-sNnqKvbX8nioWgQ-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=GnhEUSVbX2k40m2RlE9VVXSMEC+QBtiNwMvHdvHW/EI=; b=eiLpuRnJo93MDT0sG64EtwitPhm4OysN/KNaRRomn9urp/6zVCtl1/EiPGWhGY5NhR XJOsdE/0gKqGk7ZLiuf39slLzIGUhJqJ3KHLQeSquNcudd3+IKyAq01hcfaAY/mqyJpK 7MoDKrJv3MbVZzZuKIZHSSR+rsVnBcM18gMj0XJKItwK9iQqghnwc9ZxSRNKQIoYlqhH 069CdSAv7taoYyZF/roQxZ9nM5KU0H3JztqHIv1YuHtNxGg/UYn9iCk3us0qweuD/ZDW xVg1OsbHXl+EEsl7Hf03aodsoeLjcERn2E224oiN3T8Wz/A4PnDJv/wBa73y8K0p1O1p fLLg== X-Gm-Message-State: AOAM5332lxtU/3UinC4Ao8A1TaFpggLuNY/F7Cc3e5uil1e74l2A3/2n aot4GP9MkOjJn9qrmb/ntDFPll+HdFsuIJK+xic/zXtu9JXPpYkP7IoY5nw2IMs+toWuaG7x3v5 HQAI0ZF/rvI5gOg== X-Received: by 2002:adf:e70f:: with SMTP id c15mr23777643wrm.239.1604369273151; Mon, 02 Nov 2020 18:07:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJyHud+c98W7/OBo91l52MA1SFTpH+x9U3SiXjg4wj31Fd7tW+bfKPeaW4IYUh+VnM2bbpK/pg== X-Received: by 2002:adf:e70f:: with SMTP id c15mr23777628wrm.239.1604369273018; Mon, 02 Nov 2020 18:07:53 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Stefan Hajnoczi , Kevin Wolf , Eric Auger , Max Reitz , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 v3 3/7] util/vfio-helpers: Trace PCI BAR region info Date: Tue, 3 Nov 2020 03:07:29 +0100 Message-Id: <20201103020733.2303148-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103020733.2303148-1-philmd@redhat.com> References: <20201103020733.2303148-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) For debug purpose, trace BAR regions info. Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Eric Auger --- util/vfio-helpers.c | 8 ++++++++ util/trace-events | 1 + 2 files changed, 9 insertions(+) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 1d4efafcaa4..cd6287c3a98 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -136,6 +136,7 @@ static inline void assert_bar_index_valid(QEMUVFIOState= *s, int index) =20 static int qemu_vfio_pci_init_bar(QEMUVFIOState *s, int index, Error **err= p) { + g_autofree char *barname =3D NULL; assert_bar_index_valid(s, index); s->bar_region_info[index] =3D (struct vfio_region_info) { .index =3D VFIO_PCI_BAR0_REGION_INDEX + index, @@ -145,6 +146,10 @@ static int qemu_vfio_pci_init_bar(QEMUVFIOState *s, in= t index, Error **errp) error_setg_errno(errp, errno, "Failed to get BAR region info"); return -errno; } + barname =3D g_strdup_printf("bar[%d]", index); + trace_qemu_vfio_region_info(barname, s->bar_region_info[index].offset, + s->bar_region_info[index].size, + s->bar_region_info[index].cap_offset); =20 return 0; } @@ -416,6 +421,9 @@ static int qemu_vfio_init_pci(QEMUVFIOState *s, const c= har *device, ret =3D -errno; goto fail; } + trace_qemu_vfio_region_info("config", s->config_region_info.offset, + s->config_region_info.size, + s->config_region_info.cap_offset); =20 for (i =3D 0; i < ARRAY_SIZE(s->bar_region_info); i++) { ret =3D qemu_vfio_pci_init_bar(s, i, errp); diff --git a/util/trace-events b/util/trace-events index 8d3615e717b..0753e4a0ed1 100644 --- a/util/trace-events +++ b/util/trace-events @@ -87,3 +87,4 @@ qemu_vfio_dma_map(void *s, void *host, size_t size, bool = temporary, uint64_t *io qemu_vfio_dma_unmap(void *s, void *host) "s %p host %p" qemu_vfio_pci_read_config(void *buf, int ofs, int size, uint64_t region_of= s, uint64_t region_size) "read cfg ptr %p ofs 0x%x size 0x%x (region addr 0= x%"PRIx64" size 0x%"PRIx64")" qemu_vfio_pci_write_config(void *buf, int ofs, int size, uint64_t region_o= fs, uint64_t region_size) "write cfg ptr %p ofs 0x%x size 0x%x (region addr= 0x%"PRIx64" size 0x%"PRIx64")" +qemu_vfio_region_info(const char *desc, uint64_t region_ofs, uint64_t regi= on_size, uint32_t cap_offset) "region '%s' addr 0x%"PRIx64" size 0x%"PRIx64= " cap_ofs 0x%"PRIx32 --=20 2.26.2 From nobody Fri May 17 02:41:24 2024 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=1604369282; cv=none; d=zohomail.com; s=zohoarc; b=ENUYgo8DEJLdwD+uGi/sijjOgCzfpTcP6cW9+jkoduZTvKLpl1XzuUWXJ0cIBXQRedJgpS7EHhSmb2mih5wqIQSwZRRc6y/5pANx7bC8WBhfwYgCURjmYbthZH/0Kw9MAwMGnhT+QKOLDsGaUogtDn4TUHyktyRnOoRRVwZupZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604369282; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=rxz0K8Rx7B0HHvdzSABsXnGF+kDXzjJU6AYfb2kJrPg=; b=CGBRgBpwse+kpqydocptxDQla684BceRqRG+PWwL5tzFG+CYjNidSVMIWwteH57z6JzPLUMtrXtg/neC/UT/uWx+yq1FGyftc1n2UVl7Aosdu50It2wMd+ZH6UHW/YJ9l39ttiVuae3JSZHPgViy3HfEvzvo0H++pvgXZx5Yqvc= 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 1604369282932402.8091779160627; Mon, 2 Nov 2020 18:08:02 -0800 (PST) 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-388-p4ktfX5hOJqAcQHMpMKnSw-1; Mon, 02 Nov 2020 21:07:59 -0500 Received: by mail-wm1-f70.google.com with SMTP id y187so1274656wmy.3 for ; Mon, 02 Nov 2020 18:07:59 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id y187sm1213180wmg.33.2020.11.02.18.07.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 18:07:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604369281; 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=rxz0K8Rx7B0HHvdzSABsXnGF+kDXzjJU6AYfb2kJrPg=; b=PCOiKRe2hBD8U0Iz6BvFbAQ0Uv/lqpQqSJbzys0qNwDnTnfKzogwY1hhmgUszuOvtyN3rj CieYCDNdTL79WbTPmhrJFBLu1kmRuNkcNwgNI78LCn69qofnqy8N7MpHD7aOcgJaCo7g74 HKKQ4TNG/Odkv7ylJw1AbIpf/23y550= X-MC-Unique: p4ktfX5hOJqAcQHMpMKnSw-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=rxz0K8Rx7B0HHvdzSABsXnGF+kDXzjJU6AYfb2kJrPg=; b=QCrY80uBrQXcyNNYPkfGyW2c339L4v5fJdI9sD+fN4HALyjtOcFNVnn6s6BKT+YnHG zh4J+ZPUUI8emACAykHtLB1ClK/nSsFJgHVrdjwizLGnb6U89MZrjHaBTghaEPe/1Oxm rPmWkp74FRjwuTX8V282QUPOu2y+gEQkaXQGkh1RfzYc3Xhohv+K+C8mE/kj3DOkGacR pXj4kf6Z9OawG6tHu2rneM/+lhq3FTdyu5J57whu96RJTAesZBAiTS6Gl7B5xmAzVTIz /8V84dVolSY3DwcpR/TrfAC6TWZqHBX4s/49xvUSo3lq+eYc4Bt7a6+jU0kbI+fF9eWU jjyA== X-Gm-Message-State: AOAM532LfblYrG0wgdWWXiK7e1GOprPD0Dg7BZaHjrytlb9qeBxAkX3C nV2h6ry3gKuWE+XcTad3Kz77YUsh/9ubB4bl1SFoQkc1fyGPxCu6wC51BujBLBNh1rZTqoL0bxO LHcwCzlGkS5sIPQ== X-Received: by 2002:adf:ea0b:: with SMTP id q11mr23596518wrm.80.1604369278691; Mon, 02 Nov 2020 18:07:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsX3gsJC8u9RlFrPaiMyavPKnXzu6zJwhqOZNGQt+ckmqKHEkfLkTrjzuOepnazkna1ClCMg== X-Received: by 2002:adf:ea0b:: with SMTP id q11mr23596510wrm.80.1604369278571; Mon, 02 Nov 2020 18:07:58 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Stefan Hajnoczi , Kevin Wolf , Eric Auger , Max Reitz , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 v3 4/7] util/vfio-helpers: Trace where BARs are mapped Date: Tue, 3 Nov 2020 03:07:30 +0100 Message-Id: <20201103020733.2303148-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103020733.2303148-1-philmd@redhat.com> References: <20201103020733.2303148-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) For debugging purpose, trace where a BAR is mapped. Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Eric Auger --- util/vfio-helpers.c | 2 ++ util/trace-events | 1 + 2 files changed, 3 insertions(+) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index cd6287c3a98..278c54902e7 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -166,6 +166,8 @@ void *qemu_vfio_pci_map_bar(QEMUVFIOState *s, int index, p =3D mmap(NULL, MIN(size, s->bar_region_info[index].size - offset), prot, MAP_SHARED, s->device, s->bar_region_info[index].offset + offset); + trace_qemu_vfio_pci_map_bar(index, s->bar_region_info[index].offset , + size, offset, p); if (p =3D=3D MAP_FAILED) { error_setg_errno(errp, errno, "Failed to map BAR region"); p =3D NULL; diff --git a/util/trace-events b/util/trace-events index 0753e4a0ed1..52d43cda3f3 100644 --- a/util/trace-events +++ b/util/trace-events @@ -88,3 +88,4 @@ qemu_vfio_dma_unmap(void *s, void *host) "s %p host %p" qemu_vfio_pci_read_config(void *buf, int ofs, int size, uint64_t region_of= s, uint64_t region_size) "read cfg ptr %p ofs 0x%x size 0x%x (region addr 0= x%"PRIx64" size 0x%"PRIx64")" qemu_vfio_pci_write_config(void *buf, int ofs, int size, uint64_t region_o= fs, uint64_t region_size) "write cfg ptr %p ofs 0x%x size 0x%x (region addr= 0x%"PRIx64" size 0x%"PRIx64")" qemu_vfio_region_info(const char *desc, uint64_t region_ofs, uint64_t regi= on_size, uint32_t cap_offset) "region '%s' addr 0x%"PRIx64" size 0x%"PRIx64= " cap_ofs 0x%"PRIx32 +qemu_vfio_pci_map_bar(int index, uint64_t region_ofs, uint64_t region_size= , int ofs, void *host) "map region bar#%d addr 0x%"PRIx64" size 0x%"PRIx64"= ofs 0x%x host %p" --=20 2.26.2 From nobody Fri May 17 02:41:24 2024 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=1604369288; cv=none; d=zohomail.com; s=zohoarc; b=By9gA/i2Tpt/B7jj6+nytcba+Z9Lu+JuUNRJUTiPiFqiHTv9QYo0WBEz0iCn2ymt9gF4BKMg+HsdBhMksBZrIOPqhdyBWPhraG3+Bs8b0LV8lYhEa9yWKKQVARGRc0wHDCSGGhBenZww8sxzfTP6Kv8qWULo76PFWIrB4kbR7Qc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604369288; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=OoEtmrvV7SWgD7QH62cY93Xnq1kvlQkCFqVy10vUni4=; b=ZMCY5UXHCiC58DRn+Uo41OBlIysLg3tFSCpq+1z9CU6xSCYQuHGrvk//u/601aoA2B2wg/DmI+9obdFzs29YVNTROmGsMsbUrrKMWqqKfG+N0Rpdz0hu/i6FFtITQvw7gzzeNpoFaqwQsO88SJ5nvQre7l00aKPu+ctdU1k0qOk= 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 1604369288400669.7634001049275; Mon, 2 Nov 2020 18:08:08 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-74-AlRhpIsSOSy0Af26Nth92w-1; Mon, 02 Nov 2020 21:08:05 -0500 Received: by mail-wr1-f70.google.com with SMTP id j15so7208889wrd.16 for ; Mon, 02 Nov 2020 18:08:05 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id m14sm24224588wro.43.2020.11.02.18.08.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 18:08:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604369287; 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=OoEtmrvV7SWgD7QH62cY93Xnq1kvlQkCFqVy10vUni4=; b=IonP4XRm1aj8hEofNTYh7PTMnSEgVrKb5s0ThsLg0wACLE0xvb1GOWReHx5jSQOxM8gLtg 3aN0shrD6EwYseIFTuwi9slKaPXGyn5mcJi1/foqcZRJcp6RgusS2lrvqe7mo0ub1yWYYX /MGK0DUmx3jL0dyr6o1Mwi2XogmL9U0= X-MC-Unique: AlRhpIsSOSy0Af26Nth92w-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=OoEtmrvV7SWgD7QH62cY93Xnq1kvlQkCFqVy10vUni4=; b=OlU1/oGHq/KNi47iEjDYUMAQaxmjtppUUhu5sZFrzwsxBODdc7NnLwrSkIQne9XBkL qAAFspDlEOcvgXi/gJqxFF/i/LIUUCgfLVNxEOenlbsB0hN4dMwFA+CN67vW1E6mppTB Lkld+9/lQcmDgOloh/rrCKmWsu8QRO0DNlFa78vNB1iWmBj3ozo6CRVXFuCUDfVynaB6 7Wrh+8+mQB+rM8GPecNh1uVs83U1qG7QNQ/FccMjV5LXbxXPqqKoX0imvh2YapMVfi56 XBQZNZItalDZW8kDkwRCWpN/V5KisObLdK88g92jvgapeitzWiDkfDJE2LXhxPLZLs0q PDzw== X-Gm-Message-State: AOAM531M8NvfC81XdJNpQeREv/ep9Y/l9oN9upX2hOOJ0aHCSZryj15b VwQw38l/DSyfFDeODH8ez1fddeHhMFWcx4MhFCQvKCAA/7V4PY0Xy8oXx3LhVuAhOg/4QlVy41b KZGbvv0mQ4qJBWQ== X-Received: by 2002:adf:8362:: with SMTP id 89mr24024037wrd.280.1604369284570; Mon, 02 Nov 2020 18:08:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJymTpCXejYt2U6jaySc9x0vzhoAjtUSCOqYEmvtMUIPDtts2HO293Y66zTLdis78OgqJvDNTQ== X-Received: by 2002:adf:8362:: with SMTP id 89mr24024020wrd.280.1604369284446; Mon, 02 Nov 2020 18:08:04 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Stefan Hajnoczi , Kevin Wolf , Eric Auger , Max Reitz , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 v3 5/7] util/vfio-helpers: Improve DMA trace events Date: Tue, 3 Nov 2020 03:07:31 +0100 Message-Id: <20201103020733.2303148-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103020733.2303148-1-philmd@redhat.com> References: <20201103020733.2303148-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) For debugging purpose, trace where DMA regions are mapped. Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Eric Auger --- util/vfio-helpers.c | 3 ++- util/trace-events | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 278c54902e7..c24a510df82 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -627,7 +627,7 @@ static int qemu_vfio_do_mapping(QEMUVFIOState *s, void = *host, size_t size, .vaddr =3D (uintptr_t)host, .size =3D size, }; - trace_qemu_vfio_do_mapping(s, host, size, iova); + trace_qemu_vfio_do_mapping(s, host, iova, size); =20 if (ioctl(s->container, VFIO_IOMMU_MAP_DMA, &dma_map)) { error_report("VFIO_MAP_DMA failed: %s", strerror(errno)); @@ -783,6 +783,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, siz= e_t size, } } } + trace_qemu_vfio_dma_mapped(s, host, iova0, size); if (iova) { *iova =3D iova0; } diff --git a/util/trace-events b/util/trace-events index 52d43cda3f3..08239941cb2 100644 --- a/util/trace-events +++ b/util/trace-events @@ -82,8 +82,9 @@ qemu_vfio_ram_block_added(void *s, void *p, size_t size) = "s %p host %p size 0x%z qemu_vfio_ram_block_removed(void *s, void *p, size_t size) "s %p host %p s= ize 0x%zx" qemu_vfio_find_mapping(void *s, void *p) "s %p host %p" qemu_vfio_new_mapping(void *s, void *host, size_t size, int index, uint64_= t iova) "s %p host %p size 0x%zx index %d iova 0x%"PRIx64 -qemu_vfio_do_mapping(void *s, void *host, size_t size, uint64_t iova) "s %= p host %p size 0x%zx iova 0x%"PRIx64 -qemu_vfio_dma_map(void *s, void *host, size_t size, bool temporary, uint64= _t *iova) "s %p host %p size 0x%zx temporary %d iova %p" +qemu_vfio_do_mapping(void *s, void *host, uint64_t iova, size_t size) "s %= p host %p <-> iova 0x%"PRIx64 " size 0x%zx" +qemu_vfio_dma_map(void *s, void *host, size_t size, bool temporary, uint64= _t *iova) "s %p host %p size 0x%zx temporary %d &iova %p" +qemu_vfio_dma_mapped(void *s, void *host, uint64_t iova, size_t size) "s %= p host %p <-> iova 0x%"PRIx64" size 0x%zx" qemu_vfio_dma_unmap(void *s, void *host) "s %p host %p" qemu_vfio_pci_read_config(void *buf, int ofs, int size, uint64_t region_of= s, uint64_t region_size) "read cfg ptr %p ofs 0x%x size 0x%x (region addr 0= x%"PRIx64" size 0x%"PRIx64")" qemu_vfio_pci_write_config(void *buf, int ofs, int size, uint64_t region_o= fs, uint64_t region_size) "write cfg ptr %p ofs 0x%x size 0x%x (region addr= 0x%"PRIx64" size 0x%"PRIx64")" --=20 2.26.2 From nobody Fri May 17 02:41:24 2024 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=1604369294; cv=none; d=zohomail.com; s=zohoarc; b=gvkHQT6yzj7JnETntfnYC555zNg888vbvSQzbvqjnI1M3ELwGn7VnK56i8VXHC4UqXDhqrrvEduTvMt1okesv8n5oRC/Bd/gEYLJewNjZ1+zBP9TnPpT2ke9GXKkj+DFDpQRRyxg8MdHFYWlKTDUp04nge28GTiVeK1er0JGDqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604369294; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=i5DLckUUyoP1dg/42Pfez6Z6RF3ehTTuZJk5kW+hkoI=; b=Q1E7og287sG5OPC51YuXnTJqQcle5oGHligCF9Sza5WQU0Npw9MyvJydlMz7sQJ8K8xBdZZgVyJNtXMiW6LZTxH9UJKIN28pIJkP9fX/myWf35ZrJkW04si93K+NxuH0xgITR93Cto0Wg6ZA1M4v4Kkv0fayI0o4471ADQiwpBE= 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 1604369294629550.0065542987292; Mon, 2 Nov 2020 18:08:14 -0800 (PST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-52-Gi22QPH6MQONfxIxX4rw1A-1; Mon, 02 Nov 2020 21:08:12 -0500 Received: by mail-wr1-f71.google.com with SMTP id 33so7144985wrf.22 for ; Mon, 02 Nov 2020 18:08:11 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id o129sm1283042wmb.25.2020.11.02.18.08.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 18:08:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604369293; 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=i5DLckUUyoP1dg/42Pfez6Z6RF3ehTTuZJk5kW+hkoI=; b=VwKnLGmSgIcCO14VKWnThgInb4s7Ev1Qit8zdRAmWNA/Asw5UGu6BJh45Lz+YDVoSgRzid FO25PMEFof2rvkPMmbfKo9px3gnaPPf6Fre5uq/KOHtYc/csJCtbgNe/G8EM8Hx7hc3DXy S5eqM2s87mJN1tZvwfsfacjsZU6ERUI= X-MC-Unique: Gi22QPH6MQONfxIxX4rw1A-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=i5DLckUUyoP1dg/42Pfez6Z6RF3ehTTuZJk5kW+hkoI=; b=Kt+HUc6hcSgPQ19pgKv/ov6KAwFwReswoO7IzPk97j4ZKLpr5JiWGrNBOifjhvtVJU qTK12+73IezdnFHjjFbOIAgFARv0FhkoTbuLOuar8912mgwsPdmUxZ5J5C4KvUub6dFL RARs7bcS/qKvE7NvaIcUex8t1a5wQWWqGgLmxgVq+kAnrTlcCjdZMZz6U448L8Hk0Uyg WpcQgFaxK486JGOA4WG9QUolYwj/PVWJU2afPm8rCGqOWDR1JUPF59IMFS9C1Y0Sv8Ir YD0X4t7JWlZnz8ZNTOCoNmzGUJ2pFTdUBtmcO0L+miiAAPo/IFkh47i/IbhHd0vPU4dD Djaw== X-Gm-Message-State: AOAM533SfFXAcpEhVvXTVBa+TdL3CxEIKRQq6fNqmfkqTsb6oK7LWnJt VcHegxApeoHYHkYKf9Sv8O1ylBxq5fJyE+nBHXp2FxiKx3M5qct1QqiJdQDRB8l41bQiaIqmpkg IZmOFVQNZEkdkZw== X-Received: by 2002:a1c:2487:: with SMTP id k129mr979327wmk.86.1604369290363; Mon, 02 Nov 2020 18:08:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJyBtmB2NIKAVc3MMmzoovcuJTysX+oxuXirRD39f7lUZ5ixg7t654Ru/gxmLO4+j2OmvMdKLA== X-Received: by 2002:a1c:2487:: with SMTP id k129mr979304wmk.86.1604369290095; Mon, 02 Nov 2020 18:08:10 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Stefan Hajnoczi , Kevin Wolf , Eric Auger , Max Reitz , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 v3 6/7] util/vfio-helpers: Convert vfio_dump_mapping to trace events Date: Tue, 3 Nov 2020 03:07:32 +0100 Message-Id: <20201103020733.2303148-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103020733.2303148-1-philmd@redhat.com> References: <20201103020733.2303148-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) The QEMU_VFIO_DEBUG definition is only modifiable at build-time. Trace events can be enabled at run-time. As we prefer the latter, convert qemu_vfio_dump_mappings() to use trace events instead of fprintf(). Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Eric Auger --- util/vfio-helpers.c | 19 ++++--------------- util/trace-events | 1 + 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index c24a510df82..73f7bfa7540 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -521,23 +521,12 @@ QEMUVFIOState *qemu_vfio_open_pci(const char *device,= Error **errp) return s; } =20 -static void qemu_vfio_dump_mapping(IOVAMapping *m) -{ - if (QEMU_VFIO_DEBUG) { - printf(" vfio mapping %p %" PRIx64 " to %" PRIx64 "\n", m->host, - (uint64_t)m->size, (uint64_t)m->iova); - } -} - static void qemu_vfio_dump_mappings(QEMUVFIOState *s) { - int i; - - if (QEMU_VFIO_DEBUG) { - printf("vfio mappings\n"); - for (i =3D 0; i < s->nr_mappings; ++i) { - qemu_vfio_dump_mapping(&s->mappings[i]); - } + for (int i =3D 0; i < s->nr_mappings; ++i) { + trace_qemu_vfio_dump_mapping(s->mappings[i].host, + s->mappings[i].iova, + s->mappings[i].size); } } =20 diff --git a/util/trace-events b/util/trace-events index 08239941cb2..61e0d4bcdfe 100644 --- a/util/trace-events +++ b/util/trace-events @@ -80,6 +80,7 @@ qemu_mutex_unlock(void *mutex, const char *file, const in= t line) "released mutex qemu_vfio_dma_reset_temporary(void *s) "s %p" qemu_vfio_ram_block_added(void *s, void *p, size_t size) "s %p host %p siz= e 0x%zx" qemu_vfio_ram_block_removed(void *s, void *p, size_t size) "s %p host %p s= ize 0x%zx" +qemu_vfio_dump_mapping(void *host, uint64_t iova, size_t size) "vfio mappi= ng %p to iova 0x%08" PRIx64 " size 0x%zx" qemu_vfio_find_mapping(void *s, void *p) "s %p host %p" qemu_vfio_new_mapping(void *s, void *host, size_t size, int index, uint64_= t iova) "s %p host %p size 0x%zx index %d iova 0x%"PRIx64 qemu_vfio_do_mapping(void *s, void *host, uint64_t iova, size_t size) "s %= p host %p <-> iova 0x%"PRIx64 " size 0x%zx" --=20 2.26.2 From nobody Fri May 17 02:41:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1604369300; cv=none; d=zohomail.com; s=zohoarc; b=lzUqERMHXWWUQ/2Spp7XqA2ceb6zpZh5uJRFTExoHwAzC54f+/nY9hkiR88oi4Kmr1yAoR9FxJKfKkzwMy3vdr0ulta0+y58/S1Cqe+eAbQ7Ll/Unpi34EZLqzKKJQsU2hrIFOkU4x6CtavX7qxcse9IJ9kEMInukNE2fcZYnBc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604369300; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tInFlNUhYIQeb69gl/XYovY2WBBHKAlRLVs6ZNnRMyA=; b=Bid3vt0wb9o3wkTAb5AkTi1k7aYOC9j4WzvVNUZ5Xj5GC0ifTKM6ALcFA3sb86LCtYMx3th4lBElsOmTAo5Y0MyvU+RUax8qCm7j3wFuRaXblYLXVIqHSKi9wQ+G/kQQBmJD2xv3WDTKsqLP0bVXTmlhjexWAouRQyQVaprrecE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604369300011487.98266083264446; Mon, 2 Nov 2020 18:08:20 -0800 (PST) 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-577-6yoG4KMXNw2BqZH7Wf_DLA-1; Mon, 02 Nov 2020 21:08:17 -0500 Received: by mail-wr1-f69.google.com with SMTP id 11so6106177wrc.3 for ; Mon, 02 Nov 2020 18:08:17 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id q2sm23622584wrw.40.2020.11.02.18.08.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 18:08:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604369299; 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=tInFlNUhYIQeb69gl/XYovY2WBBHKAlRLVs6ZNnRMyA=; b=V9NUmUX+Y4D7lXjLcLpcqvYTnYOlpsACpWo6w3SJ7ZY0ctS2BweVBSYRrkw4/g1LKpTnII zbrBqnzi5AuQYdyxrX7FAUf5tL88HmQHLhPArV5JOY29FIMsV/ojfFycrMEN4WbqvDPkxo 8EuvzYQAJ8CsoB46gfmrw3gb1yb4+9c= X-MC-Unique: 6yoG4KMXNw2BqZH7Wf_DLA-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=tInFlNUhYIQeb69gl/XYovY2WBBHKAlRLVs6ZNnRMyA=; b=j6fHtbiSYA9huT9WwXUjXdZ+ukn1iPTls5D0FtvswVs6FGf29/WGWCM3UvJR1gV3NU FMuqHmhx8zzjwynSdoTsAe6VITojLWOXay7nFE38m13q4tfBfuDXoq9utEkCR4/09AL/ ZXVFVoGW/78PqQSROUsYe35W//PNhbFqi2BKLqB/icwI84eoLYUW1vk8eWYsvwTYUTJJ 6hdzz1HiorD2wESDoze9sGc0pVkowH7DS4et7ANy1F1u+EKtNYFHX96wbDLmVTYd+9oF vGkIXLlwdx+nnIVq05aExLEyLnCN9ld37VWP7qrLgH2SyIofnYyKMsR6yDt+HXXVW++P dHJA== X-Gm-Message-State: AOAM530rDv+Oj7+vFPPjsRwi7XVBZ59w3eMBX8IASbRlVNp9y/+KrUIx kUxwsF1tv9R8b0KoconKBGYvlZWMS+VRGsB7ZDJU4kOyreaG3L9WozKdIYsU96gOKNPyj1B940w 1RQyNjMM+ig7AvA== X-Received: by 2002:adf:cc88:: with SMTP id p8mr24888709wrj.201.1604369295650; Mon, 02 Nov 2020 18:08:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJyOpUUrfDlUhnkHSiSuu/bd3I8JnVT89AEnrPLITqEKtiSuHkLZ/Qt8wk3j/mKjr6Nu29BMcA== X-Received: by 2002:adf:cc88:: with SMTP id p8mr24888696wrj.201.1604369295517; Mon, 02 Nov 2020 18:08:15 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Stefan Hajnoczi , Kevin Wolf , Eric Auger , Max Reitz , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 v3 7/7] util/vfio-helpers: Assert offset is aligned to page size Date: Tue, 3 Nov 2020 03:07:33 +0100 Message-Id: <20201103020733.2303148-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103020733.2303148-1-philmd@redhat.com> References: <20201103020733.2303148-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) mmap(2) states: 'offset' must be a multiple of the page size as returned by sysconf(_SC_PAGE_SIZE). Add an assertion to be sure we don't break this contract. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Eric Auger --- util/vfio-helpers.c | 1 + 1 file changed, 1 insertion(+) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 73f7bfa7540..804768d5c66 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -162,6 +162,7 @@ void *qemu_vfio_pci_map_bar(QEMUVFIOState *s, int index, Error **errp) { void *p; + assert(QEMU_IS_ALIGNED(offset, qemu_real_host_page_size)); assert_bar_index_valid(s, index); p =3D mmap(NULL, MIN(size, s->bar_region_info[index].size - offset), prot, MAP_SHARED, --=20 2.26.2