shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: KVM: arm64: Add 'host_stage2_set_owner' to kvm_iommu_ops

Browse Source 
Add a new hook to kvm_iommu_ops that is invoked whenever a range of
pages changes their owner in the host stage2. This is currently limited
to finalize_host_mappings, which changes the owner of EL2-mapped pages
from host to hyp.

The driver is expected to apply corresponding changes in the IOMMU it
controls, so that only the new owner can access the page range.

Test: builds, boots
Bug: 190463801
Change-Id: I0809f4859a9117d1a37506b7aa9e19c6bd25ffdb
Signed-off-by: David Brazdil <dbrazdil@google.com>
(cherry picked from commit 3cd8b5b00b)
Signed-off-by: Mostafa Saleh <smostafa@google.com>
Signed-off-by: Quentin Perret <qperret@google.com>
This commit is contained in:
David Brazdil
2021-06-24 11:02:37 +00:00
committed by Quentin Perret
parent 90473cbd4b
commit 6cf8566b50
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/include/asm/kvm_hyp.h
View File

@@ -134,6 +134,7 @@ extern bool kvm_nvhe_sym(smccc_trng_available);
struct kvm_iommu_ops {
int (*init)(void);
bool (*host_smc_handler)(struct kvm_cpu_context *host_ctxt);
void (*host_stage2_set_owner)(phys_addr_t addr, size_t size, u8 owner_id);
};
extern struct kvm_iommu_ops kvm_iommu_ops;

10
arch/arm64/kvm/hyp/nvhe/mem_protect.c
View File

@@ -576,14 +576,20 @@ static kvm_pte_t kvm_init_invalid_leaf_owner(u8 owner_id)
int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id)
{
kvm_pte_t annotation;
int ret;
if (owner_id > KVM_MAX_OWNER_ID)
return -EINVAL;
annotation = kvm_init_invalid_leaf_owner(owner_id);
return host_stage2_try(kvm_pgtable_stage2_annotate, &host_mmu.pgt,
addr, size, &host_s2_pool, annotation);
ret = host_stage2_try(kvm_pgtable_stage2_annotate, &host_mmu.pgt,
addr, size, &host_s2_pool, annotation);
if (!ret && kvm_iommu_ops.host_stage2_set_owner)
kvm_iommu_ops.host_stage2_set_owner(addr, size, owner_id);
return ret;
}
static bool host_stage2_force_pte_cb(u64 addr, u64 end, enum kvm_pgtable_prot prot)