From patchwork Mon Sep 30 10:33:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11166445 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 B8F1C16B1 for ; Mon, 30 Sep 2019 10:36:39 +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 9490521855 for ; Mon, 30 Sep 2019 10:36:39 +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="BDgdtcVy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9490521855 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 1iEt1d-0008JS-Uz; Mon, 30 Sep 2019 10:35:29 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iEt1c-0008Ha-Ri for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:35:28 +0000 X-Inumbo-ID: f3adf586-e36d-11e9-97fb-bc764e2007e4 Received: from smtp-fw-4101.amazon.com (unknown [72.21.198.25]) by localhost (Halon) with ESMTPS id f3adf586-e36d-11e9-97fb-bc764e2007e4; Mon, 30 Sep 2019 10:34:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839699; x=1601375699; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=JeCSzuzQJ/zRBnzL/d6gNFIcOFOq1Tdq+RtL5CVDeD8=; b=BDgdtcVys7WIy4oK4mblDXQZQDoXkw5Rw3UyuWlVU0izYif83Vfrt2L0 6BenL/MP6pwbcs0XvRzZiMOFgeTLA1heqnGyyUi0jxSDy5tv4l/xgYn2S m6g7TntwqwAICTOLYSh0m4XcW/kp269uSuNljPYAa0fx55ARBu1Ma+e6X Q=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="788414738" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1d-74cf8b49.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-4101.iad4.amazon.com with ESMTP; 30 Sep 2019 10:34:58 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1d-74cf8b49.us-east-1.amazon.com (Postfix) with ESMTPS id 79BEDC18BF; Mon, 30 Sep 2019 10:34:57 +0000 (UTC) Received: from EX13D23UEE001.ant.amazon.com (10.43.62.101) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:35 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D23UEE001.ant.amazon.com (10.43.62.101) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:35 +0000 Received: from u9d785c4ba99158.ant.amazon.com (10.125.106.78) by mail-relay.amazon.com (10.43.62.226) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Mon, 30 Sep 2019 10:34:34 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:40 +0100 Message-ID: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [PATCH v2 48/55] x86_64/mm: map and unmap page tables in subarch_memory_op 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 , Jan Beulich , =?utf-8?q?Roger_Pau_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 | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 7a02fcee18..a1c69d7f0e 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -1016,8 +1016,8 @@ void __init subarch_init_memory(void) long subarch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { struct xen_machphys_mfn_list xmml; - l3_pgentry_t l3e; - l2_pgentry_t l2e; + l3_pgentry_t l3e, *l3t; + l2_pgentry_t l2e, *l2t; unsigned long v, limit; xen_pfn_t mfn, last_mfn; unsigned int i; @@ -1036,13 +1036,18 @@ long subarch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) (v < (unsigned long)(machine_to_phys_mapping + max_page)); i++, v += 1UL << L2_PAGETABLE_SHIFT ) { - l3e = l4e_to_l3e(idle_pg_table[l4_table_offset(v)])[ - l3_table_offset(v)]; + l3t = map_xen_pagetable_new( + l4e_get_mfn(idle_pg_table[l4_table_offset(v)])); + l3e = l3t[l3_table_offset(v)]; + UNMAP_XEN_PAGETABLE_NEW(l3t); + if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) ) mfn = last_mfn; else if ( !(l3e_get_flags(l3e) & _PAGE_PSE) ) { - l2e = l3e_to_l2e(l3e)[l2_table_offset(v)]; + l2t = map_xen_pagetable_new(l3e_get_mfn(l3e)); + l2e = l2t[l2_table_offset(v)]; + UNMAP_XEN_PAGETABLE_NEW(l2t); if ( l2e_get_flags(l2e) & _PAGE_PRESENT ) mfn = l2e_get_pfn(l2e); else