From patchwork Mon Sep 30 10:33:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11166391 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 30D2A13BD for ; Mon, 30 Sep 2019 10:35:42 +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 0C64621920 for ; Mon, 30 Sep 2019 10:35:42 +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="sHV78O85" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C64621920 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 1iEt16-0007TR-KH; Mon, 30 Sep 2019 10:34:56 +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 1iEt14-0007Qz-RV for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:34:54 +0000 X-Inumbo-ID: ecde9abd-e36d-11e9-96cd-12813bfff9fa Received: from smtp-fw-6001.amazon.com (unknown [52.95.48.154]) by localhost (Halon) with ESMTPS id ecde9abd-e36d-11e9-96cd-12813bfff9fa; Mon, 30 Sep 2019 10:34:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839687; x=1601375687; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=0SYqLn0J8g22MwTPI4ly2IZPEB0g/6dxXq86B5UES/I=; b=sHV78O85U2bfiWLx7A7ExMGD4B5DBByq5EfzK62m9oh9Re+bU49rmfKC GgtbqIr0fi3QODS+/GTJEHNvgBH566Dh0/Mz35Zl1B+ExK5/gJ7i7DAjX 1oyWGdu8UOyaDXBydh0vqMrULBDy/lvGjfx/pwd3q+gdbqqkBGcjE0uJP 0=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="418649869" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1d-37fd6b3d.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:47 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1d-37fd6b3d.us-east-1.amazon.com (Postfix) with ESMTPS id 705342824BC; Mon, 30 Sep 2019 10:34:47 +0000 (UTC) Received: from EX13D02UEE001.ant.amazon.com (10.43.62.208) 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:19 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D02UEE001.ant.amazon.com (10.43.62.208) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:18 +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:18 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:22 +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 30/55] efi: use new page table APIs in efi_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: Jan Beulich Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Wei Liu Signed-off-by: Wei Liu --- xen/common/efi/boot.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 64a287690a..1d1420f02c 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1637,39 +1637,50 @@ void __init efi_init_memory(void) if ( !(l4e_get_flags(l4e) & _PAGE_PRESENT) ) { - pl3e = alloc_xen_pagetable(); - BUG_ON(!pl3e); + mfn_t l3t_mfn; + + l3t_mfn = alloc_xen_pagetable_new(); + BUG_ON(mfn_eq(l3t_mfn, INVALID_MFN)); + pl3e = map_xen_pagetable_new(l3t_mfn); clear_page(pl3e); efi_l4_pgtable[l4_table_offset(addr)] = - l4e_from_paddr(virt_to_maddr(pl3e), __PAGE_HYPERVISOR); + l4e_from_mfn(l3t_mfn, __PAGE_HYPERVISOR); } else - pl3e = l4e_to_l3e(l4e); + pl3e = map_xen_pagetable_new(l4e_get_mfn(l4e)); pl3e += l3_table_offset(addr); + if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) ) { - pl2e = alloc_xen_pagetable(); - BUG_ON(!pl2e); + mfn_t l2t_mfn; + + l2t_mfn = alloc_xen_pagetable_new(); + BUG_ON(mfn_eq(l2t_mfn, INVALID_MFN)); + pl2e = map_xen_pagetable_new(l2t_mfn); clear_page(pl2e); - *pl3e = l3e_from_paddr(virt_to_maddr(pl2e), __PAGE_HYPERVISOR); + *pl3e = l3e_from_mfn(l2t_mfn, __PAGE_HYPERVISOR); } else { BUG_ON(l3e_get_flags(*pl3e) & _PAGE_PSE); - pl2e = l3e_to_l2e(*pl3e); + pl2e = map_xen_pagetable_new(l3e_get_mfn(*pl3e)); } pl2e += l2_table_offset(addr); + if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) { - l1t = alloc_xen_pagetable(); - BUG_ON(!l1t); + mfn_t l1t_mfn; + + l1t_mfn = alloc_xen_pagetable_new(); + BUG_ON(mfn_eq(l1t_mfn, INVALID_MFN)); + l1t = map_xen_pagetable_new(l1t_mfn); clear_page(l1t); - *pl2e = l2e_from_paddr(virt_to_maddr(l1t), __PAGE_HYPERVISOR); + *pl2e = l2e_from_mfn(l1t_mfn, __PAGE_HYPERVISOR); } else { BUG_ON(l2e_get_flags(*pl2e) & _PAGE_PSE); - l1t = l2e_to_l1e(*pl2e); + l1t = map_xen_pagetable_new(l2e_get_mfn(*pl2e)); } for ( i = l1_table_offset(addr); i < L1_PAGETABLE_ENTRIES && extra->smfn < extra->emfn; @@ -1681,6 +1692,10 @@ void __init efi_init_memory(void) extra_head = extra->next; xfree(extra); } + + UNMAP_XEN_PAGETABLE_NEW(l1t); + UNMAP_XEN_PAGETABLE_NEW(pl2e); + UNMAP_XEN_PAGETABLE_NEW(pl3e); } /* Insert Xen mappings. */