From nobody Mon May 6 20:42:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1609434684; cv=none; d=zohomail.com; s=zohoarc; b=V+8mta/s4hkmDRQ9umdm6hjfHaHS+wIpyB43rbLlCwZCCUtXH1fQGMzkiMNsImvTH0WMB2kQcBhLYHJ2kGZs+iIOJgtXIdFNXpllPLwccorQlxo8JJwlnytGDMCzpW85x7n2fxpmo/9L8cA+4qnrkkFQG4au2SnMYGuw6gIbjsA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609434684; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=OaPtFeFdb1Sta+GVG+BqwIjD06Hy5b8jXDoXkUqUo3g=; b=bMhCFZziX/nmd4CAJwa5UjvFy3GG4DjNgkKCvIs9nKT1xG1hyIWpeCxLJ3Acw56WwII0iK0zHDJ13OhVfrjKgYSzqZ7zM68cwwFq6iV+l5a7hOuqZyaUEMArkgXjK37T39mehCBcB/0nicCma/iGUs8eNS5JxVCsSqmp6ULf29w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1609434684886166.81405527391064; Thu, 31 Dec 2020 09:11:24 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.60589.106329 (Exim 4.92) (envelope-from ) id 1kv1TN-0006v9-C5; Thu, 31 Dec 2020 17:10:49 +0000 Received: by outflank-mailman (output) from mailman id 60589.106329; Thu, 31 Dec 2020 17:10:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kv1TN-0006v2-8i; Thu, 31 Dec 2020 17:10:49 +0000 Received: by outflank-mailman (input) for mailman id 60589; Thu, 31 Dec 2020 17:10:47 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kv1TL-0006ux-Hz for xen-devel@lists.xenproject.org; Thu, 31 Dec 2020 17:10:47 +0000 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1d2de5a5-3251-4924-a231-1831b0c02e29; Thu, 31 Dec 2020 17:10:46 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1d2de5a5-3251-4924-a231-1831b0c02e29 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1609434646; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=NxwI/z0UNJxAx6ac/8QROsOGpOgOIjR2m928kxeN3v8=; b=JtcTPD3pEHowAguYbJFxCxhHH0tL9wwrULHij9HVdIx9zH8KfC/gkadj L97Dfwj/3qJpIeiKsHyj10+iol1nMRfZHEDvwfBy9oWko891ELYWMsRKM NeG8Ag5meIsajxjMOfxvTUQ2H1Tqj69LaYH7noLn6+mcEipJln0C2dk5B k=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 6P6FuERh7nPjVoQ1Yv0U73E7l7jt8DzwO8aLfj6bTnUjXNaBuO+k46eqAFRQWFvNq457nVrE7h qBpTLHKu+8xUvQipuQL/SqAD4iDl7TCz4DgmGC1/M39LW18B67D8Db3AhgIaXgc8U5ZL0/YSA+ 4uEYt7i+SMJKdMz5DRfmuKqxImbucGRsLQSyCirBWdfE6WItaC1vA0Lei8jhhdLD/nbqc7ILXx LbcwYOnrejaeHJaRa0+AgC5ouoHDWpOhUAkPoEp3kTMS8cmKLw94aKHOrFh/XgHcogvuHDPmY4 ziY= X-SBRS: 5.2 X-MesageID: 35481531 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.78,464,1599537600"; d="scan'208";a="35481531" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , Tamas K Lengyel Subject: [PATCH] x86/p2m: Fix paging_gva_to_gfn() for nested virt Date: Thu, 31 Dec 2020 17:10:21 +0000 Message-ID: <20201231171021.10361-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) nestedhap_walk_L1_p2m() takes guest physical addresses, not frame numbers. This means the l2 input is off-by-PAGE_SHIFT, as is the l1 value eventually returned to the caller. Delete the misleading comment as well. Fixes: bab2bd8e222de ("xen/nested_p2m: Don't walk EPT tables with a regular= PT walker") Reported-by: Tamas K Lengyel Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monn=C3=A9 Tested-by: Tamas K Lengyel --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu CC: Tamas K Lengyel --- xen/arch/x86/mm/p2m.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 487959b121..89a2b55c66 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1784,6 +1784,7 @@ unsigned long paging_gva_to_gfn(struct vcpu *v, if ( is_hvm_vcpu(v) && paging_mode_hap(v->domain) && nestedhvm_is_n2(v= ) ) { unsigned long l2_gfn, l1_gfn; + paddr_t l1_gpa; struct p2m_domain *p2m; const struct paging_mode *mode; uint8_t l1_p2ma; @@ -1798,8 +1799,8 @@ unsigned long paging_gva_to_gfn(struct vcpu *v, if ( l2_gfn =3D=3D gfn_x(INVALID_GFN) ) return gfn_x(INVALID_GFN); =20 - /* translate l2 guest gfn into l1 guest gfn */ - rv =3D nestedhap_walk_L1_p2m(v, l2_gfn, &l1_gfn, &l1_page_order, &= l1_p2ma, + rv =3D nestedhap_walk_L1_p2m(v, pfn_to_paddr(l2_gfn), &l1_gpa, + &l1_page_order, &l1_p2ma, 1, !!(*pfec & PFEC_write_access), !!(*pfec & PFEC_insn_fetch)); @@ -1807,6 +1808,8 @@ unsigned long paging_gva_to_gfn(struct vcpu *v, if ( rv !=3D NESTEDHVM_PAGEFAULT_DONE ) return gfn_x(INVALID_GFN); =20 + l1_gfn =3D paddr_to_pfn(l1_gpa); + /* * Sanity check that l1_gfn can be used properly as a 4K mapping, = even * if it mapped by a nested superpage. --=20 2.11.0