Re: [PATCH 5/5] efi: Split efi_enter_virtual_mode
On Mon, 20 Jan, at 02:46:25PM, Borislav Petkov wrote:
> On Mon, Jan 20, 2014 at 01:44:07PM +, Matt Fleming wrote:
> > > +void __init kexec_enter_virtual_mode(void)
> > > +{
> >
> > Could this be static for now?
>
> Didn't you wanna do arch/x86/platform/efi/kexec.c anyway?
Yes, but the patches are easier to review if we make
kexec_enter_virtual_mode() global when moving it into a new file.
Plus it makes this patch that little bit smaller because the
modification to efi.h is unnecessary.
--
Matt Fleming, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 5/5] efi: Split efi_enter_virtual_mode
On Mon, Jan 20, 2014 at 01:44:07PM +, Matt Fleming wrote:
> > +void __init kexec_enter_virtual_mode(void)
> > +{
>
> Could this be static for now?
Didn't you wanna do arch/x86/platform/efi/kexec.c anyway?
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 5/5] efi: Split efi_enter_virtual_mode
On Sat, 18 Jan, at 12:48:18PM, Borislav Petkov wrote:
> From: Borislav Petkov
>
> ... into a kexec flavor for better code readability and simplicity. The
> original one was getting ugly with ifdeffery.
>
> Signed-off-by: Borislav Petkov
> Tested-by: Toshi Kani
> ---
> arch/x86/platform/efi/efi.c | 148
> +---
> include/linux/efi.h | 1 +
> 2 files changed, 99 insertions(+), 50 deletions(-)
[...]
> @@ -1001,6 +986,72 @@ static void * __init efi_map_regions(int *count, int
> *pg_shift)
> return new_memmap;
> }
>
> +void __init kexec_enter_virtual_mode(void)
> +{
Could this be static for now?
> diff --git a/include/linux/efi.h b/include/linux/efi.h
> index 0a819e7a60c9..44ea66ce41e0 100644
> --- a/include/linux/efi.h
> +++ b/include/linux/efi.h
> @@ -594,6 +594,7 @@ extern void efi_map_pal_code (void);
> extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg);
> extern void efi_gettimeofday (struct timespec *ts);
> extern void efi_enter_virtual_mode (void); /* switch EFI to virtual mode,
> if possible */
> +extern void kexec_enter_virtual_mode(void);
> #ifdef CONFIG_X86
> extern void efi_late_init(void);
> extern void efi_free_boot_services(void);
Which would allow us to drop this change.
--
Matt Fleming, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 5/5] efi: Split efi_enter_virtual_mode
On Sat, 18 Jan, at 12:48:18PM, Borislav Petkov wrote:
From: Borislav Petkov b...@suse.de
... into a kexec flavor for better code readability and simplicity. The
original one was getting ugly with ifdeffery.
Signed-off-by: Borislav Petkov b...@suse.de
Tested-by: Toshi Kani toshi.k...@hp.com
---
arch/x86/platform/efi/efi.c | 148
+---
include/linux/efi.h | 1 +
2 files changed, 99 insertions(+), 50 deletions(-)
[...]
@@ -1001,6 +986,72 @@ static void * __init efi_map_regions(int *count, int
*pg_shift)
return new_memmap;
}
+void __init kexec_enter_virtual_mode(void)
+{
Could this be static for now?
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 0a819e7a60c9..44ea66ce41e0 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -594,6 +594,7 @@ extern void efi_map_pal_code (void);
extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg);
extern void efi_gettimeofday (struct timespec *ts);
extern void efi_enter_virtual_mode (void); /* switch EFI to virtual mode,
if possible */
+extern void kexec_enter_virtual_mode(void);
#ifdef CONFIG_X86
extern void efi_late_init(void);
extern void efi_free_boot_services(void);
Which would allow us to drop this change.
--
Matt Fleming, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 5/5] efi: Split efi_enter_virtual_mode
On Mon, Jan 20, 2014 at 01:44:07PM +, Matt Fleming wrote:
+void __init kexec_enter_virtual_mode(void)
+{
Could this be static for now?
Didn't you wanna do arch/x86/platform/efi/kexec.c anyway?
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 5/5] efi: Split efi_enter_virtual_mode
On Mon, 20 Jan, at 02:46:25PM, Borislav Petkov wrote:
On Mon, Jan 20, 2014 at 01:44:07PM +, Matt Fleming wrote:
+void __init kexec_enter_virtual_mode(void)
+{
Could this be static for now?
Didn't you wanna do arch/x86/platform/efi/kexec.c anyway?
Yes, but the patches are easier to review if we make
kexec_enter_virtual_mode() global when moving it into a new file.
Plus it makes this patch that little bit smaller because the
modification to efi.h is unnecessary.
--
Matt Fleming, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 5/5] efi: Split efi_enter_virtual_mode
From: Borislav Petkov
... into a kexec flavor for better code readability and simplicity. The
original one was getting ugly with ifdeffery.
Signed-off-by: Borislav Petkov
Tested-by: Toshi Kani
---
arch/x86/platform/efi/efi.c | 148 +---
include/linux/efi.h | 1 +
2 files changed, 99 insertions(+), 50 deletions(-)
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index b79a85c8a6aa..bcc3e5117fd7 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -891,8 +891,9 @@ static void __init get_systab_virt_addr(efi_memory_desc_t
*md)
}
}
-static int __init save_runtime_map(void)
+static void __init save_runtime_map(void)
{
+#ifdef CONFIG_KEXEC
efi_memory_desc_t *md;
void *tmp, *p, *q = NULL;
int count = 0;
@@ -914,28 +915,12 @@ static int __init save_runtime_map(void)
}
efi_runtime_map_setup(q, count, memmap.desc_size);
+ return;
- return 0;
out:
kfree(q);
- return -ENOMEM;
-}
-
-/*
- * Map efi regions which were passed via setup_data. The virt_addr is a fixed
- * addr which was used in first kernel of a kexec boot.
- */
-static void __init efi_map_regions_fixed(void)
-{
- void *p;
- efi_memory_desc_t *md;
-
- for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
- md = p;
- efi_map_region_fixed(md); /* FIXME: add error handling */
- get_systab_virt_addr(md);
- }
-
+ pr_err("Error saving runtime map, efi runtime on kexec
non-functional!!\n");
+#endif
}
static void *realloc_pages(void *old_memmap, int old_shift)
@@ -1001,6 +986,72 @@ static void * __init efi_map_regions(int *count, int
*pg_shift)
return new_memmap;
}
+void __init kexec_enter_virtual_mode(void)
+{
+#ifdef CONFIG_KEXEC
+ efi_memory_desc_t *md;
+ void *p;
+
+ efi.systab = NULL;
+
+ /*
+* We don't do virtual mode, since we don't do runtime services, on
+* non-native EFI
+*/
+ if (!efi_is_native()) {
+ efi_unmap_memmap();
+ return;
+ }
+
+ /*
+ * Map efi regions which were passed via setup_data. The virt_addr is a
+ * fixed addr which was used in first kernel of a kexec boot.
+ */
+ for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
+ md = p;
+ efi_map_region_fixed(md); /* FIXME: add error handling */
+ get_systab_virt_addr(md);
+ }
+
+ save_runtime_map();
+
+ BUG_ON(!efi.systab);
+
+ efi_sync_low_kernel_mappings();
+
+ /*
+* Now that EFI is in virtual mode, update the function
+* pointers in the runtime service table to the new virtual addresses.
+*
+* Call EFI services through wrapper functions.
+*/
+ efi.runtime_version = efi_systab.hdr.revision;
+ efi.get_time = virt_efi_get_time;
+ efi.set_time = virt_efi_set_time;
+ efi.get_wakeup_time = virt_efi_get_wakeup_time;
+ efi.set_wakeup_time = virt_efi_set_wakeup_time;
+ efi.get_variable = virt_efi_get_variable;
+ efi.get_next_variable = virt_efi_get_next_variable;
+ efi.set_variable = virt_efi_set_variable;
+ efi.get_next_high_mono_count = virt_efi_get_next_high_mono_count;
+ efi.reset_system = virt_efi_reset_system;
+ efi.set_virtual_address_map = NULL;
+ efi.query_variable_info = virt_efi_query_variable_info;
+ efi.update_capsule = virt_efi_update_capsule;
+ efi.query_capsule_caps = virt_efi_query_capsule_caps;
+
+ if (efi_enabled(EFI_OLD_MEMMAP) && (__supported_pte_mask & _PAGE_NX))
+ runtime_code_page_mkexec();
+
+ /* clean DUMMY object */
+ efi.set_variable(efi_dummy_name, _DUMMY_GUID,
+EFI_VARIABLE_NON_VOLATILE |
+EFI_VARIABLE_BOOTSERVICE_ACCESS |
+EFI_VARIABLE_RUNTIME_ACCESS,
+0, NULL);
+#endif
+}
+
/*
* This function will switch the EFI runtime services to virtual mode.
* Essentially, we look through the EFI memmap and map every region that
@@ -1020,11 +1071,12 @@ static void * __init efi_map_regions(int *count, int
*pg_shift)
*
* Specially for kexec boot, efi runtime maps in previous kernel should
* be passed in via setup_data. In that case runtime ranges will be mapped
- * to the same virtual addresses as the first kernel.
+ * to the same virtual addresses as the first kernel, see
+ * kexec_enter_virtual_mode().
*/
-void __init efi_enter_virtual_mode(void)
+static void __init __efi_enter_virtual_mode(void)
{
- int err, count = 0, pg_shift = 0;
+ int count = 0, pg_shift = 0;
void *new_memmap = NULL;
efi_status_t status;
@@ -1039,43 +1091,33 @@ void __init efi_enter_virtual_mode(void)
return;
}
[PATCH 5/5] efi: Split efi_enter_virtual_mode
From: Borislav Petkov b...@suse.de
... into a kexec flavor for better code readability and simplicity. The
original one was getting ugly with ifdeffery.
Signed-off-by: Borislav Petkov b...@suse.de
Tested-by: Toshi Kani toshi.k...@hp.com
---
arch/x86/platform/efi/efi.c | 148 +---
include/linux/efi.h | 1 +
2 files changed, 99 insertions(+), 50 deletions(-)
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index b79a85c8a6aa..bcc3e5117fd7 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -891,8 +891,9 @@ static void __init get_systab_virt_addr(efi_memory_desc_t
*md)
}
}
-static int __init save_runtime_map(void)
+static void __init save_runtime_map(void)
{
+#ifdef CONFIG_KEXEC
efi_memory_desc_t *md;
void *tmp, *p, *q = NULL;
int count = 0;
@@ -914,28 +915,12 @@ static int __init save_runtime_map(void)
}
efi_runtime_map_setup(q, count, memmap.desc_size);
+ return;
- return 0;
out:
kfree(q);
- return -ENOMEM;
-}
-
-/*
- * Map efi regions which were passed via setup_data. The virt_addr is a fixed
- * addr which was used in first kernel of a kexec boot.
- */
-static void __init efi_map_regions_fixed(void)
-{
- void *p;
- efi_memory_desc_t *md;
-
- for (p = memmap.map; p memmap.map_end; p += memmap.desc_size) {
- md = p;
- efi_map_region_fixed(md); /* FIXME: add error handling */
- get_systab_virt_addr(md);
- }
-
+ pr_err(Error saving runtime map, efi runtime on kexec
non-functional!!\n);
+#endif
}
static void *realloc_pages(void *old_memmap, int old_shift)
@@ -1001,6 +986,72 @@ static void * __init efi_map_regions(int *count, int
*pg_shift)
return new_memmap;
}
+void __init kexec_enter_virtual_mode(void)
+{
+#ifdef CONFIG_KEXEC
+ efi_memory_desc_t *md;
+ void *p;
+
+ efi.systab = NULL;
+
+ /*
+* We don't do virtual mode, since we don't do runtime services, on
+* non-native EFI
+*/
+ if (!efi_is_native()) {
+ efi_unmap_memmap();
+ return;
+ }
+
+ /*
+ * Map efi regions which were passed via setup_data. The virt_addr is a
+ * fixed addr which was used in first kernel of a kexec boot.
+ */
+ for (p = memmap.map; p memmap.map_end; p += memmap.desc_size) {
+ md = p;
+ efi_map_region_fixed(md); /* FIXME: add error handling */
+ get_systab_virt_addr(md);
+ }
+
+ save_runtime_map();
+
+ BUG_ON(!efi.systab);
+
+ efi_sync_low_kernel_mappings();
+
+ /*
+* Now that EFI is in virtual mode, update the function
+* pointers in the runtime service table to the new virtual addresses.
+*
+* Call EFI services through wrapper functions.
+*/
+ efi.runtime_version = efi_systab.hdr.revision;
+ efi.get_time = virt_efi_get_time;
+ efi.set_time = virt_efi_set_time;
+ efi.get_wakeup_time = virt_efi_get_wakeup_time;
+ efi.set_wakeup_time = virt_efi_set_wakeup_time;
+ efi.get_variable = virt_efi_get_variable;
+ efi.get_next_variable = virt_efi_get_next_variable;
+ efi.set_variable = virt_efi_set_variable;
+ efi.get_next_high_mono_count = virt_efi_get_next_high_mono_count;
+ efi.reset_system = virt_efi_reset_system;
+ efi.set_virtual_address_map = NULL;
+ efi.query_variable_info = virt_efi_query_variable_info;
+ efi.update_capsule = virt_efi_update_capsule;
+ efi.query_capsule_caps = virt_efi_query_capsule_caps;
+
+ if (efi_enabled(EFI_OLD_MEMMAP) (__supported_pte_mask _PAGE_NX))
+ runtime_code_page_mkexec();
+
+ /* clean DUMMY object */
+ efi.set_variable(efi_dummy_name, EFI_DUMMY_GUID,
+EFI_VARIABLE_NON_VOLATILE |
+EFI_VARIABLE_BOOTSERVICE_ACCESS |
+EFI_VARIABLE_RUNTIME_ACCESS,
+0, NULL);
+#endif
+}
+
/*
* This function will switch the EFI runtime services to virtual mode.
* Essentially, we look through the EFI memmap and map every region that
@@ -1020,11 +1071,12 @@ static void * __init efi_map_regions(int *count, int
*pg_shift)
*
* Specially for kexec boot, efi runtime maps in previous kernel should
* be passed in via setup_data. In that case runtime ranges will be mapped
- * to the same virtual addresses as the first kernel.
+ * to the same virtual addresses as the first kernel, see
+ * kexec_enter_virtual_mode().
*/
-void __init efi_enter_virtual_mode(void)
+static void __init __efi_enter_virtual_mode(void)
{
- int err, count = 0, pg_shift = 0;
+ int count = 0, pg_shift = 0;
void *new_memmap = NULL;
efi_status_t status;
@@ -1039,43 +1091,33 @@ void __init efi_enter_virtual_mode(void)
