This functions returns a zeroed trans_table using the allocator that is
specified in the info argument.
trans_tables should be created by using this function.
Signed-off-by: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx>
---
arch/arm64/include/asm/trans_table.h | 4 ++++
arch/arm64/kernel/hibernate.c | 6 +++---
arch/arm64/mm/trans_table.c | 12 ++++++++++++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/include/asm/trans_table.h b/arch/arm64/include/asm/trans_table.h
index 1a57af09ded5..02d3a0333dc9 100644
--- a/arch/arm64/include/asm/trans_table.h
+++ b/arch/arm64/include/asm/trans_table.h
@@ -40,6 +40,10 @@ struct trans_table_info {
unsigned long trans_flags;
};
+/* Create and empty trans table. */
+int trans_table_create_empty(struct trans_table_info *info,
+ pgd_t **trans_table);
+
int trans_table_create_copy(pgd_t **dst_pgdp, unsigned long start,
unsigned long end);
diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c
index 524b68ec3233..3a7b362e5a58 100644
--- a/arch/arm64/kernel/hibernate.c
+++ b/arch/arm64/kernel/hibernate.c
@@ -216,9 +216,9 @@ static int create_safe_exec_page(void *src_start, size_t length,
memcpy(page, src_start, length);
__flush_icache_range((unsigned long)page, (unsigned long)page + length);
- trans_table = (void *)get_safe_page(GFP_ATOMIC);
- if (!trans_table)
- return -ENOMEM;
+ rc = trans_table_create_empty(&trans_info, &trans_table);
+ if (rc)
+ return rc;
rc = trans_table_map_page(&trans_info, trans_table, page, dst_addr,
PAGE_KERNEL_EXEC);
diff --git a/arch/arm64/mm/trans_table.c b/arch/arm64/mm/trans_table.c
index 12f4b3cab6d6..6deb35f83118 100644
--- a/arch/arm64/mm/trans_table.c
+++ b/arch/arm64/mm/trans_table.c
@@ -164,6 +164,18 @@ static int copy_page_tables(pgd_t *dst_pgdp, unsigned long start,
return 0;
}
+int trans_table_create_empty(struct trans_table_info *info, pgd_t **trans_table)
+{
+ pgd_t *dst_pgdp = trans_alloc(info);
+
+ if (!dst_pgdp)
+ return -ENOMEM;
+
+ *trans_table = dst_pgdp;
+
+ return 0;
+}
+
int trans_table_create_copy(pgd_t **dst_pgdp, unsigned long start,
unsigned long end)
{
--
2.22.1
_______________________________________________
kexec mailing list
kexec@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/kexec
