From patchwork Thu Sep 26 09:46:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162139 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 4001813BD for ; Thu, 26 Sep 2019 09:50:21 +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 1BD9B222C0 for ; Thu, 26 Sep 2019 09:50:21 +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="jjjI688C" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1BD9B222C0 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 1iDQOd-0005iK-G9; Thu, 26 Sep 2019 09:49:11 +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 1iDQOc-0005gr-PC for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:49:10 +0000 X-Inumbo-ID: da9f1e5e-e042-11e9-964c-12813bfff9fa Received: from smtp-fw-6001.amazon.com (unknown [52.95.48.154]) by localhost (Halon) with ESMTPS id da9f1e5e-e042-11e9-964c-12813bfff9fa; Thu, 26 Sep 2019 09:48:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491335; x=1601027335; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=g3nBDFD3rOj2j8Dpfaejkhy+nfkyUfS2Tj2b5j5iSC8=; b=jjjI688CVQKTlsax/ieFOGsHYCl/4YQgypOe6ClWTKgwzlTkLYpu42GO iM9moHaW4j6wSvABMQbDgm31Qm/AMBNDPclbCCiQ2NJC+fJfdhxwL93Xy Tcone1nLXJvVLVP9U2EIT5QKLiNathmtHdiCP+BwRDNUtU8UIKHAdFrPC U=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="417788324" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1e-17c49630.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6001.iad6.amazon.com with ESMTP; 26 Sep 2019 09:48:55 +0000 Received: from EX13MTAUWA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1e-17c49630.us-east-1.amazon.com (Postfix) with ESMTPS id 0D523A2A39; Thu, 26 Sep 2019 09:48:53 +0000 (UTC) Received: from EX13D18UWA004.ant.amazon.com (10.43.160.45) 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:20 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13D18UWA004.ant.amazon.com (10.43.160.45) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:48:19 +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:18 +0000 From: To: Date: Thu, 26 Sep 2019 10:46:10 +0100 Message-ID: <1616300d2e376baba872b00809c500cba64787ae.1569489002.git.hongyax@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [RFC PATCH 47/84] x86_64/mm: map and unmap page tables in cleanup_frame_table 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 | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 0fac71356b..bbdf1ee47c 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -801,8 +801,8 @@ void free_compat_arg_xlat(struct vcpu *v) static void cleanup_frame_table(struct mem_hotadd_info *info) { unsigned long sva, eva; - l3_pgentry_t l3e; - l2_pgentry_t l2e; + l3_pgentry_t l3e, *l3t; + l2_pgentry_t l2e, *l2t; mfn_t spfn, epfn; spfn = _mfn(info->spfn); @@ -816,8 +816,10 @@ static void cleanup_frame_table(struct mem_hotadd_info *info) while (sva < eva) { - l3e = l4e_to_l3e(idle_pg_table[l4_table_offset(sva)])[ - l3_table_offset(sva)]; + l3t = map_xen_pagetable_new( + l4e_get_mfn(idle_pg_table[l4_table_offset(sva)])); + l3e = l3t[l3_table_offset(sva)]; + UNMAP_XEN_PAGETABLE_NEW(l3t); if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) || (l3e_get_flags(l3e) & _PAGE_PSE) ) { @@ -826,7 +828,9 @@ static void cleanup_frame_table(struct mem_hotadd_info *info) continue; } - l2e = l3e_to_l2e(l3e)[l2_table_offset(sva)]; + l2t = map_xen_pagetable_new(l3e_get_mfn(l3e)); + l2e = l2t[l2_table_offset(sva)]; + UNMAP_XEN_PAGETABLE_NEW(l2t); ASSERT(l2e_get_flags(l2e) & _PAGE_PRESENT); if ( (l2e_get_flags(l2e) & (_PAGE_PRESENT | _PAGE_PSE)) == @@ -842,8 +846,14 @@ static void cleanup_frame_table(struct mem_hotadd_info *info) continue; } - ASSERT(l1e_get_flags(l2e_to_l1e(l2e)[l1_table_offset(sva)]) & - _PAGE_PRESENT); +#ifndef NDEBUG + { + l1_pgentry_t *l1t = map_xen_pagetable_new(l2e_get_mfn(l2e)); + ASSERT(l1e_get_flags(l1t[l1_table_offset(sva)]) & + _PAGE_PRESENT); + UNMAP_XEN_PAGETABLE_NEW(l1t); + } +#endif sva = (sva & ~((1UL << PAGE_SHIFT) - 1)) + (1UL << PAGE_SHIFT); }