From patchwork Mon Sep 30 10:33:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11166409 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 349E913BD for ; Mon, 30 Sep 2019 10:35:56 +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 113FD21855 for ; Mon, 30 Sep 2019 10:35:56 +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="hlt7NrO7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 113FD21855 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 1iEt0v-0007FG-E7; Mon, 30 Sep 2019 10:34:45 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iEt0t-0007Df-Qy for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:34:43 +0000 X-Inumbo-ID: e77f60c4-e36d-11e9-97fb-bc764e2007e4 Received: from smtp-fw-6002.amazon.com (unknown [52.95.49.90]) by localhost (Halon) with ESMTPS id e77f60c4-e36d-11e9-97fb-bc764e2007e4; Mon, 30 Sep 2019 10:34:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839678; x=1601375678; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=nHlDLoGw/1YR58cRbIoTIBNc4eFjZOJefaEjsYgn0Jw=; b=hlt7NrO7P6tREqUN5leH4/be3qeCPQ6eKbHPS7A4B+e5sf2G0rU/f3SL 9zfLeATa1xZVE0/ZW57KLeiY+W09YStStK6TzKc48p67jQb+dOt4L8/hV amICYVfFHynD2Zx/2UDWXtYt1MknO7gsfj2om/b+rCBE8JSqENCGHcTsp A=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="424630094" 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-6002.iad6.amazon.com with ESMTP; 30 Sep 2019 10:34:38 +0000 Received: from EX13MTAUEA001.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 25BCDA2289; Mon, 30 Sep 2019 10:34:38 +0000 (UTC) Received: from EX13D12UEE003.ant.amazon.com (10.43.62.198) 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:09 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D12UEE003.ant.amazon.com (10.43.62.198) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:09 +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:08 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:12 +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 20/55] x86/mm: switch to new APIs in arch_init_memory 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/mm.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 6fb8c92543..8706dc0174 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -353,19 +353,22 @@ void __init arch_init_memory(void) ASSERT(root_pgt_pv_xen_slots < ROOT_PAGETABLE_PV_XEN_SLOTS); if ( l4_table_offset(split_va) == l4_table_offset(split_va - 1) ) { - l3_pgentry_t *l3tab = alloc_xen_pagetable(); + mfn_t l3tab_mfn = alloc_xen_pagetable_new(); - if ( l3tab ) + if ( !mfn_eq(l3tab_mfn, INVALID_MFN) ) { - const l3_pgentry_t *l3idle = - l4e_to_l3e(idle_pg_table[l4_table_offset(split_va)]); + l3_pgentry_t *l3idle = + map_xen_pagetable_new( + l4e_get_mfn(idle_pg_table[l4_table_offset(split_va)])); + l3_pgentry_t *l3tab = map_xen_pagetable_new(l3tab_mfn); for ( i = 0; i < l3_table_offset(split_va); ++i ) l3tab[i] = l3idle[i]; for ( ; i < L3_PAGETABLE_ENTRIES; ++i ) l3tab[i] = l3e_empty(); - split_l4e = l4e_from_mfn(virt_to_mfn(l3tab), - __PAGE_HYPERVISOR_RW); + split_l4e = l4e_from_mfn(l3tab_mfn, __PAGE_HYPERVISOR_RW); + UNMAP_XEN_PAGETABLE_NEW(l3idle); + UNMAP_XEN_PAGETABLE_NEW(l3tab); } else ++root_pgt_pv_xen_slots;