From: Joerg Roedel <[email protected]> These are the same across all planes for one VCPU, so make then shared.
Signed-off-by: Joerg Roedel <[email protected]> --- arch/arm64/include/asm/kvm_host.h | 2 +- arch/arm64/kvm/arm.c | 2 +- include/linux/kvm_host.h | 5 ++-- virt/kvm/kvm_main.c | 44 ++++++++++++++++--------------- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index a49042bfa801..32dc484781f0 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -1270,7 +1270,7 @@ int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu, void kvm_arm_halt_guest(struct kvm *kvm); void kvm_arm_resume_guest(struct kvm *kvm); -#define vcpu_has_run_once(vcpu) (!!READ_ONCE((vcpu)->pid)) +#define vcpu_has_run_once(vcpu) (!!READ_ONCE((vcpu)->common->pid)) #ifndef __KVM_NVHE_HYPERVISOR__ #define kvm_call_hyp_nvhe(f, ...) \ diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 001f83f737ea..1e2f42134b74 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -726,7 +726,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) if (!cpumask_test_cpu(cpu, vcpu->kvm->arch.supported_cpus)) vcpu_set_on_unsupported_cpu(vcpu); - vcpu->arch.pid = pid_nr(vcpu->pid); + vcpu->arch.pid = pid_nr(vcpu->common->pid); } void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 3c72a462ccfa..73786712495d 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -346,6 +346,9 @@ struct kvm_vcpu_common { int mode; u64 requests; + struct pid *pid; + rwlock_t pid_lock; + /* Scheduling state */ #ifdef CONFIG_PREEMPT_NOTIFIERS struct preempt_notifier preempt_notifier; @@ -368,8 +371,6 @@ struct kvm_vcpu { struct kvm_run *run; - struct pid *pid; - rwlock_t pid_lock; int sigset_active; sigset_t sigset; unsigned int halt_poll_ns; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 7ea20d96bc89..af3c4e0081b8 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -475,6 +475,9 @@ static int kvm_vcpu_init_common(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned common->kvm = kvm; common->current_vcpu = vcpu; + common->pid = NULL; + rwlock_init(&common->pid_lock); + common->wants_to_run = false; common->preempted = false; common->ready = false; @@ -510,8 +513,6 @@ static void kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id) vcpu->kvm = kvm; vcpu->plane = kvm->planes[0]; vcpu->vcpu_id = id; - vcpu->pid = NULL; - rwlock_init(&vcpu->pid_lock); kvm_async_pf_vcpu_init(vcpu); kvm_vcpu_set_in_spin_loop(vcpu, false); @@ -539,6 +540,12 @@ static void kvm_vcpu_common_destroy(struct kvm_vcpu *vcpu) kvm->created_vcpus--; mutex_unlock(&common->kvm->lock); + /* + * No need for rcu_read_lock as VCPU_RUN is the only place that changes + * the common->pid pointer, and at destruction time all file descriptors + * are already gone. + */ + put_pid(common->pid); kfree(common); } @@ -549,13 +556,6 @@ static void kvm_vcpu_destroy(struct kvm_vcpu *vcpu) kvm_vcpu_common_destroy(vcpu); kvm_dirty_ring_free(&vcpu->dirty_ring); - /* - * No need for rcu_read_lock as VCPU_RUN is the only place that changes - * the vcpu->pid pointer, and at destruction time all file descriptors - * are already gone. - */ - put_pid(vcpu->pid); - free_page((unsigned long)vcpu->run); kmem_cache_free(kvm_vcpu_cache, vcpu); } @@ -3996,16 +3996,17 @@ EXPORT_SYMBOL_FOR_KVM_INTERNAL(__kvm_vcpu_kick); int kvm_vcpu_yield_to(struct kvm_vcpu *target) { + struct kvm_vcpu_common *common = target->common; struct task_struct *task = NULL; int ret; - if (!read_trylock(&target->pid_lock)) + if (!read_trylock(&common->pid_lock)) return 0; - if (target->pid) - task = get_pid_task(target->pid, PIDTYPE_PID); + if (common->pid) + task = get_pid_task(common->pid, PIDTYPE_PID); - read_unlock(&target->pid_lock); + read_unlock(&common->pid_lock); if (!task) return 0; @@ -4258,9 +4259,9 @@ static int vcpu_get_pid(void *data, u64 *val) { struct kvm_vcpu *vcpu = data; - read_lock(&vcpu->pid_lock); - *val = pid_nr(vcpu->pid); - read_unlock(&vcpu->pid_lock); + read_lock(&vcpu->common->pid_lock); + *val = pid_nr(vcpu->common->pid); + read_unlock(&vcpu->common->pid_lock); return 0; } @@ -4558,6 +4559,7 @@ static long kvm_vcpu_ioctl(struct file *filp, return -EINTR; switch (ioctl) { case KVM_RUN: { + struct kvm_vcpu_common *common = vcpu->common; struct pid *oldpid; r = -EINVAL; if (arg) @@ -4569,7 +4571,7 @@ static long kvm_vcpu_ioctl(struct file *filp, * read vcpu->pid while this vCPU is in KVM_RUN, e.g. to yield * directly to this vCPU */ - oldpid = vcpu->pid; + oldpid = common->pid; if (unlikely(oldpid != task_pid(current))) { /* The thread running this VCPU changed. */ struct pid *newpid; @@ -4579,15 +4581,15 @@ static long kvm_vcpu_ioctl(struct file *filp, break; newpid = get_task_pid(current, PIDTYPE_PID); - write_lock(&vcpu->pid_lock); - vcpu->pid = newpid; - write_unlock(&vcpu->pid_lock); + write_lock(&common->pid_lock); + common->pid = newpid; + write_unlock(&common->pid_lock); put_pid(oldpid); } vcpu->common->wants_to_run = !READ_ONCE(vcpu->run->immediate_exit__unsafe); r = kvm_arch_vcpu_ioctl_run(vcpu); - vcpu->common->wants_to_run = false; + common->wants_to_run = false; /* * FIXME: Remove this hack once all KVM architectures -- 2.53.0
