From patchwork Thu Sep 26 09:45:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162073 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 1106E13BD for ; Thu, 26 Sep 2019 09:49:16 +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 E19C0222C0 for ; Thu, 26 Sep 2019 09:49:15 +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="Lqkcp5sL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E19C0222C0 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 1iDQNV-0003yb-Lw; Thu, 26 Sep 2019 09:48:01 +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 1iDQNU-0003xM-Ma for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:48:00 +0000 X-Inumbo-ID: b89c2ef1-e042-11e9-964c-12813bfff9fa Received: from smtp-fw-6001.amazon.com (unknown [52.95.48.154]) by localhost (Halon) with ESMTPS id b89c2ef1-e042-11e9-964c-12813bfff9fa; Thu, 26 Sep 2019 09:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491278; x=1601027278; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=LWFx3gZXlXyggl/OgrfKOJDKrGBkC4PTLu0JOK+Lpsc=; b=Lqkcp5sLQ8+1uvtDlVsN9BPTxRyj2r/rntgTnK0K6UuSK8S3s1+9P+wQ l3/Bxnf8/HVi2WmLq/kHkgFyTlfi4Cg5BbEef8eDaC7AaGKYlPDRK3kB2 7RUwwKAjG/4PLyWdRhNrd67JkyWXH5PzIVOoKWiWvCMHItiE6ElF5IN3h s=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="417788142" 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:47:58 +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 98786A2A41; Thu, 26 Sep 2019 09:47:57 +0000 (UTC) Received: from EX13D19UWA004.ant.amazon.com (10.43.160.102) by EX13MTAUWA001.ant.amazon.com (10.43.160.58) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:47:33 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13D19UWA004.ant.amazon.com (10.43.160.102) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:47:32 +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:47:31 +0000 From: To: Date: Thu, 26 Sep 2019 10:45:44 +0100 Message-ID: <818f17997f90b464bbe620ead9f35bab3844375c.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 21/84] 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 , 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/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 a9361b859a..59dba05ba8 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;