* [PATCH 1/2] efi: Add efi_memmap_free() to free EFI memory map
@ 2019-09-25 9:17 Yunfeng Ye
2019-09-25 9:20 ` [PATCH 2/2] x86/efi: Fix memory leak for EFI memmap reservations Yunfeng Ye
2019-09-25 15:29 ` [PATCH 1/2] efi: Add efi_memmap_free() to free EFI memory map Ard Biesheuvel
0 siblings, 2 replies; 4+ messages in thread
From: Yunfeng Ye @ 2019-09-25 9:17 UTC (permalink / raw)
To: ard.biesheuvel, dvhart, andy, tglx, mingo, bp, hpa, x86
Cc: linux-efi, platform-driver-x86, linux-kernel
In efi_fake_memmap(), the commit 20b1e22d01a4 ("x86/efi: Don't allocate
memmap through memblock after mm_init()") replace memblock_alloc() with
efi_memmap_alloc(), but there is no matching modification of
memblock_free() when early_memremap() fail.
Fix this by adding efi_memmap_free() to instead of memblock_free().
Fixes: 20b1e22d01a4 ("x86/efi: Don't allocate memmap through memblock after mm_init()")
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
---
drivers/firmware/efi/fake_mem.c | 2 +-
drivers/firmware/efi/memmap.c | 34 ++++++++++++++++++++++++++++++++++
include/linux/efi.h | 1 +
3 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/drivers/firmware/efi/fake_mem.c b/drivers/firmware/efi/fake_mem.c
index 9501edc..c2f69f6 100644
--- a/drivers/firmware/efi/fake_mem.c
+++ b/drivers/firmware/efi/fake_mem.c
@@ -65,7 +65,7 @@ void __init efi_fake_memmap(void)
new_memmap = early_memremap(new_memmap_phy,
efi.memmap.desc_size * new_nr_map);
if (!new_memmap) {
- memblock_free(new_memmap_phy, efi.memmap.desc_size * new_nr_map);
+ efi_memmap_free(new_memmap_phy, new_nr_map);
return;
}
diff --git a/drivers/firmware/efi/memmap.c b/drivers/firmware/efi/memmap.c
index 38b686c..35dc189 100644
--- a/drivers/firmware/efi/memmap.c
+++ b/drivers/firmware/efi/memmap.c
@@ -18,6 +18,11 @@ static phys_addr_t __init __efi_memmap_alloc_early(unsigned long size)
return memblock_phys_alloc(size, SMP_CACHE_BYTES);
}
+static void __init __efi_memmap_free_early(phys_addr_t addr, unsigned long size)
+{
+ memblock_free(addr, size);
+}
+
static phys_addr_t __init __efi_memmap_alloc_late(unsigned long size)
{
unsigned int order = get_order(size);
@@ -29,6 +34,15 @@ static phys_addr_t __init __efi_memmap_alloc_late(unsigned long size)
return PFN_PHYS(page_to_pfn(p));
}
+static void __init __efi_memmap_free_late(phys_addr_t addr, unsigned long size)
+{
+ unsigned int order = get_order(size);
+ struct page *p = pfn_to_page(PHYS_PFN(addr));
+
+ if (p)
+ __free_pages(p, order);
+}
+
/**
* efi_memmap_alloc - Allocate memory for the EFI memory map
* @num_entries: Number of entries in the allocated map.
@@ -50,6 +64,26 @@ phys_addr_t __init efi_memmap_alloc(unsigned int num_entries)
}
/**
+ * efi_memmap_free - Free memory for the EFI memory map
+ * @addr: Physical address of the EFI memory map to be freed.
+ * @num_entries: Number of the EFI memory map entries.
+ *
+ * Depending on whether mm_init() has already been invoked or not,
+ * either memblock or "normal" page free is used.
+ */
+void __init efi_memmap_free(phys_addr_t addr, unsigned int num_entries)
+{
+ unsigned long size = num_entries * efi.memmap.desc_size;
+
+ if (slab_is_available()) {
+ __efi_memmap_free_late(addr, size);
+
+ return;
+ }
+ __efi_memmap_free_early(addr, size);
+}
+
+/**
* __efi_memmap_init - Common code for mapping the EFI memory map
* @data: EFI memory map data
* @late: Use early or late mapping function?
diff --git a/include/linux/efi.h b/include/linux/efi.h
index bd38370..8bb741a 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1057,6 +1057,7 @@ static inline efi_status_t efi_query_variable_store(u32 attributes,
extern void __iomem *efi_lookup_mapped_addr(u64 phys_addr);
extern phys_addr_t __init efi_memmap_alloc(unsigned int num_entries);
+extern void __init efi_memmap_free(phys_addr_t addr, unsigned int num_entries);
extern int __init efi_memmap_init_early(struct efi_memory_map_data *data);
extern int __init efi_memmap_init_late(phys_addr_t addr, unsigned long size);
extern void __init efi_memmap_unmap(void);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] x86/efi: Fix memory leak for EFI memmap reservations
2019-09-25 9:17 [PATCH 1/2] efi: Add efi_memmap_free() to free EFI memory map Yunfeng Ye
@ 2019-09-25 9:20 ` Yunfeng Ye
2019-09-25 15:29 ` [PATCH 1/2] efi: Add efi_memmap_free() to free EFI memory map Ard Biesheuvel
1 sibling, 0 replies; 4+ messages in thread
From: Yunfeng Ye @ 2019-09-25 9:20 UTC (permalink / raw)
To: ard.biesheuvel, dvhart, andy, tglx, mingo, bp, hpa, x86
Cc: linux-efi, platform-driver-x86, linux-kernel
There are some memory leaks in failure path after efi_memmap_alloc().
add efi_memmap_free() for this situation.
Fixes: 816e76129ed5 ("efi: Allow drivers to reserve boot services forever")
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
---
arch/x86/platform/efi/quirks.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
index 3b9fd67..a755f35 100644
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -285,6 +285,7 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size)
new = early_memremap(new_phys, new_size);
if (!new) {
+ efi_memmap_free(new_phys, num_entries);
pr_err("Failed to map new boot services memmap\n");
return;
}
@@ -470,6 +471,7 @@ void __init efi_free_boot_services(void)
new = memremap(new_phys, new_size, MEMREMAP_WB);
if (!new) {
+ efi_memmap_free(new_phys, num_entries);
pr_err("Failed to map new EFI memmap\n");
return;
}
@@ -493,6 +495,7 @@ void __init efi_free_boot_services(void)
memunmap(new);
if (efi_memmap_install(new_phys, num_entries)) {
+ efi_memmap_free(new_phys, num_entries);
pr_err("Could not install new EFI memmap\n");
return;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] efi: Add efi_memmap_free() to free EFI memory map
2019-09-25 9:17 [PATCH 1/2] efi: Add efi_memmap_free() to free EFI memory map Yunfeng Ye
2019-09-25 9:20 ` [PATCH 2/2] x86/efi: Fix memory leak for EFI memmap reservations Yunfeng Ye
@ 2019-09-25 15:29 ` Ard Biesheuvel
2019-09-26 10:31 ` Yunfeng Ye
1 sibling, 1 reply; 4+ messages in thread
From: Ard Biesheuvel @ 2019-09-25 15:29 UTC (permalink / raw)
To: Yunfeng Ye
Cc: Darren Hart, Andy Shevchenko, tglx, Ingo Molnar, Borislav Petkov,
H. Peter Anvin, the arch/x86 maintainers, linux-efi,
platform-driver-x86, linux-kernel
On Wed, 25 Sep 2019 at 11:17, Yunfeng Ye <yeyunfeng@huawei.com> wrote:
>
> In efi_fake_memmap(), the commit 20b1e22d01a4 ("x86/efi: Don't allocate
> memmap through memblock after mm_init()") replace memblock_alloc() with
> efi_memmap_alloc(), but there is no matching modification of
> memblock_free() when early_memremap() fail.
>
> Fix this by adding efi_memmap_free() to instead of memblock_free().
>
> Fixes: 20b1e22d01a4 ("x86/efi: Don't allocate memmap through memblock after mm_init()")
> Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
What happens if you try to call efi_memmap_free() /after/ slab has
become available on an allocation that was created before?
> ---
> drivers/firmware/efi/fake_mem.c | 2 +-
> drivers/firmware/efi/memmap.c | 34 ++++++++++++++++++++++++++++++++++
> include/linux/efi.h | 1 +
> 3 files changed, 36 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/fake_mem.c b/drivers/firmware/efi/fake_mem.c
> index 9501edc..c2f69f6 100644
> --- a/drivers/firmware/efi/fake_mem.c
> +++ b/drivers/firmware/efi/fake_mem.c
> @@ -65,7 +65,7 @@ void __init efi_fake_memmap(void)
> new_memmap = early_memremap(new_memmap_phy,
> efi.memmap.desc_size * new_nr_map);
> if (!new_memmap) {
> - memblock_free(new_memmap_phy, efi.memmap.desc_size * new_nr_map);
> + efi_memmap_free(new_memmap_phy, new_nr_map);
> return;
> }
>
> diff --git a/drivers/firmware/efi/memmap.c b/drivers/firmware/efi/memmap.c
> index 38b686c..35dc189 100644
> --- a/drivers/firmware/efi/memmap.c
> +++ b/drivers/firmware/efi/memmap.c
> @@ -18,6 +18,11 @@ static phys_addr_t __init __efi_memmap_alloc_early(unsigned long size)
> return memblock_phys_alloc(size, SMP_CACHE_BYTES);
> }
>
> +static void __init __efi_memmap_free_early(phys_addr_t addr, unsigned long size)
> +{
> + memblock_free(addr, size);
> +}
> +
> static phys_addr_t __init __efi_memmap_alloc_late(unsigned long size)
> {
> unsigned int order = get_order(size);
> @@ -29,6 +34,15 @@ static phys_addr_t __init __efi_memmap_alloc_late(unsigned long size)
> return PFN_PHYS(page_to_pfn(p));
> }
>
> +static void __init __efi_memmap_free_late(phys_addr_t addr, unsigned long size)
> +{
> + unsigned int order = get_order(size);
> + struct page *p = pfn_to_page(PHYS_PFN(addr));
> +
> + if (p)
> + __free_pages(p, order);
> +}
> +
> /**
> * efi_memmap_alloc - Allocate memory for the EFI memory map
> * @num_entries: Number of entries in the allocated map.
> @@ -50,6 +64,26 @@ phys_addr_t __init efi_memmap_alloc(unsigned int num_entries)
> }
>
> /**
> + * efi_memmap_free - Free memory for the EFI memory map
> + * @addr: Physical address of the EFI memory map to be freed.
> + * @num_entries: Number of the EFI memory map entries.
> + *
> + * Depending on whether mm_init() has already been invoked or not,
> + * either memblock or "normal" page free is used.
> + */
> +void __init efi_memmap_free(phys_addr_t addr, unsigned int num_entries)
> +{
> + unsigned long size = num_entries * efi.memmap.desc_size;
> +
> + if (slab_is_available()) {
> + __efi_memmap_free_late(addr, size);
> +
> + return;
> + }
> + __efi_memmap_free_early(addr, size);
> +}
> +
> +/**
> * __efi_memmap_init - Common code for mapping the EFI memory map
> * @data: EFI memory map data
> * @late: Use early or late mapping function?
> diff --git a/include/linux/efi.h b/include/linux/efi.h
> index bd38370..8bb741a 100644
> --- a/include/linux/efi.h
> +++ b/include/linux/efi.h
> @@ -1057,6 +1057,7 @@ static inline efi_status_t efi_query_variable_store(u32 attributes,
> extern void __iomem *efi_lookup_mapped_addr(u64 phys_addr);
>
> extern phys_addr_t __init efi_memmap_alloc(unsigned int num_entries);
> +extern void __init efi_memmap_free(phys_addr_t addr, unsigned int num_entries);
> extern int __init efi_memmap_init_early(struct efi_memory_map_data *data);
> extern int __init efi_memmap_init_late(phys_addr_t addr, unsigned long size);
> extern void __init efi_memmap_unmap(void);
> --
> 1.8.3.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] efi: Add efi_memmap_free() to free EFI memory map
2019-09-25 15:29 ` [PATCH 1/2] efi: Add efi_memmap_free() to free EFI memory map Ard Biesheuvel
@ 2019-09-26 10:31 ` Yunfeng Ye
0 siblings, 0 replies; 4+ messages in thread
From: Yunfeng Ye @ 2019-09-26 10:31 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Darren Hart, Andy Shevchenko, tglx, Ingo Molnar, Borislav Petkov,
H. Peter Anvin, the arch/x86 maintainers, linux-efi,
platform-driver-x86, linux-kernel
On 2019/9/25 23:29, Ard Biesheuvel wrote:
> On Wed, 25 Sep 2019 at 11:17, Yunfeng Ye <yeyunfeng@huawei.com> wrote:
>>
>> In efi_fake_memmap(), the commit 20b1e22d01a4 ("x86/efi: Don't allocate
>> memmap through memblock after mm_init()") replace memblock_alloc() with
>> efi_memmap_alloc(), but there is no matching modification of
>> memblock_free() when early_memremap() fail.
>>
>> Fix this by adding efi_memmap_free() to instead of memblock_free().
>>
>> Fixes: 20b1e22d01a4 ("x86/efi: Don't allocate memmap through memblock after mm_init()")
>> Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
>
> What happens if you try to call efi_memmap_free() /after/ slab has
> become available on an allocation that was created before?
>
I didn't met the failure path in efi_fake_memmap(), just looked at the code and
found that the memory allocation using efi_memmap_free(), but free memory using
memblock_free(), I think it's not correct.
Also another series patch "[PATCH 2/2] x86/efi: Fix memory leak for EFI memmap
reservations", using efi_memmap_free() for fixing the memory leak in the failure
path.
thanks.
>> ---
>> drivers/firmware/efi/fake_mem.c | 2 +-
>> drivers/firmware/efi/memmap.c | 34 ++++++++++++++++++++++++++++++++++
>> include/linux/efi.h | 1 +
>> 3 files changed, 36 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/firmware/efi/fake_mem.c b/drivers/firmware/efi/fake_mem.c
>> index 9501edc..c2f69f6 100644
>> --- a/drivers/firmware/efi/fake_mem.c
>> +++ b/drivers/firmware/efi/fake_mem.c
>> @@ -65,7 +65,7 @@ void __init efi_fake_memmap(void)
>> new_memmap = early_memremap(new_memmap_phy,
>> efi.memmap.desc_size * new_nr_map);
>> if (!new_memmap) {
>> - memblock_free(new_memmap_phy, efi.memmap.desc_size * new_nr_map);
>> + efi_memmap_free(new_memmap_phy, new_nr_map);
>> return;
>> }
>>
>> diff --git a/drivers/firmware/efi/memmap.c b/drivers/firmware/efi/memmap.c
>> index 38b686c..35dc189 100644
>> --- a/drivers/firmware/efi/memmap.c
>> +++ b/drivers/firmware/efi/memmap.c
>> @@ -18,6 +18,11 @@ static phys_addr_t __init __efi_memmap_alloc_early(unsigned long size)
>> return memblock_phys_alloc(size, SMP_CACHE_BYTES);
>> }
>>
>> +static void __init __efi_memmap_free_early(phys_addr_t addr, unsigned long size)
>> +{
>> + memblock_free(addr, size);
>> +}
>> +
>> static phys_addr_t __init __efi_memmap_alloc_late(unsigned long size)
>> {
>> unsigned int order = get_order(size);
>> @@ -29,6 +34,15 @@ static phys_addr_t __init __efi_memmap_alloc_late(unsigned long size)
>> return PFN_PHYS(page_to_pfn(p));
>> }
>>
>> +static void __init __efi_memmap_free_late(phys_addr_t addr, unsigned long size)
>> +{
>> + unsigned int order = get_order(size);
>> + struct page *p = pfn_to_page(PHYS_PFN(addr));
>> +
>> + if (p)
>> + __free_pages(p, order);
>> +}
>> +
>> /**
>> * efi_memmap_alloc - Allocate memory for the EFI memory map
>> * @num_entries: Number of entries in the allocated map.
>> @@ -50,6 +64,26 @@ phys_addr_t __init efi_memmap_alloc(unsigned int num_entries)
>> }
>>
>> /**
>> + * efi_memmap_free - Free memory for the EFI memory map
>> + * @addr: Physical address of the EFI memory map to be freed.
>> + * @num_entries: Number of the EFI memory map entries.
>> + *
>> + * Depending on whether mm_init() has already been invoked or not,
>> + * either memblock or "normal" page free is used.
>> + */
>> +void __init efi_memmap_free(phys_addr_t addr, unsigned int num_entries)
>> +{
>> + unsigned long size = num_entries * efi.memmap.desc_size;
>> +
>> + if (slab_is_available()) {
>> + __efi_memmap_free_late(addr, size);
>> +
>> + return;
>> + }
>> + __efi_memmap_free_early(addr, size);
>> +}
>> +
>> +/**
>> * __efi_memmap_init - Common code for mapping the EFI memory map
>> * @data: EFI memory map data
>> * @late: Use early or late mapping function?
>> diff --git a/include/linux/efi.h b/include/linux/efi.h
>> index bd38370..8bb741a 100644
>> --- a/include/linux/efi.h
>> +++ b/include/linux/efi.h
>> @@ -1057,6 +1057,7 @@ static inline efi_status_t efi_query_variable_store(u32 attributes,
>> extern void __iomem *efi_lookup_mapped_addr(u64 phys_addr);
>>
>> extern phys_addr_t __init efi_memmap_alloc(unsigned int num_entries);
>> +extern void __init efi_memmap_free(phys_addr_t addr, unsigned int num_entries);
>> extern int __init efi_memmap_init_early(struct efi_memory_map_data *data);
>> extern int __init efi_memmap_init_late(phys_addr_t addr, unsigned long size);
>> extern void __init efi_memmap_unmap(void);
>> --
>> 1.8.3.1
>>
>
> .
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-26 10:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-25 9:17 [PATCH 1/2] efi: Add efi_memmap_free() to free EFI memory map Yunfeng Ye
2019-09-25 9:20 ` [PATCH 2/2] x86/efi: Fix memory leak for EFI memmap reservations Yunfeng Ye
2019-09-25 15:29 ` [PATCH 1/2] efi: Add efi_memmap_free() to free EFI memory map Ard Biesheuvel
2019-09-26 10:31 ` Yunfeng Ye
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).