system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86/mm/pat: Make set_memory_np() L1TF safe

Browse source 
set_memory_np() is used to mark kernel mappings not present, but it has
it's own open coded mechanism which does not have the L1TF protection of
inverting the address bits.

Replace the open coded PTE manipulation with the L1TF protecting low level
PTE routines.

Passes the CPA self test.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Andi Kleen 2018-08-07 15:09:39 -07:00 committed by Thomas Gleixner
parent 0768f91530
commit 958f79b9ee
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/mm/pageattr.c
View file

@ -1014,8 +1014,8 @@ static long populate_pmd(struct cpa_data *cpa,
pmd = pmd_offset(pud, start); pmd = pmd_offset(pud, start);
set_pmd(pmd, __pmd(cpa->pfn << PAGE_SHIFT | _PAGE_PSE | set_pmd(pmd, pmd_mkhuge(pfn_pmd(cpa->pfn,
massage_pgprot(pmd_pgprot))); canon_pgprot(pmd_pgprot))));
start += PMD_SIZE; start += PMD_SIZE;
cpa->pfn += PMD_SIZE >> PAGE_SHIFT; cpa->pfn += PMD_SIZE >> PAGE_SHIFT;
@ -1087,8 +1087,8 @@ static int populate_pud(struct cpa_data *cpa, unsigned long start, p4d_t *p4d,
* Map everything starting from the Gb boundary, possibly with 1G pages * Map everything starting from the Gb boundary, possibly with 1G pages
*/ */
while (boot_cpu_has(X86_FEATURE_GBPAGES) && end - start >= PUD_SIZE) { while (boot_cpu_has(X86_FEATURE_GBPAGES) && end - start >= PUD_SIZE) {
set_pud(pud, __pud(cpa->pfn << PAGE_SHIFT | _PAGE_PSE | set_pud(pud, pud_mkhuge(pfn_pud(cpa->pfn,
massage_pgprot(pud_pgprot))); canon_pgprot(pud_pgprot))));
start += PUD_SIZE; start += PUD_SIZE;
cpa->pfn += PUD_SIZE >> PAGE_SHIFT; cpa->pfn += PUD_SIZE >> PAGE_SHIFT;