Skip to content

Commit 064ce6c

Browse files
codomaniabonzini
authored andcommitted
mm: x86: Invoke hypercall when page encryption status is changed
Invoke a hypercall when a memory region is changed from encrypted -> decrypted and vice versa. Hypervisor needs to know the page encryption status during the guest migration. Cc: Thomas Gleixner <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: Paolo Bonzini <[email protected]> Cc: Joerg Roedel <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Tom Lendacky <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Reviewed-by: Steve Rutherford <[email protected]> Reviewed-by: Venu Busireddy <[email protected]> Signed-off-by: Brijesh Singh <[email protected]> Signed-off-by: Ashish Kalra <[email protected]> Reviewed-by: Borislav Petkov <[email protected]> Message-Id: <0a237d5bb08793916c7790a3e653a2cbe7485761.1629726117.git.ashish.kalra@amd.com> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 08c2336 commit 064ce6c

File tree

6 files changed

+73
-9
lines changed

6 files changed

+73
-9
lines changed

arch/x86/include/asm/paravirt.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ static inline void paravirt_arch_exit_mmap(struct mm_struct *mm)
9797
PVOP_VCALL1(mmu.exit_mmap, mm);
9898
}
9999

100+
static inline void notify_page_enc_status_changed(unsigned long pfn,
101+
int npages, bool enc)
102+
{
103+
PVOP_VCALL3(mmu.notify_page_enc_status_changed, pfn, npages, enc);
104+
}
105+
100106
#ifdef CONFIG_PARAVIRT_XXL
101107
static inline void load_sp0(unsigned long sp0)
102108
{

arch/x86/include/asm/paravirt_types.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ struct pv_mmu_ops {
168168

169169
/* Hook for intercepting the destruction of an mm_struct. */
170170
void (*exit_mmap)(struct mm_struct *mm);
171+
void (*notify_page_enc_status_changed)(unsigned long pfn, int npages, bool enc);
171172

172173
#ifdef CONFIG_PARAVIRT_XXL
173174
struct paravirt_callee_save read_cr2;

arch/x86/include/asm/set_memory.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ int set_pages_rw(struct page *page, int numpages);
8383
int set_direct_map_invalid_noflush(struct page *page);
8484
int set_direct_map_default_noflush(struct page *page);
8585
bool kernel_page_present(struct page *page);
86+
void notify_range_enc_status_changed(unsigned long vaddr, int npages, bool enc);
8687

8788
extern int kernel_set_to_readonly;
8889

arch/x86/kernel/paravirt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ struct paravirt_patch_template pv_ops = {
296296
(void (*)(struct mmu_gather *, void *))tlb_remove_page,
297297

298298
.mmu.exit_mmap = paravirt_nop,
299+
.mmu.notify_page_enc_status_changed = paravirt_nop,
299300

300301
#ifdef CONFIG_PARAVIRT_XXL
301302
.mmu.read_cr2 = __PV_IS_CALLEE_SAVE(native_read_cr2),

arch/x86/mm/mem_encrypt.c

Lines changed: 58 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -228,29 +228,76 @@ void __init sev_setup_arch(void)
228228
swiotlb_adjust_size(size);
229229
}
230230

231-
static void __init __set_clr_pte_enc(pte_t *kpte, int level, bool enc)
231+
static unsigned long pg_level_to_pfn(int level, pte_t *kpte, pgprot_t *ret_prot)
232232
{
233-
pgprot_t old_prot, new_prot;
234-
unsigned long pfn, pa, size;
235-
pte_t new_pte;
233+
unsigned long pfn = 0;
234+
pgprot_t prot;
236235

237236
switch (level) {
238237
case PG_LEVEL_4K:
239238
pfn = pte_pfn(*kpte);
240-
old_prot = pte_pgprot(*kpte);
239+
prot = pte_pgprot(*kpte);
241240
break;
242241
case PG_LEVEL_2M:
243242
pfn = pmd_pfn(*(pmd_t *)kpte);
244-
old_prot = pmd_pgprot(*(pmd_t *)kpte);
243+
prot = pmd_pgprot(*(pmd_t *)kpte);
245244
break;
246245
case PG_LEVEL_1G:
247246
pfn = pud_pfn(*(pud_t *)kpte);
248-
old_prot = pud_pgprot(*(pud_t *)kpte);
247+
prot = pud_pgprot(*(pud_t *)kpte);
249248
break;
250249
default:
251-
return;
250+
WARN_ONCE(1, "Invalid level for kpte\n");
251+
return 0;
252252
}
253253

254+
if (ret_prot)
255+
*ret_prot = prot;
256+
257+
return pfn;
258+
}
259+
260+
void notify_range_enc_status_changed(unsigned long vaddr, int npages, bool enc)
261+
{
262+
#ifdef CONFIG_PARAVIRT
263+
unsigned long sz = npages << PAGE_SHIFT;
264+
unsigned long vaddr_end = vaddr + sz;
265+
266+
while (vaddr < vaddr_end) {
267+
int psize, pmask, level;
268+
unsigned long pfn;
269+
pte_t *kpte;
270+
271+
kpte = lookup_address(vaddr, &level);
272+
if (!kpte || pte_none(*kpte)) {
273+
WARN_ONCE(1, "kpte lookup for vaddr\n");
274+
return;
275+
}
276+
277+
pfn = pg_level_to_pfn(level, kpte, NULL);
278+
if (!pfn)
279+
continue;
280+
281+
psize = page_level_size(level);
282+
pmask = page_level_mask(level);
283+
284+
notify_page_enc_status_changed(pfn, psize >> PAGE_SHIFT, enc);
285+
286+
vaddr = (vaddr & pmask) + psize;
287+
}
288+
#endif
289+
}
290+
291+
static void __init __set_clr_pte_enc(pte_t *kpte, int level, bool enc)
292+
{
293+
pgprot_t old_prot, new_prot;
294+
unsigned long pfn, pa, size;
295+
pte_t new_pte;
296+
297+
pfn = pg_level_to_pfn(level, kpte, &old_prot);
298+
if (!pfn)
299+
return;
300+
254301
new_prot = old_prot;
255302
if (enc)
256303
pgprot_val(new_prot) |= _PAGE_ENC;
@@ -285,12 +332,13 @@ static void __init __set_clr_pte_enc(pte_t *kpte, int level, bool enc)
285332
static int __init early_set_memory_enc_dec(unsigned long vaddr,
286333
unsigned long size, bool enc)
287334
{
288-
unsigned long vaddr_end, vaddr_next;
335+
unsigned long vaddr_end, vaddr_next, start;
289336
unsigned long psize, pmask;
290337
int split_page_size_mask;
291338
int level, ret;
292339
pte_t *kpte;
293340

341+
start = vaddr;
294342
vaddr_next = vaddr;
295343
vaddr_end = vaddr + size;
296344

@@ -345,6 +393,7 @@ static int __init early_set_memory_enc_dec(unsigned long vaddr,
345393

346394
ret = 0;
347395

396+
notify_range_enc_status_changed(start, PAGE_ALIGN(size) >> PAGE_SHIFT, enc);
348397
out:
349398
__flush_tlb_all();
350399
return ret;

arch/x86/mm/pat/set_memory.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2020,6 +2020,12 @@ static int __set_memory_enc_dec(unsigned long addr, int numpages, bool enc)
20202020
*/
20212021
cpa_flush(&cpa, 0);
20222022

2023+
/*
2024+
* Notify hypervisor that a given memory range is mapped encrypted
2025+
* or decrypted.
2026+
*/
2027+
notify_range_enc_status_changed(addr, numpages, enc);
2028+
20232029
return ret;
20242030
}
20252031

0 commit comments

Comments
 (0)