On Fri, Apr 19, 2019 at 4:58 PM Baoquan He <bhe@xxxxxxxxxx> wrote:
>
> On 04/19/19 at 04:34pm, Kairui Song wrote:
> > /* Locates and clears a region for a new top level page table. */
> > void initialize_identity_maps(void)
> > {
> > - /* If running as an SEV guest, the encryption mask is required. */
> > - set_sev_encryption_mask();
> > -
> > - /* Exclude the encryption mask from __PHYSICAL_MASK */
> > - physical_mask &= ~sme_me_mask;
> > -
> > - /* Init mapping_info with run-time function/buffer pointers. */
> > - mapping_info.alloc_pgt_page = alloc_pgt_page;
> > - mapping_info.context = &pgt_data;
> > - mapping_info.page_flag = __PAGE_KERNEL_LARGE_EXEC | sme_me_mask;
> > - mapping_info.kernpg_flag = _KERNPG_TABLE;
> > -
> > - /*
> > - * It should be impossible for this not to already be true,
> > - * but since calling this a second time would rewind the other
> > - * counters, let's just make sure this is reset too.
> > - */
> > - pgt_data.pgt_buf_offset = 0;
> > -
> > - /*
> > - * If we came here via startup_32(), cr3 will be _pgtable already
> > - * and we must append to the existing area instead of entirely
> > - * overwriting it.
> > - *
> > - * With 5-level paging, we use '_pgtable' to allocate the p4d page table,
> > - * the top-level page table is allocated separately.
> > - *
> > - * p4d_offset(top_level_pgt, 0) would cover both the 4- and 5-level
> > - * cases. On 4-level paging it's equal to 'top_level_pgt'.
> > - */
> > - top_level_pgt = read_cr3_pa();
> > - if (p4d_offset((pgd_t *)top_level_pgt, 0) == (p4d_t *)_pgtable) {
> > - debug_putstr("booted via startup_32()\n");
> > - pgt_data.pgt_buf = _pgtable + BOOT_INIT_PGT_SIZE;
> > - pgt_data.pgt_buf_size = BOOT_PGT_SIZE - BOOT_INIT_PGT_SIZE;
> > - memset(pgt_data.pgt_buf, 0, pgt_data.pgt_buf_size);
> > - } else {
> > - debug_putstr("booted via startup_64()\n");
> > - pgt_data.pgt_buf = _pgtable;
> > - pgt_data.pgt_buf_size = BOOT_PGT_SIZE;
> > - memset(pgt_data.pgt_buf, 0, pgt_data.pgt_buf_size);
> > + top_level_pgt = early_boot_top_pgt;
> > + if ((p4d_t *)top_level_pgt != (p4d_t *)_pgtable)
> > top_level_pgt = (unsigned long)alloc_pgt_page(&pgt_data);
>
> Kairui, will you make a patchset to include these changes separately
> later on? I don't get the purposes of code changes. E.g here, I
> don't know why you introduce a new variable early_boot_top_pgt, and
> allocate the page table, even though they have been done in the old
> initialize_identity_maps().
>
> Thanks
> Baoquan
>
OK, right, it's not a good idea to mess up things together, I'll
resend the patch, and will sent the cleanup separately. Without clean
up it may bring in some extra burden with certain kernel config, but
that should be OK for the fix.
--
Best Regards,
Kairui Song
_______________________________________________
kexec mailing list
kexec@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/kexec
