Skip to content

[PW_SID:995179] [v2] riscv: skip csr restore if vcpu preempted reload #828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
linux-riscv-bot wants to merge 1 commit into from
Closed

[PW_SID:995179] [v2] riscv: skip csr restore if vcpu preempted reload #828

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions arch/riscv/kvm/vcpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
#define CREATE_TRACE_POINTS
#include "trace.h"

static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_former_vcpu);

const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = {
KVM_GENERIC_VCPU_STATS(),
STATS_DESC_COUNTER(VCPU, ecall_exit_stat),
Expand Down Expand Up @@ -581,6 +583,10 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr;
struct kvm_vcpu_config *cfg = &vcpu->arch.cfg;

if (vcpu == __this_cpu_read(kvm_former_vcpu) &&
vcpu->arch.last_exit_cpu == cpu)
goto csr_restore_done;

if (kvm_riscv_nacl_sync_csr_available()) {
nsh = nacl_shmem();
nacl_csr_write(nsh, CSR_VSSTATUS, csr->vsstatus);
Expand Down Expand Up @@ -624,6 +630,9 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)

kvm_riscv_mmu_update_hgatp(vcpu);

kvm_riscv_vcpu_aia_load(vcpu, cpu);

csr_restore_done:
kvm_riscv_vcpu_timer_restore(vcpu);

kvm_riscv_vcpu_host_fp_save(&vcpu->arch.host_context);
Expand All @@ -633,8 +642,6 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
kvm_riscv_vcpu_guest_vector_restore(&vcpu->arch.guest_context,
vcpu->arch.isa);

kvm_riscv_vcpu_aia_load(vcpu, cpu);

kvm_make_request(KVM_REQ_STEAL_UPDATE, vcpu);

vcpu->cpu = cpu;
Expand All @@ -645,6 +652,8 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
void *nsh;
struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr;

__this_cpu_write(kvm_former_vcpu, vcpu);

vcpu->cpu = -1;

kvm_riscv_vcpu_aia_put(vcpu);
Expand Down
Loading