From patchwork Wed Nov 13 13:41:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11241925 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EF05915AB for ; Wed, 13 Nov 2019 13:43:17 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CA40822459 for ; Wed, 13 Nov 2019 13:43:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="debFZnj7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA40822459 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iUsu5-0001d1-Db; Wed, 13 Nov 2019 13:41:49 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iUsu3-0001cw-QT for xen-devel@lists.xenproject.org; Wed, 13 Nov 2019 13:41:47 +0000 X-Inumbo-ID: 56091b8c-061b-11ea-9631-bc764e2007e4 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 56091b8c-061b-11ea-9631-bc764e2007e4; Wed, 13 Nov 2019 13:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1573652506; h=from:to:cc:subject:date:message-id:mime-version; bh=1NHJmkKKri5XHjRoHn6QO0awDGsAkqd1ScE7LqT2zbU=; b=debFZnj7RafZJxv4qEAd+AthNoWDNF71fb0MtmLrk6v7MWOdt3zbKlUD QU1SJnmsA5uGkbDtebfyrucPOWQznN60E1EupG036xBdu6k6//bScwYiQ rXuEwyjts+3UVP0yl/5HyxLz9ykffCUivd07wkex2hAL8uG8K54uDFpeU k=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa6.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 6XHz6LR/Att9XgCq5C61Cjf+wyjIXYck+RfIlR5GHGykI4i6i0auYyEl6ga5kPmrfDJmhN0M8L yfbAUbtN1L8lyGOgDTwGhomqAljSALlXjAl2owRf1X+qRNEHYzAlR5FEE+cJbS/iIpGMGQ4STE H/xaVP6neyWN6Z7z0dgH8x6wYlgfc9f0YWjJ82r8n43+BvtKwV0thqE4vKME1cNU9c4nnACZMY ZYACOHnCQ2F5IEt2M77iy4RXhCFMPqWpBk92KmL9MQWgtiHH0RllcI2MnSlC9B1KRwUeNpBZYB +7Q= X-SBRS: 2.7 X-MesageID: 8673772 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.68,300,1569297600"; d="scan'208";a="8673772" From: Andrew Cooper To: Xen-devel Date: Wed, 13 Nov 2019 13:41:36 +0000 Message-ID: <20191113134136.16180-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH for-4.13] AMD/IOMMU: Fix crash in 'V' debugkey X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Andrew Cooper , Jan Beulich Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" c/s bb038f31168 "AMD/IOMMU: replace INTREMAP_ENTRIES" introduces a call to intremap_table_entries() in dump_intremap_table() before tbl.ptr is checked for NULL. intremap_table_entries() internally uses virt_to_page() which falls over ASSERT(va >= XEN_VIRT_START); in __virt_to_page(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Juergen Gross For 4.13. Regression vs 4.12 --- xen/drivers/passthrough/amd/iommu_intr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index 1eed60f265..5e92c023f8 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -847,11 +847,13 @@ static void dump_intremap_table(const struct amd_iommu *iommu, union irte_cptr tbl, const struct ivrs_mappings *ivrs_mapping) { - unsigned int count, nr = intremap_table_entries(tbl.ptr, iommu); + unsigned int count, nr; if ( !tbl.ptr ) return; + nr = intremap_table_entries(tbl.ptr, iommu); + for ( count = 0; count < nr; count++ ) { if ( iommu->ctrl.ga_en