|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v7 10/15] efi: switch to new APIs in EFI code
From: Wei Liu <wei.liu2@xxxxxxxxxx>
Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
Signed-off-by: Hongyan Xia <hongyxia@xxxxxxxxxx>
---
Changed in v7:
- add blank line after declaration.
- rename efi_l4_pgtable into efi_l4t.
- pass the mapped efi_l4t to copy_mapping() instead of map it again.
- use the alloc_map_clear_xen_pt() API.
- unmap pl3e, pl2e, l1t earlier.
---
xen/arch/x86/efi/runtime.h | 13 ++++++---
xen/common/efi/boot.c | 55 ++++++++++++++++++++++----------------
xen/common/efi/efi.h | 3 ++-
xen/common/efi/runtime.c | 8 +++---
4 files changed, 48 insertions(+), 31 deletions(-)
diff --git a/xen/arch/x86/efi/runtime.h b/xen/arch/x86/efi/runtime.h
index d9eb8f5c27..77866c5f21 100644
--- a/xen/arch/x86/efi/runtime.h
+++ b/xen/arch/x86/efi/runtime.h
@@ -1,12 +1,19 @@
+#include <xen/domain_page.h>
+#include <xen/mm.h>
#include <asm/atomic.h>
#include <asm/mc146818rtc.h>
#ifndef COMPAT
-l4_pgentry_t *__read_mostly efi_l4_pgtable;
+mfn_t __read_mostly efi_l4_mfn = INVALID_MFN_INITIALIZER;
void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e)
{
- if ( efi_l4_pgtable )
- l4e_write(efi_l4_pgtable + l4idx, l4e);
+ if ( !mfn_eq(efi_l4_mfn, INVALID_MFN) )
+ {
+ l4_pgentry_t *efi_l4t = map_domain_page(efi_l4_mfn);
+
+ l4e_write(efi_l4t + l4idx, l4e);
+ unmap_domain_page(efi_l4t);
+ }
}
#endif
diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
index 2599ae50d2..74e23fbac8 100644
--- a/xen/common/efi/boot.c
+++ b/xen/common/efi/boot.c
@@ -1440,14 +1440,15 @@ custom_param("efi", parse_efi_param);
static __init void copy_mapping(unsigned long mfn, unsigned long end,
bool (*is_valid)(unsigned long smfn,
- unsigned long emfn))
+ unsigned long emfn),
+ l4_pgentry_t *efi_l4t)
{
unsigned long next;
l3_pgentry_t *l3src = NULL, *l3dst = NULL;
for ( ; mfn < end; mfn = next )
{
- l4_pgentry_t l4e = efi_l4_pgtable[l4_table_offset(mfn << PAGE_SHIFT)];
+ l4_pgentry_t l4e = efi_l4t[l4_table_offset(mfn << PAGE_SHIFT)];
unsigned long va = (unsigned long)mfn_to_virt(mfn);
if ( !((mfn << PAGE_SHIFT) & ((1UL << L4_PAGETABLE_SHIFT) - 1)) )
@@ -1466,7 +1467,7 @@ static __init void copy_mapping(unsigned long mfn,
unsigned long end,
l3dst = alloc_map_clear_xen_pt(&l3mfn);
BUG_ON(!l3dst);
- efi_l4_pgtable[l4_table_offset(mfn << PAGE_SHIFT)] =
+ efi_l4t[l4_table_offset(mfn << PAGE_SHIFT)] =
l4e_from_mfn(l3mfn, __PAGE_HYPERVISOR);
}
else
@@ -1499,6 +1500,7 @@ static bool __init rt_range_valid(unsigned long smfn,
unsigned long emfn)
void __init efi_init_memory(void)
{
unsigned int i;
+ l4_pgentry_t *efi_l4t;
struct rt_extra {
struct rt_extra *next;
unsigned long smfn, emfn;
@@ -1613,11 +1615,10 @@ void __init efi_init_memory(void)
* Set up 1:1 page tables for runtime calls. See SetVirtualAddressMap() in
* efi_exit_boot().
*/
- efi_l4_pgtable = alloc_xen_pagetable();
- BUG_ON(!efi_l4_pgtable);
- clear_page(efi_l4_pgtable);
+ efi_l4t = alloc_map_clear_xen_pt(&efi_l4_mfn);
+ BUG_ON(!efi_l4t);
- copy_mapping(0, max_page, ram_range_valid);
+ copy_mapping(0, max_page, ram_range_valid, efi_l4t);
/* Insert non-RAM runtime mappings inside the direct map. */
for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size )
@@ -1633,58 +1634,64 @@ void __init efi_init_memory(void)
copy_mapping(PFN_DOWN(desc->PhysicalStart),
PFN_UP(desc->PhysicalStart +
(desc->NumberOfPages << EFI_PAGE_SHIFT)),
- rt_range_valid);
+ rt_range_valid, efi_l4t);
}
/* Insert non-RAM runtime mappings outside of the direct map. */
while ( (extra = extra_head) != NULL )
{
unsigned long addr = extra->smfn << PAGE_SHIFT;
- l4_pgentry_t l4e = efi_l4_pgtable[l4_table_offset(addr)];
+ l4_pgentry_t l4e = efi_l4t[l4_table_offset(addr)];
l3_pgentry_t *pl3e;
l2_pgentry_t *pl2e;
l1_pgentry_t *l1t;
if ( !(l4e_get_flags(l4e) & _PAGE_PRESENT) )
{
- pl3e = alloc_xen_pagetable();
+ mfn_t l3mfn;
+
+ pl3e = alloc_map_clear_xen_pt(&l3mfn);
BUG_ON(!pl3e);
- clear_page(pl3e);
- efi_l4_pgtable[l4_table_offset(addr)] =
- l4e_from_paddr(virt_to_maddr(pl3e), __PAGE_HYPERVISOR);
+ efi_l4t[l4_table_offset(addr)] =
+ l4e_from_mfn(l3mfn, __PAGE_HYPERVISOR);
}
else
- pl3e = l4e_to_l3e(l4e);
+ pl3e = map_l3t_from_l4e(l4e);
pl3e += l3_table_offset(addr);
if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) )
{
- pl2e = alloc_xen_pagetable();
+ mfn_t l2mfn;
+
+ pl2e = alloc_map_clear_xen_pt(&l2mfn);
BUG_ON(!pl2e);
- clear_page(pl2e);
- *pl3e = l3e_from_paddr(virt_to_maddr(pl2e), __PAGE_HYPERVISOR);
+ *pl3e = l3e_from_mfn(l2mfn, __PAGE_HYPERVISOR);
}
else
{
BUG_ON(l3e_get_flags(*pl3e) & _PAGE_PSE);
- pl2e = l3e_to_l2e(*pl3e);
+ pl2e = map_l2t_from_l3e(*pl3e);
}
+ UNMAP_DOMAIN_PAGE(pl3e);
pl2e += l2_table_offset(addr);
if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) )
{
- l1t = alloc_xen_pagetable();
+ mfn_t l1mfn;
+
+ l1t = alloc_map_clear_xen_pt(&l1mfn);
BUG_ON(!l1t);
- clear_page(l1t);
- *pl2e = l2e_from_paddr(virt_to_maddr(l1t), __PAGE_HYPERVISOR);
+ *pl2e = l2e_from_mfn(l1mfn, __PAGE_HYPERVISOR);
}
else
{
BUG_ON(l2e_get_flags(*pl2e) & _PAGE_PSE);
- l1t = l2e_to_l1e(*pl2e);
+ l1t = map_l1t_from_l2e(*pl2e);
}
+ UNMAP_DOMAIN_PAGE(pl2e);
for ( i = l1_table_offset(addr);
i < L1_PAGETABLE_ENTRIES && extra->smfn < extra->emfn;
++i, ++extra->smfn )
l1t[i] = l1e_from_pfn(extra->smfn, extra->prot);
+ UNMAP_DOMAIN_PAGE(l1t);
if ( extra->smfn == extra->emfn )
{
@@ -1696,6 +1703,8 @@ void __init efi_init_memory(void)
/* Insert Xen mappings. */
for ( i = l4_table_offset(HYPERVISOR_VIRT_START);
i < l4_table_offset(DIRECTMAP_VIRT_END); ++i )
- efi_l4_pgtable[i] = idle_pg_table[i];
+ efi_l4t[i] = idle_pg_table[i];
+
+ unmap_domain_page(efi_l4t);
}
#endif
diff --git a/xen/common/efi/efi.h b/xen/common/efi/efi.h
index 2e38d05f3d..e364bae3e0 100644
--- a/xen/common/efi/efi.h
+++ b/xen/common/efi/efi.h
@@ -6,6 +6,7 @@
#include <efi/eficapsule.h>
#include <efi/efiapi.h>
#include <xen/efi.h>
+#include <xen/mm.h>
#include <xen/spinlock.h>
#include <asm/page.h>
@@ -29,7 +30,7 @@ extern UINTN efi_memmap_size, efi_mdesc_size;
extern void *efi_memmap;
#ifdef CONFIG_X86
-extern l4_pgentry_t *efi_l4_pgtable;
+extern mfn_t efi_l4_mfn;
#endif
extern const struct efi_pci_rom *efi_pci_roms;
diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c
index 95367694b5..375b94229e 100644
--- a/xen/common/efi/runtime.c
+++ b/xen/common/efi/runtime.c
@@ -85,7 +85,7 @@ struct efi_rs_state efi_rs_enter(void)
static const u32 mxcsr = MXCSR_DEFAULT;
struct efi_rs_state state = { .cr3 = 0 };
- if ( !efi_l4_pgtable )
+ if ( mfn_eq(efi_l4_mfn, INVALID_MFN) )
return state;
state.cr3 = read_cr3();
@@ -111,7 +111,7 @@ struct efi_rs_state efi_rs_enter(void)
lgdt(&gdt_desc);
}
- switch_cr3_cr4(virt_to_maddr(efi_l4_pgtable), read_cr4());
+ switch_cr3_cr4(mfn_to_maddr(efi_l4_mfn), read_cr4());
return state;
}
@@ -140,9 +140,9 @@ void efi_rs_leave(struct efi_rs_state *state)
bool efi_rs_using_pgtables(void)
{
- return efi_l4_pgtable &&
+ return !mfn_eq(efi_l4_mfn, INVALID_MFN) &&
(smp_processor_id() == efi_rs_on_cpu) &&
- (read_cr3() == virt_to_maddr(efi_l4_pgtable));
+ (read_cr3() == mfn_to_maddr(efi_l4_mfn));
}
unsigned long efi_get_time(void)
--
2.24.1.AMZN
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |