Hi Pavel,
On 21/08/2019 19:31, Pavel Tatashin wrote:
> Currently, trans_pgd_map_page has assumptions that are relevant to
> hibernate. But, to make it generic we must allow it to use any allocator
Sounds familiar: you removed this in patch 2.
> and also, can't assume that entries do not exist in the page table
> already.
This thing creates a set of page tables to map one page: the relocation code.
This is mapped in TTBR0_EL1.
It can assume existing entries do not exist, because it creates the single-entry levels as
it goes. Kexec also needs to map precisely one page for relocation. You don't need to
generalise this.
'trans_pgd_create_copy()' is what creates a copy the linear map. This is mapped in TTBR1_EL1.
There is no reason for kexec to behave differently here.
> Also, we can't use init_mm here.
Why not? arm64's pgd_populate() doesn't use the mm. It's only there to make it obvious
this is an EL1 mapping we are creating. We use the kernel-asid with the new mapping.
The __ version is a lot less readable. Please don't use the page tables as an array: this
is what the offset helpers are for.
> Also, add "flags" for trans_pgd_info, they are going to be used
> in copy functions once they are generalized.
You don't need to 'generalize' this to support hypothetical users.
There are only two: hibernate and kexec, both of which are very specialised. Making these
things top-level marionette strings will tangle the logic.
The copy_p?d() functions should decide if they should manipulate _this_ entry based on
_this_ entry and the kernel configuration. This is only really done in _copy_pte(), which
is where it should stay.
> diff --git a/arch/arm64/include/asm/trans_pgd.h b/arch/arm64/include/asm/trans_pgd.h
> index c7b5402b7d87..e3d022b1b526 100644
> --- a/arch/arm64/include/asm/trans_pgd.h
> +++ b/arch/arm64/include/asm/trans_pgd.h
> @@ -11,10 +11,45 @@
> #include <linux/bits.h>
> #include <asm/pgtable-types.h>
>
> +/*
> + * trans_alloc_page
> + * - Allocator that should return exactly one uninitilaized page, if this
> + * allocator fails, trans_pgd returns -ENOMEM error.
> + *
> + * trans_alloc_arg
> + * - Passed to trans_alloc_page as an argument
This is very familiar.
> + * trans_flags
> + * - bitmap with flags that control how page table is filled.
> + * TRANS_MKWRITE: during page table copy make PTE, PME, and PUD page
> + * writeable by removing RDONLY flag from PTE.
Why would you ever keep the read-only flags in a set of page tables that exist to let you
overwrite memory?
> + * TRANS_MKVALID: during page table copy, if PTE present, but not valid,
> + * make it valid.
Please keep this logic together with the !pte_none(pte) and debug_pagealloc_enabled()
check, where it is today.
Making an entry valid without those checks should never be necessary.
> + * TRANS_CHECKPFN: During page table copy, for every PTE entry check that
> + * PFN that this PTE points to is valid. Otherwise return
> + * -ENXIO
Hibernate does this when inventing a new mapping. This is how we check the kernel
should be able to read/write this page. If !pfn_valid(), the page should not be mapped.
Why do you need to turn this off?
It us only necessary at the leaf level, and only if debug-pagealloc is in use. Please keep
all these bits together, as its much harder to understand why this entry needs inventing
when its split up like this.
> diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c
> index 6ee81bbaa37f..17426dc8cb54 100644
> --- a/arch/arm64/kernel/hibernate.c
> +++ b/arch/arm64/kernel/hibernate.c
> @@ -179,6 +179,12 @@ int arch_hibernation_header_restore(void *addr)
> }
> EXPORT_SYMBOL(arch_hibernation_header_restore);
>
> +static void *
> +hibernate_page_alloc(void *arg)
> +{
> + return (void *)get_safe_page((gfp_t)(unsigned long)arg);
> +}
> +
> /*
> * Copies length bytes, starting at src_start into an new page,
> * perform cache maintentance, then maps it at the specified address low
> @@ -195,6 +201,11 @@ static int create_safe_exec_page(void *src_start, size_t length,
> unsigned long dst_addr,
> phys_addr_t *phys_dst_addr)
> {
> + struct trans_pgd_info trans_info = {
> + .trans_alloc_page = hibernate_page_alloc,
> + .trans_alloc_arg = (void *)GFP_ATOMIC,
> + .trans_flags = 0,
> + };
> void *page = (void *)get_safe_page(GFP_ATOMIC);
> pgd_t *trans_pgd;
> int rc;
> @@ -209,7 +220,7 @@ static int create_safe_exec_page(void *src_start, size_t length,
> if (!trans_pgd)
> return -ENOMEM;
>
> - rc = trans_pgd_map_page(trans_pgd, page, dst_addr,
> + rc = trans_pgd_map_page(&trans_info, trans_pgd, page, dst_addr,
> PAGE_KERNEL_EXEC);
> if (rc)
> return rc;
> diff --git a/arch/arm64/mm/trans_pgd.c b/arch/arm64/mm/trans_pgd.c
> index 00b62d8640c2..dbabccd78cc4 100644
> --- a/arch/arm64/mm/trans_pgd.c
> +++ b/arch/arm64/mm/trans_pgd.c
> @@ -17,6 +17,16 @@
> #include <asm/pgtable.h>
> #include <linux/suspend.h>
>
> +static void *trans_alloc(struct trans_pgd_info *info)
> +{
> + void *page = info->trans_alloc_page(info->trans_alloc_arg);
> +
> + if (page)
> + clear_page(page);
The hibernate allocator already does this. As your reason for doing this is to make this
faster, it seems odd we do this twice.
If zeroed pages are necessary, the allocator should do it. (It already needs to be a
use-case specific allocator)
> +
> + return page;
> +}
> +
> static void _copy_pte(pte_t *dst_ptep, pte_t *src_ptep, unsigned long addr)
> {
> pte_t pte = READ_ONCE(*src_ptep);
> @@ -172,40 +182,64 @@ int trans_pgd_create_copy(pgd_t **dst_pgdp, unsigned long start,
> return rc;
> }
>
> -int trans_pgd_map_page(pgd_t *trans_pgd, void *page, unsigned long dst_addr,
> - pgprot_t pgprot)
> +int trans_pgd_map_page(struct trans_pgd_info *info, pgd_t *trans_pgd,
> + void *page, unsigned long dst_addr, pgprot_t pgprot)
> {
> - pgd_t *pgdp;
> - pud_t *pudp;
> - pmd_t *pmdp;
> - pte_t *ptep;
> -
> - pgdp = pgd_offset_raw(trans_pgd, dst_addr);
> - if (pgd_none(READ_ONCE(*pgdp))) {
> - pudp = (void *)get_safe_page(GFP_ATOMIC);
> - if (!pudp)
> + int pgd_idx = pgd_index(dst_addr);
> + int pud_idx = pud_index(dst_addr);
> + int pmd_idx = pmd_index(dst_addr);
> + int pte_idx = pte_index(dst_addr);
Yuck.
> + pgd_t *pgdp = trans_pgd;
> + pgd_t pgd = READ_ONCE(pgdp[pgd_idx]);
> + pud_t *pudp, pud;
> + pmd_t *pmdp, pmd;
> + pte_t *ptep, pte;
> +
> + if (pgd_none(pgd)) {
> + pud_t *t = trans_alloc(info);
> +
> + if (!t)
> return -ENOMEM;
> - pgd_populate(&init_mm, pgdp, pudp);
> +
> + __pgd_populate(&pgdp[pgd_idx], __pa(t), PUD_TYPE_TABLE);
> + pgd = READ_ONCE(pgdp[pgd_idx]);
Please keep the pgd_populate() call. If there is some reason we can't pass init_mm, we can
pass NULL, or a fake mm pointer instead.
Going behind the page table helpers back to play with the table directly is a maintenance
headache.
> }
>
> - pudp = pud_offset(pgdp, dst_addr);
> - if (pud_none(READ_ONCE(*pudp))) {
> - pmdp = (void *)get_safe_page(GFP_ATOMIC);
> - if (!pmdp)
> + pudp = __va(pgd_page_paddr(pgd));
> + pud = READ_ONCE(pudp[pud_idx]);
> + if (pud_sect(pud)) {
> + return -ENXIO;
> + } else if (pud_none(pud) || pud_sect(pud)) {
> + pmd_t *t = trans_alloc(info);
> +
> + if (!t)
> return -ENOMEM;
Choke on block mappings? This should never happen because this function should only create
the tables necessary to map one page. Not a block mapping in sight.
(see my comments on patch 6)
Thanks,
James
_______________________________________________
kexec mailing list
kexec@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/kexec
