From nobody Mon Feb 9 12:25:48 2026 Delivered-To: importer@patchew.org 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; 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=1576762152; cv=none; d=zohomail.com; s=zohoarc; b=E2ZNEiUFr8bD55rqD2UWX10aISeZCyDLIfwUDQCUcDHKggVOSwluNY0wWEQXTKU599T2hO+XEJUMbi2KsvxglZ+min4+aioYOCS9ueGUJVVPINLg1HWuDURs5NX2BE8RyoI/3HvQOpSGJc0F64rGflOD6rDEedbYaezXMrh7k6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576762152; 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=8li2Tk9kJtAQIFMop0/eFLC5J5NJiOvfkc+z767fYRk=; b=MUzWrZbcci4dVVMEcj3Yhf+x7xTIrh7zbgkAbxomWRWFrZwLlmTTYnVXMX3cYAhCg4NmZJDh3zoSjqhnTR4d9vJ8qaOYoAoBQ4WBHykIFRSzgKZyC2v3dFetQMiQH3UqO0Lmf8FpUeVcF2rbEtnbKzSsnQ7gFdkL9Skl/8wS/MU= 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 15767621524021015.4975803368308; Thu, 19 Dec 2019 05:29:12 -0800 (PST) Received: from localhost ([::1]:41482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvra-0002mK-Ip for importer@patchew.org; Thu, 19 Dec 2019 08:29:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51458) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihvq1-00014K-9v for qemu-devel@nongnu.org; Thu, 19 Dec 2019 08:27:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihvq0-0003Ql-70 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 08:27:33 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:25559 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihvq0-0003OA-0m for qemu-devel@nongnu.org; Thu, 19 Dec 2019 08:27:32 -0500 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-207-EdhtTpk2PRen4Wjf8miTww-1; Thu, 19 Dec 2019 08:27:30 -0500 Received: by mail-qk1-f200.google.com with SMTP id g28so3594405qkl.6 for ; Thu, 19 Dec 2019 05:27:30 -0800 (PST) Received: from redhat.com (bzq-79-181-48-215.red.bezeqint.net. [79.181.48.215]) by smtp.gmail.com with ESMTPSA id m27sm1879294qta.21.2019.12.19.05.27.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 05:27:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576762051; 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=8li2Tk9kJtAQIFMop0/eFLC5J5NJiOvfkc+z767fYRk=; b=X5Wb8uBZjwivh4h7GGrxb2SyOlUxqQiWeXvQPwY8efpPPtb14jimgTYdYVLZcBaiqp+X4c SwkLsTC6xAicOnr1bKSGUDDFOtl0p/PY4wcpuzmN1XKqjvmnrFN0kxVUuyo8JcaIZJZ223 qGxRFgsl95DcA321LLROT6cbCwNbkoM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=8e5zVSr3EGK6wfLcmhM6md/VpcFIAiAuGM2x/CJ8sg4=; b=GnCNplev8y1iOJtboiaqXKxjBgX1/0RMOrRRkSF+hIZ4lgP3dtfW8Gm4o5qMQ9Vhbq tmj2ZHjX1d5t65S4binR4+6KeJxU5m2sr1f1jAsajL1RLqqFWlFG2FBIwBkNRVHG8fc8 5T0YoMdLjupBGqk4HPt7TqIGeyda1S/jRGQe0f3K7/tu6+WC4kmx1ZIIrPYVGaRkIshP FzQnJinnbQyMxPp8Sp8UHziaRNL32mfwrAWfgtYn5Gh2snMWk4JhRnAYbGqN9ygWSSYV iEhsNzYVQf8/SlS/pzVT36FVmiLJhM45KNn+AZJEze/FPMtlB4Lz1jFFHBCm4Wf6vQKF jjSQ== X-Gm-Message-State: APjAAAUGWh7iGkXojHjwhr4dxV9OtazgJlvzuStgXZNuhDFmCJRQMBII bXyfao2zJsrYCDa8/jjWSxNqExpyfYUWo52oB3dfVylmoM1O+F0u4kDiQNSO7u0lwuYofKODISE wUq6fSVrryJBOYcY= X-Received: by 2002:a37:644:: with SMTP id 65mr8220441qkg.309.1576762048196; Thu, 19 Dec 2019 05:27:28 -0800 (PST) X-Google-Smtp-Source: APXvYqwxTFTstNlGaO4audt9RA8wrjhpPEXetF06giI138x7OWlyriFVhBuUmIPpiFETxDTxKaimRw== X-Received: by 2002:a37:644:: with SMTP id 65mr8220410qkg.309.1576762047917; Thu, 19 Dec 2019 05:27:27 -0800 (PST) Date: Thu, 19 Dec 2019 08:27:22 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 06/24] intel_iommu: fix bug to read DMAR_RTADDR_REG Message-ID: <20191219132621.16595-7-mst@redhat.com> References: <20191219132621.16595-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20191219132621.16595-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-MC-Unique: EdhtTpk2PRen4Wjf8miTww-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Peter Maydell , Yi Sun , Eduardo Habkost , Peter Xu , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Yi Sun Should directly read DMAR_RTADDR_REG but not using 's->root'. Because 's->root' is modified in 'vtd_root_table_setup()' so that the first 12 bits are omitted. This causes the guest iommu debugfs cannot show pasid tables. Signed-off-by: Yi Sun Message-Id: <20191205095439.29114-1-yi.y.sun@linux.intel.com> Signed-off-by: Michael S. Tsirkin Reviewed-by: Peter Xu Reviewed-by: Michael S. Tsirkin --- hw/i386/intel_iommu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 43c94b993b..ee06993675 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -2610,16 +2610,15 @@ static uint64_t vtd_mem_read(void *opaque, hwaddr a= ddr, unsigned size) switch (addr) { /* Root Table Address Register, 64-bit */ case DMAR_RTADDR_REG: + val =3D vtd_get_quad_raw(s, DMAR_RTADDR_REG); if (size =3D=3D 4) { - val =3D s->root & ((1ULL << 32) - 1); - } else { - val =3D s->root; + val =3D val & ((1ULL << 32) - 1); } break; =20 case DMAR_RTADDR_REG_HI: assert(size =3D=3D 4); - val =3D s->root >> 32; + val =3D vtd_get_quad_raw(s, DMAR_RTADDR_REG) >> 32; break; =20 /* Invalidation Queue Address Register, 64-bit */ --=20 MST