Commit 4319fa12 authored by Liao Yuanhong's avatar Liao Yuanhong Committed by Sean Christopherson
Browse files

KVM: x86: Use guard() instead of mutex_lock() to simplify code 



Use guard(mutex) instead of mutex_lock/mutex_unlock pair to simplify the
error handling when allocating the APIC access page.

No functional change intended.

Signed-off-by: default avatarLiao Yuanhong <liaoyuanhong@vivo.com>
Link: https://lore.kernel.org/r/20250901131822.647802-1-liaoyuanhong@vivo.com


[sean: add blank link to isolate guard(), tweak changelog]
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 06dc910f

arch/x86/kvm/lapic.c

+7 −10
Original line number Diff line number Diff line
@@ -2747,24 +2747,21 @@ void kvm_apic_update_apicv(struct kvm_vcpu *vcpu) 
int kvm_alloc_apic_access_page(struct kvm *kvm)

{

	void __user *hva;

	int ret = 0;



	mutex_lock(&kvm->slots_lock);

	guard(mutex)(&kvm->slots_lock);



	if (kvm->arch.apic_access_memslot_enabled ||

	    kvm->arch.apic_access_memslot_inhibited)

		goto out;

		return 0;



	hva = __x86_set_memory_region(kvm, APIC_ACCESS_PAGE_PRIVATE_MEMSLOT,

				      APIC_DEFAULT_PHYS_BASE, PAGE_SIZE);

	if (IS_ERR(hva)) {

		ret = PTR_ERR(hva);

		goto out;

	}

	if (IS_ERR(hva))

		return PTR_ERR(hva);



	kvm->arch.apic_access_memslot_enabled = true;

out:

	mutex_unlock(&kvm->slots_lock);

	return ret;



	return 0;

}

EXPORT_SYMBOL_GPL(kvm_alloc_apic_access_page);