Commit f51af346 authored by Li RongQing's avatar Li RongQing Committed by Sean Christopherson
Browse files

KVM: SVM: remove useless input parameter in snp_safe_alloc_page 



The input parameter 'vcpu' in snp_safe_alloc_page is not used.
Therefore, remove it.

Suggested-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarLi RongQing <lirongqing@baidu.com>
Reviewed-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Link: https://lore.kernel.org/r/20240520120858.13117-2-lirongqing@baidu.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent c3f38fa6

arch/x86/kvm/svm/nested.c

+1 −1
Original line number Diff line number Diff line
@@ -1181,7 +1181,7 @@ int svm_allocate_nested(struct vcpu_svm *svm) 
	if (svm->nested.initialized)

		return 0;



	vmcb02_page = snp_safe_alloc_page(&svm->vcpu);

	vmcb02_page = snp_safe_alloc_page();

	if (!vmcb02_page)

		return -ENOMEM;

	svm->nested.vmcb02.ptr = page_address(vmcb02_page);

arch/x86/kvm/svm/sev.c

+1 −1
Original line number Diff line number Diff line
@@ -3380,7 +3380,7 @@ void sev_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector) 
	}

}



struct page *snp_safe_alloc_page(struct kvm_vcpu *vcpu)

struct page *snp_safe_alloc_page(void)

{

	unsigned long pfn;

	struct page *p;

arch/x86/kvm/svm/svm.c

+4 −4
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ static int svm_cpu_init(int cpu) 
	int ret = -ENOMEM;



	memset(sd, 0, sizeof(struct svm_cpu_data));

	sd->save_area = snp_safe_alloc_page(NULL);

	sd->save_area = snp_safe_alloc_page();

	if (!sd->save_area)

		return ret;
@@ -1421,7 +1421,7 @@ static int svm_vcpu_create(struct kvm_vcpu *vcpu) 
	svm = to_svm(vcpu);



	err = -ENOMEM;

	vmcb01_page = snp_safe_alloc_page(vcpu);

	vmcb01_page = snp_safe_alloc_page();

	if (!vmcb01_page)

		goto out;
@@ -1430,7 +1430,7 @@ static int svm_vcpu_create(struct kvm_vcpu *vcpu) 
		 * SEV-ES guests require a separate VMSA page used to contain

		 * the encrypted register state of the guest.

		 */

		vmsa_page = snp_safe_alloc_page(vcpu);

		vmsa_page = snp_safe_alloc_page();

		if (!vmsa_page)

			goto error_free_vmcb_page;

	}
@@ -4920,7 +4920,7 @@ static int svm_vm_init(struct kvm *kvm) 


static void *svm_alloc_apic_backing_page(struct kvm_vcpu *vcpu)

{

	struct page *page = snp_safe_alloc_page(vcpu);

	struct page *page = snp_safe_alloc_page();



	if (!page)

		return NULL;

arch/x86/kvm/svm/svm.h

+3 −2
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ void sev_guest_memory_reclaimed(struct kvm *kvm); 
int sev_handle_vmgexit(struct kvm_vcpu *vcpu);



/* These symbols are used in common code and are stubbed below.  */

struct page *snp_safe_alloc_page(struct kvm_vcpu *vcpu);

struct page *snp_safe_alloc_page(void);

void sev_free_vcpu(struct kvm_vcpu *vcpu);

void sev_vm_destroy(struct kvm *kvm);

void __init sev_set_cpu_caps(void);
@@ -704,7 +704,8 @@ int sev_cpu_init(struct svm_cpu_data *sd); 
int sev_dev_get_attr(u32 group, u64 attr, u64 *val);

extern unsigned int max_sev_asid;

#else

static inline struct page *snp_safe_alloc_page(struct kvm_vcpu *vcpu) {

static inline struct page *snp_safe_alloc_page(void)

{

	return alloc_page(GFP_KERNEL_ACCOUNT | __GFP_ZERO);

}