From patchwork Mon Sep 30 10:33:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11166437 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 254F916B1 for ; Mon, 30 Sep 2019 10:36:33 +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 00D5420679 for ; Mon, 30 Sep 2019 10:36:32 +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="MzvShTKw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 00D5420679 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 1iEt1V-00084h-3N; Mon, 30 Sep 2019 10:35:21 +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 1iEt1U-00082j-0W for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:35:20 +0000 X-Inumbo-ID: f07ef23e-e36d-11e9-96cd-12813bfff9fa Received: from smtp-fw-6001.amazon.com (unknown [52.95.48.154]) by localhost (Halon) with ESMTPS id f07ef23e-e36d-11e9-96cd-12813bfff9fa; Mon, 30 Sep 2019 10:34:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839693; x=1601375693; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=fu4bJoN6T56Ad0vMmXWFUvvsPIUm3UDPU1ArzywSC+U=; b=MzvShTKwqFtbyosWjmCP8p+JDrM2UxC/yiGToNkE4SQRDe0x3/Gq/CNd FwwniYIYgQRVJ/AozuK+UAiZFDeBbbmur1YTKKadq0GYFCmjl36+MtIDj cfr6sXAtTzP+KIe6d2v5o1DvJuNCOCvwbscxwzp5wC53rLUiYTTfZDLks s=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="418649922" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1e-a70de69e.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6001.iad6.amazon.com with ESMTP; 30 Sep 2019 10:34:53 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1e-a70de69e.us-east-1.amazon.com (Postfix) with ESMTPS id 71C41A276F; Mon, 30 Sep 2019 10:34:52 +0000 (UTC) Received: from EX13D21UEE003.ant.amazon.com (10.43.62.160) by EX13MTAUEA001.ant.amazon.com (10.43.61.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:26 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D21UEE003.ant.amazon.com (10.43.62.160) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:25 +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:25 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:30 +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 38/55] x86/smpboot: drop lXe_to_lYe invocations from cleanup_cpu_root_pgt 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/smpboot.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 956e1bdbcc..c55aaa65a2 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -891,23 +891,27 @@ static void cleanup_cpu_root_pgt(unsigned int cpu) r < root_table_offset(HYPERVISOR_VIRT_END); ++r ) { l3_pgentry_t *l3t; + mfn_t l3t_mfn; unsigned int i3; if ( !(root_get_flags(rpt[r]) & _PAGE_PRESENT) ) continue; - l3t = l4e_to_l3e(rpt[r]); + l3t_mfn = l4e_get_mfn(rpt[r]); + l3t = map_xen_pagetable_new(l3t_mfn); for ( i3 = 0; i3 < L3_PAGETABLE_ENTRIES; ++i3 ) { l2_pgentry_t *l2t; + mfn_t l2t_mfn; unsigned int i2; if ( !(l3e_get_flags(l3t[i3]) & _PAGE_PRESENT) ) continue; ASSERT(!(l3e_get_flags(l3t[i3]) & _PAGE_PSE)); - l2t = l3e_to_l2e(l3t[i3]); + l2t_mfn = l3e_get_mfn(l3t[i3]); + l2t = map_xen_pagetable_new(l2t_mfn); for ( i2 = 0; i2 < L2_PAGETABLE_ENTRIES; ++i2 ) { @@ -915,13 +919,15 @@ static void cleanup_cpu_root_pgt(unsigned int cpu) continue; ASSERT(!(l2e_get_flags(l2t[i2]) & _PAGE_PSE)); - free_xen_pagetable(l2e_to_l1e(l2t[i2])); + free_xen_pagetable_new(l2e_get_mfn(l2t[i2])); } - free_xen_pagetable(l2t); + UNMAP_XEN_PAGETABLE_NEW(l2t); + free_xen_pagetable_new(l2t_mfn); } - free_xen_pagetable(l3t); + UNMAP_XEN_PAGETABLE_NEW(l3t); + free_xen_pagetable_new(l3t_mfn); } free_xen_pagetable(rpt);