arm64: trans_pgd: pass allocator trans_pgd_create_copy
Make trans_pgd_create_copy and its subroutines to use allocator that is passed as an argument Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com> Reviewed-by: James Morse <james.morse@arm.com> Link: https://lore.kernel.org/r/20210125191923.1060122-6-pasha.tatashin@soleen.com Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
parent
50f53fb721
commit
89d1410f4a
|
@ -27,8 +27,8 @@ struct trans_pgd_info {
|
||||||
void *trans_alloc_arg;
|
void *trans_alloc_arg;
|
||||||
};
|
};
|
||||||
|
|
||||||
int trans_pgd_create_copy(pgd_t **dst_pgdp, unsigned long start,
|
int trans_pgd_create_copy(struct trans_pgd_info *info, pgd_t **trans_pgd,
|
||||||
unsigned long end);
|
unsigned long start, unsigned long end);
|
||||||
|
|
||||||
int trans_pgd_map_page(struct trans_pgd_info *info, pgd_t *trans_pgd,
|
int trans_pgd_map_page(struct trans_pgd_info *info, pgd_t *trans_pgd,
|
||||||
void *page, unsigned long dst_addr, pgprot_t pgprot);
|
void *page, unsigned long dst_addr, pgprot_t pgprot);
|
||||||
|
|
|
@ -437,13 +437,18 @@ int swsusp_arch_resume(void)
|
||||||
phys_addr_t phys_hibernate_exit;
|
phys_addr_t phys_hibernate_exit;
|
||||||
void __noreturn (*hibernate_exit)(phys_addr_t, phys_addr_t, void *,
|
void __noreturn (*hibernate_exit)(phys_addr_t, phys_addr_t, void *,
|
||||||
void *, phys_addr_t, phys_addr_t);
|
void *, phys_addr_t, phys_addr_t);
|
||||||
|
struct trans_pgd_info trans_info = {
|
||||||
|
.trans_alloc_page = hibernate_page_alloc,
|
||||||
|
.trans_alloc_arg = (void *)GFP_ATOMIC,
|
||||||
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Restoring the memory image will overwrite the ttbr1 page tables.
|
* Restoring the memory image will overwrite the ttbr1 page tables.
|
||||||
* Create a second copy of just the linear map, and use this when
|
* Create a second copy of just the linear map, and use this when
|
||||||
* restoring.
|
* restoring.
|
||||||
*/
|
*/
|
||||||
rc = trans_pgd_create_copy(&tmp_pg_dir, PAGE_OFFSET, PAGE_END);
|
rc = trans_pgd_create_copy(&trans_info, &tmp_pg_dir, PAGE_OFFSET,
|
||||||
|
PAGE_END);
|
||||||
if (rc)
|
if (rc)
|
||||||
return rc;
|
return rc;
|
||||||
|
|
||||||
|
|
|
@ -57,14 +57,14 @@ static void _copy_pte(pte_t *dst_ptep, pte_t *src_ptep, unsigned long addr)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int copy_pte(pmd_t *dst_pmdp, pmd_t *src_pmdp, unsigned long start,
|
static int copy_pte(struct trans_pgd_info *info, pmd_t *dst_pmdp,
|
||||||
unsigned long end)
|
pmd_t *src_pmdp, unsigned long start, unsigned long end)
|
||||||
{
|
{
|
||||||
pte_t *src_ptep;
|
pte_t *src_ptep;
|
||||||
pte_t *dst_ptep;
|
pte_t *dst_ptep;
|
||||||
unsigned long addr = start;
|
unsigned long addr = start;
|
||||||
|
|
||||||
dst_ptep = (pte_t *)get_safe_page(GFP_ATOMIC);
|
dst_ptep = trans_alloc(info);
|
||||||
if (!dst_ptep)
|
if (!dst_ptep)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
pmd_populate_kernel(&init_mm, dst_pmdp, dst_ptep);
|
pmd_populate_kernel(&init_mm, dst_pmdp, dst_ptep);
|
||||||
|
@ -78,8 +78,8 @@ static int copy_pte(pmd_t *dst_pmdp, pmd_t *src_pmdp, unsigned long start,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int copy_pmd(pud_t *dst_pudp, pud_t *src_pudp, unsigned long start,
|
static int copy_pmd(struct trans_pgd_info *info, pud_t *dst_pudp,
|
||||||
unsigned long end)
|
pud_t *src_pudp, unsigned long start, unsigned long end)
|
||||||
{
|
{
|
||||||
pmd_t *src_pmdp;
|
pmd_t *src_pmdp;
|
||||||
pmd_t *dst_pmdp;
|
pmd_t *dst_pmdp;
|
||||||
|
@ -87,7 +87,7 @@ static int copy_pmd(pud_t *dst_pudp, pud_t *src_pudp, unsigned long start,
|
||||||
unsigned long addr = start;
|
unsigned long addr = start;
|
||||||
|
|
||||||
if (pud_none(READ_ONCE(*dst_pudp))) {
|
if (pud_none(READ_ONCE(*dst_pudp))) {
|
||||||
dst_pmdp = (pmd_t *)get_safe_page(GFP_ATOMIC);
|
dst_pmdp = trans_alloc(info);
|
||||||
if (!dst_pmdp)
|
if (!dst_pmdp)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
pud_populate(&init_mm, dst_pudp, dst_pmdp);
|
pud_populate(&init_mm, dst_pudp, dst_pmdp);
|
||||||
|
@ -102,7 +102,7 @@ static int copy_pmd(pud_t *dst_pudp, pud_t *src_pudp, unsigned long start,
|
||||||
if (pmd_none(pmd))
|
if (pmd_none(pmd))
|
||||||
continue;
|
continue;
|
||||||
if (pmd_table(pmd)) {
|
if (pmd_table(pmd)) {
|
||||||
if (copy_pte(dst_pmdp, src_pmdp, addr, next))
|
if (copy_pte(info, dst_pmdp, src_pmdp, addr, next))
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
} else {
|
} else {
|
||||||
set_pmd(dst_pmdp,
|
set_pmd(dst_pmdp,
|
||||||
|
@ -113,7 +113,8 @@ static int copy_pmd(pud_t *dst_pudp, pud_t *src_pudp, unsigned long start,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int copy_pud(p4d_t *dst_p4dp, p4d_t *src_p4dp, unsigned long start,
|
static int copy_pud(struct trans_pgd_info *info, p4d_t *dst_p4dp,
|
||||||
|
p4d_t *src_p4dp, unsigned long start,
|
||||||
unsigned long end)
|
unsigned long end)
|
||||||
{
|
{
|
||||||
pud_t *dst_pudp;
|
pud_t *dst_pudp;
|
||||||
|
@ -122,7 +123,7 @@ static int copy_pud(p4d_t *dst_p4dp, p4d_t *src_p4dp, unsigned long start,
|
||||||
unsigned long addr = start;
|
unsigned long addr = start;
|
||||||
|
|
||||||
if (p4d_none(READ_ONCE(*dst_p4dp))) {
|
if (p4d_none(READ_ONCE(*dst_p4dp))) {
|
||||||
dst_pudp = (pud_t *)get_safe_page(GFP_ATOMIC);
|
dst_pudp = trans_alloc(info);
|
||||||
if (!dst_pudp)
|
if (!dst_pudp)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
p4d_populate(&init_mm, dst_p4dp, dst_pudp);
|
p4d_populate(&init_mm, dst_p4dp, dst_pudp);
|
||||||
|
@ -137,7 +138,7 @@ static int copy_pud(p4d_t *dst_p4dp, p4d_t *src_p4dp, unsigned long start,
|
||||||
if (pud_none(pud))
|
if (pud_none(pud))
|
||||||
continue;
|
continue;
|
||||||
if (pud_table(pud)) {
|
if (pud_table(pud)) {
|
||||||
if (copy_pmd(dst_pudp, src_pudp, addr, next))
|
if (copy_pmd(info, dst_pudp, src_pudp, addr, next))
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
} else {
|
} else {
|
||||||
set_pud(dst_pudp,
|
set_pud(dst_pudp,
|
||||||
|
@ -148,7 +149,8 @@ static int copy_pud(p4d_t *dst_p4dp, p4d_t *src_p4dp, unsigned long start,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int copy_p4d(pgd_t *dst_pgdp, pgd_t *src_pgdp, unsigned long start,
|
static int copy_p4d(struct trans_pgd_info *info, pgd_t *dst_pgdp,
|
||||||
|
pgd_t *src_pgdp, unsigned long start,
|
||||||
unsigned long end)
|
unsigned long end)
|
||||||
{
|
{
|
||||||
p4d_t *dst_p4dp;
|
p4d_t *dst_p4dp;
|
||||||
|
@ -162,15 +164,15 @@ static int copy_p4d(pgd_t *dst_pgdp, pgd_t *src_pgdp, unsigned long start,
|
||||||
next = p4d_addr_end(addr, end);
|
next = p4d_addr_end(addr, end);
|
||||||
if (p4d_none(READ_ONCE(*src_p4dp)))
|
if (p4d_none(READ_ONCE(*src_p4dp)))
|
||||||
continue;
|
continue;
|
||||||
if (copy_pud(dst_p4dp, src_p4dp, addr, next))
|
if (copy_pud(info, dst_p4dp, src_p4dp, addr, next))
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
} while (dst_p4dp++, src_p4dp++, addr = next, addr != end);
|
} while (dst_p4dp++, src_p4dp++, addr = next, addr != end);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int copy_page_tables(pgd_t *dst_pgdp, unsigned long start,
|
static int copy_page_tables(struct trans_pgd_info *info, pgd_t *dst_pgdp,
|
||||||
unsigned long end)
|
unsigned long start, unsigned long end)
|
||||||
{
|
{
|
||||||
unsigned long next;
|
unsigned long next;
|
||||||
unsigned long addr = start;
|
unsigned long addr = start;
|
||||||
|
@ -181,25 +183,34 @@ static int copy_page_tables(pgd_t *dst_pgdp, unsigned long start,
|
||||||
next = pgd_addr_end(addr, end);
|
next = pgd_addr_end(addr, end);
|
||||||
if (pgd_none(READ_ONCE(*src_pgdp)))
|
if (pgd_none(READ_ONCE(*src_pgdp)))
|
||||||
continue;
|
continue;
|
||||||
if (copy_p4d(dst_pgdp, src_pgdp, addr, next))
|
if (copy_p4d(info, dst_pgdp, src_pgdp, addr, next))
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
} while (dst_pgdp++, src_pgdp++, addr = next, addr != end);
|
} while (dst_pgdp++, src_pgdp++, addr = next, addr != end);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int trans_pgd_create_copy(pgd_t **dst_pgdp, unsigned long start,
|
/*
|
||||||
unsigned long end)
|
* Create trans_pgd and copy linear map.
|
||||||
|
* info: contains allocator and its argument
|
||||||
|
* dst_pgdp: new page table that is created, and to which map is copied.
|
||||||
|
* start: Start of the interval (inclusive).
|
||||||
|
* end: End of the interval (exclusive).
|
||||||
|
*
|
||||||
|
* Returns 0 on success, and -ENOMEM on failure.
|
||||||
|
*/
|
||||||
|
int trans_pgd_create_copy(struct trans_pgd_info *info, pgd_t **dst_pgdp,
|
||||||
|
unsigned long start, unsigned long end)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
pgd_t *trans_pgd = (pgd_t *)get_safe_page(GFP_ATOMIC);
|
pgd_t *trans_pgd = trans_alloc(info);
|
||||||
|
|
||||||
if (!trans_pgd) {
|
if (!trans_pgd) {
|
||||||
pr_err("Failed to allocate memory for temporary page tables.\n");
|
pr_err("Failed to allocate memory for temporary page tables.\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
rc = copy_page_tables(trans_pgd, start, end);
|
rc = copy_page_tables(info, trans_pgd, start, end);
|
||||||
if (!rc)
|
if (!rc)
|
||||||
*dst_pgdp = trans_pgd;
|
*dst_pgdp = trans_pgd;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue