From patchwork Thu Sep 26 09:46:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162137 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 EF1D31709 for ; Thu, 26 Sep 2019 09:50:20 +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 CACD8222C0 for ; Thu, 26 Sep 2019 09:50:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="bAcBM3f7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CACD8222C0 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.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 1iDQOP-0005J8-KL; Thu, 26 Sep 2019 09:48:57 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iDQON-0005Fd-P8 for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:48:55 +0000 X-Inumbo-ID: d7a31700-e042-11e9-964c-12813bfff9fa Received: from smtp-fw-6002.amazon.com (unknown [52.95.49.90]) by localhost (Halon) with ESMTPS id d7a31700-e042-11e9-964c-12813bfff9fa; Thu, 26 Sep 2019 09:48:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491330; x=1601027330; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=kEqJEZp9xHiKHGinEbupzGCKej+WQIrDevTGdejpDDc=; b=bAcBM3f7HJ3H9Zos8Lcm41LZSKMj0UH/r0yhvcLYkpX1EDmOl6Y3gpBw RIhXDKAUeCExr92ny0KyJOiRRdoNr5QuMRGhGSlomYauncqFkcfGqhR0o DzQWiLRsmLkzPPta4IqC52NbRFFii36j9HzUnQjtiEcgMrVl28au2rGCQ w=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="423750579" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1a-7d76a15f.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6002.iad6.amazon.com with ESMTP; 26 Sep 2019 09:48:49 +0000 Received: from EX13MTAUWA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1a-7d76a15f.us-east-1.amazon.com (Postfix) with ESMTPS id EBB38A2102; Thu, 26 Sep 2019 09:48:47 +0000 (UTC) Received: from EX13d09UWA004.ant.amazon.com (10.43.160.158) by EX13MTAUWA001.ant.amazon.com (10.43.160.58) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:48:10 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13d09UWA004.ant.amazon.com (10.43.160.158) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:48:10 +0000 Received: from u9d785c4ba99158.ant.amazon.com (10.125.106.58) by mail-relay.amazon.com (10.43.160.118) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Thu, 26 Sep 2019 09:48:08 +0000 From: To: Date: Thu, 26 Sep 2019 10:46:05 +0100 Message-ID: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [RFC PATCH 42/84] x86_64/mm: map and unmap page tables in m2p_mapped X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , Wei Liu , Jan Beulich , =?utf-8?q?Roger_Pau_?= =?utf-8?q?Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Wei Liu Signed-off-by: Wei Liu --- xen/arch/x86/x86_64/mm.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 9163f08de9..36dfac11a3 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -130,28 +130,36 @@ static int m2p_mapped(unsigned long spfn) { unsigned long va; l3_pgentry_t *l3_ro_mpt; - l2_pgentry_t *l2_ro_mpt; + l2_pgentry_t *l2_ro_mpt = NULL; + int rc = M2P_NO_MAPPED; va = RO_MPT_VIRT_START + spfn * sizeof(*machine_to_phys_mapping); - l3_ro_mpt = l4e_to_l3e(idle_pg_table[l4_table_offset(va)]); + l3_ro_mpt = map_xen_pagetable_new( + l4e_get_mfn(idle_pg_table[l4_table_offset(va)])); switch ( l3e_get_flags(l3_ro_mpt[l3_table_offset(va)]) & (_PAGE_PRESENT |_PAGE_PSE)) { case _PAGE_PSE|_PAGE_PRESENT: - return M2P_1G_MAPPED; + rc = M2P_1G_MAPPED; + goto out; /* Check for next level */ case _PAGE_PRESENT: break; default: - return M2P_NO_MAPPED; + rc = M2P_NO_MAPPED; + goto out; } - l2_ro_mpt = l3e_to_l2e(l3_ro_mpt[l3_table_offset(va)]); + l2_ro_mpt = map_xen_pagetable_new( + l3e_get_mfn(l3_ro_mpt[l3_table_offset(va)])); if (l2e_get_flags(l2_ro_mpt[l2_table_offset(va)]) & _PAGE_PRESENT) - return M2P_2M_MAPPED; + rc = M2P_2M_MAPPED; - return M2P_NO_MAPPED; + out: + UNMAP_XEN_PAGETABLE_NEW(l2_ro_mpt); + UNMAP_XEN_PAGETABLE_NEW(l3_ro_mpt); + return rc; } static int share_hotadd_m2p_table(struct mem_hotadd_info *info)