tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: KVM: arm64: Add support for non-cacheable mappings

Browse Source 
Hypervisor vendor modules may need to create non-cacheable mappings in
the hypervisor stage-1 for interacting with devices such as IOMMUs.

Extend the stage-2 support in the KVM pgtable API so that non-cacheable
mappings can also be created for stage-1.

Bug: 357781595
Bug: 244373730
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I2f88db7fe47e16366018e3e48f30d09b299ae6e4
This commit is contained in:
Will Deacon
2022-12-13 21:19:25 +00:00
parent fe2a7d4a0b
commit c6661dea01
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/kvm/hyp/pgtable.c
+18 -5
View File
@@ -327,22 +327,35 @@ struct hyp_map_data {
static int hyp_set_prot_attr(enum kvm_pgtable_prot prot, kvm_pte_t *ptep)
{
bool device = prot & KVM_PGTABLE_PROT_DEVICE;
u32 mtype = device ? MT_DEVICE_nGnRE : MT_NORMAL;
kvm_pte_t attr = FIELD_PREP(KVM_PTE_LEAF_ATTR_LO_S1_ATTRIDX, mtype);
u32 sh = KVM_PTE_LEAF_ATTR_LO_S1_SH_IS;
u32 ap = (prot & KVM_PGTABLE_PROT_W) ? KVM_PTE_LEAF_ATTR_LO_S1_AP_RW :
KVM_PTE_LEAF_ATTR_LO_S1_AP_RO;
u32 sh = KVM_PTE_LEAF_ATTR_LO_S1_SH_IS;
kvm_pte_t attr;
u32 mtype;
if (!(prot & KVM_PGTABLE_PROT_R) ||
(prot & (KVM_PGTABLE_PROT_PXN | KVM_PGTABLE_PROT_UXN)))
return -EINVAL;
switch (prot & (KVM_PGTABLE_PROT_DEVICE | KVM_PGTABLE_PROT_NORMAL_NC)) {
case KVM_PGTABLE_PROT_DEVICE | KVM_PGTABLE_PROT_NORMAL_NC:
return -EINVAL;
case KVM_PGTABLE_PROT_DEVICE:
mtype = MT_DEVICE_nGnRE;
break;
case KVM_PGTABLE_PROT_NORMAL_NC:
mtype = MT_NORMAL_NC;
break;
default:
mtype = MT_NORMAL;
}
attr = FIELD_PREP(KVM_PTE_LEAF_ATTR_LO_S1_ATTRIDX, mtype);
if (prot & KVM_PGTABLE_PROT_X) {
if (prot & KVM_PGTABLE_PROT_W)
return -EINVAL;
if (device)
if (mtype != MT_NORMAL)
return -EINVAL;
if (system_supports_bti_kernel())