Commit 68fd66f1 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

KVM: x86: extend struct kvm_vcpu_pv_apf_data with token info 



Currently, APF mechanism relies on the #PF abuse where the token is being
passed through CR2. If we switch to using interrupts to deliver page-ready
notifications we need a different way to pass the data. Extent the existing
'struct kvm_vcpu_pv_apf_data' with token information for page-ready
notifications.

While on it, rename 'reason' to 'flags'. This doesn't change the semantics
as we only have reasons '1' and '2' and these can be treated as bit flags
but KVM_PV_REASON_PAGE_READY is going away with interrupt based delivery
making 'reason' name misleading.

The newly introduced apf_put_user_ready() temporary puts both flags and
token information, this will be changed to put token only when we switch
to interrupt based notifications.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20200525144125.143875-3-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 84b09f33

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ struct kvm_vcpu_arch { 
		u64 msr_val;

		u32 id;

		bool send_user_only;

		u32 host_apf_reason;

		u32 host_apf_flags;

		unsigned long nested_apf_token;

		bool delivery_as_pf_vmexit;

	} apf;

arch/x86/include/asm/kvm_para.h

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ unsigned int kvm_arch_para_features(void); 
unsigned int kvm_arch_para_hints(void);

void kvm_async_pf_task_wait_schedule(u32 token);

void kvm_async_pf_task_wake(u32 token);

u32 kvm_read_and_reset_pf_reason(void);

u32 kvm_read_and_reset_apf_flags(void);

void kvm_disable_steal_time(void);

bool __kvm_handle_async_pf(struct pt_regs *regs, u32 token);
@@ -131,7 +131,7 @@ static inline unsigned int kvm_arch_para_hints(void) 
	return 0;

}



static inline u32 kvm_read_and_reset_pf_reason(void)

static inline u32 kvm_read_and_reset_apf_flags(void)

{

	return 0;

}

arch/x86/include/uapi/asm/kvm_para.h

+3 −2
Original line number Diff line number Diff line
@@ -112,8 +112,9 @@ struct kvm_mmu_op_release_pt { 
#define KVM_PV_REASON_PAGE_READY 2



struct kvm_vcpu_pv_apf_data {

	__u32 reason;

	__u8 pad[60];

	__u32 flags;

	__u32 token; /* Used for page ready notification only */

	__u8 pad[56];

	__u32 enabled;

};

arch/x86/kernel/kvm.c

+8 −8
Original line number Diff line number Diff line
@@ -218,23 +218,23 @@ again: 
}

EXPORT_SYMBOL_GPL(kvm_async_pf_task_wake);



u32 kvm_read_and_reset_pf_reason(void)

u32 kvm_read_and_reset_apf_flags(void)

{

	u32 reason = 0;

	u32 flags = 0;



	if (__this_cpu_read(apf_reason.enabled)) {

		reason = __this_cpu_read(apf_reason.reason);

		__this_cpu_write(apf_reason.reason, 0);

		flags = __this_cpu_read(apf_reason.flags);

		__this_cpu_write(apf_reason.flags, 0);

	}



	return reason;

	return flags;

}

EXPORT_SYMBOL_GPL(kvm_read_and_reset_pf_reason);

NOKPROBE_SYMBOL(kvm_read_and_reset_pf_reason);

EXPORT_SYMBOL_GPL(kvm_read_and_reset_apf_flags);

NOKPROBE_SYMBOL(kvm_read_and_reset_apf_flags);



bool __kvm_handle_async_pf(struct pt_regs *regs, u32 token)

{

	u32 reason = kvm_read_and_reset_pf_reason();

	u32 reason = kvm_read_and_reset_apf_flags();



	switch (reason) {

	case KVM_PV_REASON_PAGE_NOT_PRESENT:

arch/x86/kvm/mmu/mmu.c

+3 −3
Original line number Diff line number Diff line
@@ -4164,7 +4164,7 @@ int kvm_handle_page_fault(struct kvm_vcpu *vcpu, u64 error_code, 
#endif



	vcpu->arch.l1tf_flush_l1d = true;

	switch (vcpu->arch.apf.host_apf_reason) {

	switch (vcpu->arch.apf.host_apf_flags) {

	default:

		trace_kvm_page_fault(fault_address, error_code);
@@ -4174,13 +4174,13 @@ int kvm_handle_page_fault(struct kvm_vcpu *vcpu, u64 error_code, 
				insn_len);

		break;

	case KVM_PV_REASON_PAGE_NOT_PRESENT:

		vcpu->arch.apf.host_apf_reason = 0;

		vcpu->arch.apf.host_apf_flags = 0;

		local_irq_disable();

		kvm_async_pf_task_wait_schedule(fault_address);

		local_irq_enable();

		break;

	case KVM_PV_REASON_PAGE_READY:

		vcpu->arch.apf.host_apf_reason = 0;

		vcpu->arch.apf.host_apf_flags = 0;

		local_irq_disable();

		kvm_async_pf_task_wake(fault_address);

		local_irq_enable();

CRA Git | Maintained and supported by SUSTech CRA and CCSE