From patchwork Mon Sep 30 10:33:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11166431 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 70F381709 for ; Mon, 30 Sep 2019 10:36:25 +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 4D84E21855 for ; Mon, 30 Sep 2019 10:36:25 +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="ClhHi/w1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D84E21855 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 1iEt1K-0007mU-5D; Mon, 30 Sep 2019 10:35:10 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iEt1I-0007kY-RR for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:35:08 +0000 X-Inumbo-ID: f0f7263c-e36d-11e9-bf31-bc764e2007e4 Received: from smtp-fw-6002.amazon.com (unknown [52.95.49.90]) by localhost (Halon) with ESMTPS id f0f7263c-e36d-11e9-bf31-bc764e2007e4; Mon, 30 Sep 2019 10:34:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839694; x=1601375694; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=6nzAStnWYrYC7d4QMPwj7AvyNQB9HFAtnT/it/dtaYg=; b=ClhHi/w1LjmqDI7Uo2RA648PS/b1j6WTmndwdw8BI7YNatcJoqbSwSK+ U3nAyFWfYESNHLmypSTxokVwYFJeGPlGTsIfg6Tg5Gj3RQJZ53z3RwGkj Zyu9H8mopo+rcKw45pOdu3+erF9o0S7MYQFVPvZhusA3Vu8rPYB54p/MH c=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="424630119" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1d-9ec21598.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6002.iad6.amazon.com with ESMTP; 30 Sep 2019 10:34:46 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1d-9ec21598.us-east-1.amazon.com (Postfix) with ESMTPS id 1A5CFA20C7; Mon, 30 Sep 2019 10:34:46 +0000 (UTC) Received: from EX13D06UEE001.ant.amazon.com (10.43.62.79) 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:17 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D06UEE001.ant.amazon.com (10.43.62.79) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:16 +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:15 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:19 +0100 Message-ID: <9797dfe61ac60fa7239f1757e758ed14ae6bc739.1569833766.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] [PATCH v2 27/55] x86_64/mm: drop lXe_to_lYe invocations from setup_m2p_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 , 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 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index d452ed3966..c41715cd56 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -400,11 +400,13 @@ static int setup_m2p_table(struct mem_hotadd_info *info) l2_pgentry_t *pl2e = NULL, *l2_ro_mpt = NULL; l3_pgentry_t *l3_ro_mpt = NULL; int ret = 0; - mfn_t l2_ro_mpt_mfn; + mfn_t l2_ro_mpt_mfn, l3_ro_mpt_mfn; ASSERT(l4e_get_flags(idle_pg_table[l4_table_offset(RO_MPT_VIRT_START)]) & _PAGE_PRESENT); - l3_ro_mpt = l4e_to_l3e(idle_pg_table[l4_table_offset(RO_MPT_VIRT_START)]); + l3_ro_mpt_mfn = l4e_get_mfn(idle_pg_table[l4_table_offset( + RO_MPT_VIRT_START)]); + l3_ro_mpt = map_xen_pagetable_new(l3_ro_mpt_mfn); smap = (info->spfn & (~((1UL << (L2_PAGETABLE_SHIFT - 3)) -1))); emap = ((info->epfn + ((1UL << (L2_PAGETABLE_SHIFT - 3)) - 1 )) & @@ -459,8 +461,13 @@ static int setup_m2p_table(struct mem_hotadd_info *info) _PAGE_PSE)); if ( l3e_get_flags(l3_ro_mpt[l3_table_offset(va)]) & _PAGE_PRESENT ) - pl2e = l3e_to_l2e(l3_ro_mpt[l3_table_offset(va)]) + - l2_table_offset(va); + { + UNMAP_XEN_PAGETABLE_NEW(l2_ro_mpt); + l2_ro_mpt_mfn = l3e_get_mfn(l3_ro_mpt[l3_table_offset(va)]); + l2_ro_mpt = map_xen_pagetable_new(l2_ro_mpt_mfn); + ASSERT(l2_ro_mpt); + pl2e = l2_ro_mpt + l2_table_offset(va); + } else { UNMAP_XEN_PAGETABLE_NEW(l2_ro_mpt); @@ -492,6 +499,7 @@ static int setup_m2p_table(struct mem_hotadd_info *info) ret = setup_compat_m2p_table(info); error: UNMAP_XEN_PAGETABLE_NEW(l2_ro_mpt); + UNMAP_XEN_PAGETABLE_NEW(l3_ro_mpt); return ret; }