From: Christoffer Dall <cdall@linaro.org>
To: Andrew Jones <drjones@redhat.com>
Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
marc.zyngier@arm.com, pbonzini@redhat.com, rkrcmar@redhat.com
Subject: Re: [PATCH v4 08/11] KVM: arm/arm64: change exit request to sleep request
Date: Thu, 1 Jun 2017 12:35:27 +0200 [thread overview]
Message-ID: <20170601103527.GH20919@cbox> (raw)
In-Reply-To: <20170516022035.7674-9-drjones@redhat.com>
On Tue, May 16, 2017 at 04:20:32AM +0200, Andrew Jones wrote:
> A request called EXIT is too generic. All requests are meant to cause
> exits, but different requests have different flags. Let's not make
> it difficult to decide if the EXIT request is correct for some case
> by just always providing unique requests for each case. This patch
> changes EXIT to SLEEP, because that's what the request is asking the
> VCPU to do.
>
> Signed-off-by: Andrew Jones <drjones@redhat.com>
Acked-by: Christoffer Dall <cdall@linaro.org>
> ---
> arch/arm/include/asm/kvm_host.h | 2 +-
> arch/arm64/include/asm/kvm_host.h | 2 +-
> virt/kvm/arm/arm.c | 12 ++++++------
> virt/kvm/arm/psci.c | 4 ++--
> 4 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
> index c556babe467c..fdd644c01c89 100644
> --- a/arch/arm/include/asm/kvm_host.h
> +++ b/arch/arm/include/asm/kvm_host.h
> @@ -44,7 +44,7 @@
> #define KVM_MAX_VCPUS VGIC_V2_MAX_CPUS
> #endif
>
> -#define KVM_REQ_VCPU_EXIT \
> +#define KVM_REQ_SLEEP \
> KVM_ARCH_REQ_FLAGS(0, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
>
> u32 *kvm_vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num, u32 mode);
> diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
> index 0ff991c9c66e..9bd0d1040de9 100644
> --- a/arch/arm64/include/asm/kvm_host.h
> +++ b/arch/arm64/include/asm/kvm_host.h
> @@ -41,7 +41,7 @@
>
> #define KVM_VCPU_MAX_FEATURES 4
>
> -#define KVM_REQ_VCPU_EXIT \
> +#define KVM_REQ_SLEEP \
> KVM_ARCH_REQ_FLAGS(0, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)
>
> int __attribute_const__ kvm_target_cpu(void);
> diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
> index 9379b1d75ad3..ddc833987dfb 100644
> --- a/virt/kvm/arm/arm.c
> +++ b/virt/kvm/arm/arm.c
> @@ -371,7 +371,7 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
> static void vcpu_power_off(struct kvm_vcpu *vcpu)
> {
> vcpu->arch.power_off = true;
> - kvm_make_request(KVM_REQ_VCPU_EXIT, vcpu);
> + kvm_make_request(KVM_REQ_SLEEP, vcpu);
> kvm_vcpu_kick(vcpu);
> }
>
> @@ -543,7 +543,7 @@ void kvm_arm_halt_guest(struct kvm *kvm)
>
> kvm_for_each_vcpu(i, vcpu, kvm)
> vcpu->arch.pause = true;
> - kvm_make_all_cpus_request(kvm, KVM_REQ_VCPU_EXIT);
> + kvm_make_all_cpus_request(kvm, KVM_REQ_SLEEP);
> }
>
> void kvm_arm_resume_guest(struct kvm *kvm)
> @@ -557,7 +557,7 @@ void kvm_arm_resume_guest(struct kvm *kvm)
> }
> }
>
> -static void vcpu_sleep(struct kvm_vcpu *vcpu)
> +static void vcpu_req_sleep(struct kvm_vcpu *vcpu)
> {
> struct swait_queue_head *wq = kvm_arch_vcpu_wq(vcpu);
>
> @@ -566,7 +566,7 @@ static void vcpu_sleep(struct kvm_vcpu *vcpu)
>
> if (vcpu->arch.power_off || vcpu->arch.pause) {
> /* Awaken to handle a signal, request we sleep again later. */
> - kvm_make_request(KVM_REQ_VCPU_EXIT, vcpu);
> + kvm_make_request(KVM_REQ_SLEEP, vcpu);
> }
> }
>
> @@ -578,8 +578,8 @@ static int kvm_vcpu_initialized(struct kvm_vcpu *vcpu)
> static void check_vcpu_requests(struct kvm_vcpu *vcpu)
> {
> if (kvm_request_pending(vcpu)) {
> - if (kvm_check_request(KVM_REQ_VCPU_EXIT, vcpu))
> - vcpu_sleep(vcpu);
> + if (kvm_check_request(KVM_REQ_SLEEP, vcpu))
> + vcpu_req_sleep(vcpu);
> }
> }
>
> diff --git a/virt/kvm/arm/psci.c b/virt/kvm/arm/psci.c
> index 4a436685c552..f1e363bab5e8 100644
> --- a/virt/kvm/arm/psci.c
> +++ b/virt/kvm/arm/psci.c
> @@ -65,7 +65,7 @@ static unsigned long kvm_psci_vcpu_suspend(struct kvm_vcpu *vcpu)
> static void kvm_psci_vcpu_off(struct kvm_vcpu *vcpu)
> {
> vcpu->arch.power_off = true;
> - kvm_make_request(KVM_REQ_VCPU_EXIT, vcpu);
> + kvm_make_request(KVM_REQ_SLEEP, vcpu);
> kvm_vcpu_kick(vcpu);
> }
>
> @@ -183,7 +183,7 @@ static void kvm_prepare_system_event(struct kvm_vcpu *vcpu, u32 type)
> */
> kvm_for_each_vcpu(i, tmp, vcpu->kvm)
> tmp->arch.power_off = true;
> - kvm_make_all_cpus_request(vcpu->kvm, KVM_REQ_VCPU_EXIT);
> + kvm_make_all_cpus_request(vcpu->kvm, KVM_REQ_SLEEP);
>
> memset(&vcpu->run->system_event, 0, sizeof(vcpu->run->system_event));
> vcpu->run->system_event.type = type;
> --
> 2.9.3
>
next prev parent reply other threads:[~2017-06-01 10:35 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-16 2:20 [PATCH v4 00/11] KVM: arm/arm64: race fixes and vcpu requests Andrew Jones
2017-05-16 2:20 ` [PATCH v4 01/11] KVM: improve arch vcpu request defining Andrew Jones
2017-06-01 10:34 ` Christoffer Dall
2017-05-16 2:20 ` [PATCH v4 02/11] KVM: add kvm_request_pending Andrew Jones
2017-06-01 10:35 ` Christoffer Dall
2017-05-16 2:20 ` [PATCH v4 03/11] KVM: Add documentation for VCPU requests Andrew Jones
2017-05-26 7:31 ` Christoffer Dall
2017-05-26 9:43 ` Andrew Jones
2017-05-16 2:20 ` [PATCH v4 04/11] KVM: arm/arm64: properly use vcpu requests Andrew Jones
2017-05-16 2:20 ` [PATCH v4 05/11] KVM: arm/arm64: replace pause checks with vcpu request checks Andrew Jones
2017-06-01 10:35 ` Christoffer Dall
2017-05-16 2:20 ` [PATCH v4 06/11] KVM: arm/arm64: use vcpu requests for power_off Andrew Jones
2017-06-01 10:35 ` Christoffer Dall
2017-06-01 10:35 ` Christoffer Dall
2017-05-16 2:20 ` [PATCH v4 07/11] KVM: arm/arm64: optimize VCPU RUN Andrew Jones
2017-06-01 10:35 ` Christoffer Dall
2017-05-16 2:20 ` [PATCH v4 08/11] KVM: arm/arm64: change exit request to sleep request Andrew Jones
2017-06-01 10:35 ` Christoffer Dall [this message]
2017-05-16 2:20 ` [PATCH v4 09/11] KVM: arm/arm64: use vcpu requests for irq injection Andrew Jones
2017-06-01 10:35 ` Christoffer Dall
2017-06-01 10:59 ` Andrew Jones
2017-06-01 13:27 ` Christoffer Dall
2017-06-01 13:38 ` Andrew Jones
2017-06-01 13:53 ` Christoffer Dall
2017-05-16 2:20 ` [PATCH v4 10/11] KVM: arm/arm64: PMU: remove request-less vcpu kick Andrew Jones
2017-05-16 2:20 ` [PATCH v4 11/11] KVM: arm/arm64: timer: " Andrew Jones
2017-06-01 10:34 ` Christoffer Dall
2017-06-01 11:09 ` Andrew Jones
2017-06-01 12:37 ` Paolo Bonzini
2017-06-01 13:23 ` Christoffer Dall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170601103527.GH20919@cbox \
--to=cdall@linaro.org \
--cc=drjones@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=marc.zyngier@arm.com \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.