github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 12:44:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

KVM: x86/mmu: parameterize update_permission_bitmask()

Browse Source 
Make it possible to apply the computation loop to both guest
and shadow PTEs formats; the latter do not have an extended role, so
pass the four parameters to the function one by one.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2026-03-12 17:42:48 -04:00
parent c71239d463
commit 6bb13c2eb7
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86/kvm/mmu/mmu.c
View File

@ -5658,18 +5658,15 @@ reset_ept_shadow_zero_bits_mask(struct kvm_mmu *context, bool execonly)
(14 & (access) ? 1 << 14 : 0) | \
(15 & (access) ? 1 << 15 : 0))
static void update_permission_bitmask(struct kvm_pagewalk *pw, bool tdp, bool ept)
static void __update_permission_bitmask(struct kvm_page_format *fmt, bool tdp,
bool ept, bool cr4_smep, bool cr4_smap,
bool cr0_wp, bool efer_nx)
{
unsigned index;
const u16 w = ACC_BITS_MASK(ACC_WRITE_MASK);
const u16 r = ACC_BITS_MASK(ACC_READ_MASK);
bool cr4_smep = is_cr4_smep(pw);
bool cr4_smap = is_cr4_smap(pw);
bool cr0_wp = is_cr0_wp(pw);
bool efer_nx = is_efer_nx(pw);
/*
* In hardware, page fault error codes are generated (as the name
* suggests) on any kind of page fault. permission_fault() and
@ -5682,7 +5679,7 @@ static void update_permission_bitmask(struct kvm_pagewalk *pw, bool tdp, bool ep
* permission_fault() to indicate accesses that are *not* subject to
* SMAP restrictions.
*/
for (index = 0; index < ARRAY_SIZE(pw->fmt.permissions); ++index) {
for (index = 0; index < ARRAY_SIZE(fmt->permissions); ++index) {
unsigned pfec = index << 1;
/*
@ -5756,10 +5753,17 @@ static void update_permission_bitmask(struct kvm_pagewalk *pw, bool tdp, bool ep
smapf = (pfec & (PFERR_RSVD_MASK|PFERR_FETCH_MASK)) ? 0 : kf;
}
pw->fmt.permissions[index] = ff | uf | wf | rf | smapf;
fmt->permissions[index] = ff | uf | wf | rf | smapf;
}
}
static void update_permission_bitmask(struct kvm_pagewalk *w, bool tdp, bool ept)
{
__update_permission_bitmask(&w->fmt, tdp, ept,
is_cr4_smep(w), is_cr4_smap(w),
is_cr0_wp(w), is_efer_nx(w));
}
/*
* PKU is an additional mechanism by which the paging controls access to
* user-mode addresses based on the value in the PKRU register. Protection