Commit 5879c97f authored by Will Deacon's avatar Will Deacon Committed by Marc Zyngier
Browse files

KVM: arm64: Remove redundant hyp_assert_lock_held() assertions 



host_stage2_try() asserts that the KVM host lock is held, so there's no
need to duplicate the assertion in its wrappers.

Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220609121223.2551-6-will@kernel.org
parent 112f3bab

arch/arm64/kvm/hyp/nvhe/mem_protect.c

+0 −4
Original line number Diff line number Diff line
@@ -314,15 +314,11 @@ static int host_stage2_adjust_range(u64 addr, struct kvm_mem_range *range) 
int host_stage2_idmap_locked(phys_addr_t addr, u64 size,

			     enum kvm_pgtable_prot prot)

{

	hyp_assert_lock_held(&host_kvm.lock);



	return host_stage2_try(__host_stage2_idmap, addr, addr + size, prot);

}



int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id)

{

	hyp_assert_lock_held(&host_kvm.lock);



	return host_stage2_try(kvm_pgtable_stage2_set_owner, &host_kvm.pgt,

			       addr, size, &host_s2_pool, owner_id);

}