Skip to content

Commit

Permalink
x86/mm/pageattr: Add a PGD pagetable populating function
Browse files Browse the repository at this point in the history
This allocates, if necessary, and populates the corresponding PGD entry
with a PUD page. The next population level is a dummy macro which will
be removed by the next patch and it is added here to keep the patch
small and easily reviewable but not break bisection, at the same time.

Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
  • Loading branch information
Borislav Petkov authored and Matt Fleming committed Nov 2, 2013
1 parent 0fd64c2 commit f3f7296
Showing 1 changed file with 39 additions and 0 deletions.
39 changes: 39 additions & 0 deletions arch/x86/mm/pageattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,45 @@ static int split_large_page(pte_t *kpte, unsigned long address)
return 0;
}

#define populate_pud(cpa, addr, pgd, pgprot) (-1)

/*
* Restrictions for kernel page table do not necessarily apply when mapping in
* an alternate PGD.
*/
static int populate_pgd(struct cpa_data *cpa, unsigned long addr)
{
pgprot_t pgprot = __pgprot(_KERNPG_TABLE);
bool allocd_pgd = false;
pgd_t *pgd_entry;
pud_t *pud = NULL; /* shut up gcc */
int ret;

pgd_entry = cpa->pgd + pgd_index(addr);

/*
* Allocate a PUD page and hand it down for mapping.
*/
if (pgd_none(*pgd_entry)) {
pud = (pud_t *)get_zeroed_page(GFP_KERNEL | __GFP_NOTRACK);
if (!pud)
return -1;

set_pgd(pgd_entry, __pgd(__pa(pud) | _KERNPG_TABLE));
allocd_pgd = true;
}

pgprot_val(pgprot) &= ~pgprot_val(cpa->mask_clr);
pgprot_val(pgprot) |= pgprot_val(cpa->mask_set);

ret = populate_pud(cpa, addr, pgd_entry, pgprot);
if (ret < 0)
return ret;

cpa->numpages = ret;
return 0;
}

static int __cpa_process_fault(struct cpa_data *cpa, unsigned long vaddr,
int primary)
{
Expand Down

0 comments on commit f3f7296

Please sign in to comment.