All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
	linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
	kvmarm@lists.cs.columbia.edu, maz@kernel.org, drjones@redhat.com
Cc: pbonzini@redhat.com, shuah@kernel.org
Subject: [PATCH 5/9] KVM: arm: move has_run_once after the map_resources
Date: Sat, 12 Dec 2020 19:50:06 +0100	[thread overview]
Message-ID: <20201212185010.26579-6-eric.auger@redhat.com> (raw)
In-Reply-To: <20201212185010.26579-1-eric.auger@redhat.com>

has_run_once is set to true at the beginning of
kvm_vcpu_first_run_init(). This generally is not an issue
except when exercising the code with KVM selftests. Indeed,
if kvm_vgic_map_resources() fails due to erroneous user settings,
has_run_once is set and this prevents from continuing
executing the test. This patch moves the assignment after the
kvm_vgic_map_resources().

Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
 arch/arm64/kvm/arm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index c0ffb019ca8b..331fae6bff31 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -540,8 +540,6 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)
 	if (!kvm_arm_vcpu_is_finalized(vcpu))
 		return -EPERM;
 
-	vcpu->arch.has_run_once = true;
-
 	if (likely(irqchip_in_kernel(kvm))) {
 		/*
 		 * Map the VGIC hardware resources before running a vcpu the
@@ -560,6 +558,8 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)
 		static_branch_inc(&userspace_irqchip_in_use);
 	}
 
+	vcpu->arch.has_run_once = true;
+
 	ret = kvm_timer_enable(vcpu);
 	if (ret)
 		return ret;
-- 
2.21.3

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

WARNING: multiple messages have this Message-ID (diff)
From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
	linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
	kvmarm@lists.cs.columbia.edu, maz@kernel.org, drjones@redhat.com
Cc: alexandru.elisei@arm.com, james.morse@arm.com,
	julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com,
	shuah@kernel.org, pbonzini@redhat.com
Subject: [PATCH 5/9] KVM: arm: move has_run_once after the map_resources
Date: Sat, 12 Dec 2020 19:50:06 +0100	[thread overview]
Message-ID: <20201212185010.26579-6-eric.auger@redhat.com> (raw)
In-Reply-To: <20201212185010.26579-1-eric.auger@redhat.com>

has_run_once is set to true at the beginning of
kvm_vcpu_first_run_init(). This generally is not an issue
except when exercising the code with KVM selftests. Indeed,
if kvm_vgic_map_resources() fails due to erroneous user settings,
has_run_once is set and this prevents from continuing
executing the test. This patch moves the assignment after the
kvm_vgic_map_resources().

Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
 arch/arm64/kvm/arm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index c0ffb019ca8b..331fae6bff31 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -540,8 +540,6 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)
 	if (!kvm_arm_vcpu_is_finalized(vcpu))
 		return -EPERM;
 
-	vcpu->arch.has_run_once = true;
-
 	if (likely(irqchip_in_kernel(kvm))) {
 		/*
 		 * Map the VGIC hardware resources before running a vcpu the
@@ -560,6 +558,8 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)
 		static_branch_inc(&userspace_irqchip_in_use);
 	}
 
+	vcpu->arch.has_run_once = true;
+
 	ret = kvm_timer_enable(vcpu);
 	if (ret)
 		return ret;
-- 
2.21.3


  parent reply	other threads:[~2020-12-12 18:50 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-12 18:50 [PATCH 0/9] KVM/ARM: Some vgic fixes and init sequence KVM selftests Eric Auger
2020-12-12 18:50 ` Eric Auger
2020-12-12 18:50 ` [PATCH 1/9] KVM: arm64: vgic-v3: Fix some error codes when setting RDIST base Eric Auger
2020-12-12 18:50   ` Eric Auger
2021-01-06 16:32   ` Alexandru Elisei
2021-01-06 16:32     ` Alexandru Elisei
2021-01-14 10:02     ` Auger Eric
2021-01-14 10:02       ` Auger Eric
2020-12-12 18:50 ` [PATCH 2/9] KVM: arm64: Fix KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION read Eric Auger
2020-12-12 18:50   ` Eric Auger
2021-01-06 17:12   ` Alexandru Elisei
2021-01-06 17:12     ` Alexandru Elisei
2021-01-13 17:18     ` Auger Eric
2021-01-13 17:18       ` Auger Eric
2020-12-12 18:50 ` [PATCH 3/9] KVM: arm64: vgic-v3: Fix error handling in vgic_v3_set_redist_base() Eric Auger
2020-12-12 18:50   ` Eric Auger
2020-12-28 15:35   ` Marc Zyngier
2020-12-28 15:35     ` Marc Zyngier
2021-01-13 17:18     ` Auger Eric
2021-01-13 17:18       ` Auger Eric
2020-12-12 18:50 ` [PATCH 4/9] KVM: arm/arm64: vgic: Reset base address on kvm_vgic_dist_destroy() Eric Auger
2020-12-12 18:50   ` Eric Auger
2020-12-28 15:41   ` Marc Zyngier
2020-12-28 15:41     ` Marc Zyngier
2021-01-13 17:18     ` Auger Eric
2021-01-13 17:18       ` Auger Eric
2020-12-12 18:50 ` Eric Auger [this message]
2020-12-12 18:50   ` [PATCH 5/9] KVM: arm: move has_run_once after the map_resources Eric Auger
2021-01-12 14:55   ` Alexandru Elisei
2021-01-12 14:55     ` Alexandru Elisei
2021-01-14 10:02     ` Auger Eric
2021-01-14 10:02       ` Auger Eric
2021-01-20 15:56       ` Alexandru Elisei
2021-01-20 15:56         ` Alexandru Elisei
2021-03-12 17:27         ` Auger Eric
2021-03-12 17:27           ` Auger Eric
2020-12-12 18:50 ` [PATCH 6/9] docs: kvm: devices/arm-vgic-v3: enhance KVM_DEV_ARM_VGIC_CTRL_INIT doc Eric Auger
2020-12-12 18:50   ` Eric Auger
2021-01-12 15:39   ` Alexandru Elisei
2021-01-12 15:39     ` Alexandru Elisei
2021-01-13 17:18     ` Auger Eric
2021-01-13 17:18       ` Auger Eric
2020-12-12 18:50 ` [PATCH 7/9] KVM: arm64: Simplify argument passing to vgic_uaccess_[read|write] Eric Auger
2020-12-12 18:50   ` Eric Auger
2021-01-12 16:04   ` Alexandru Elisei
2021-01-12 16:04     ` Alexandru Elisei
2021-01-12 16:16     ` Alexandru Elisei
2021-01-12 16:16       ` Alexandru Elisei
2021-01-13 17:18       ` Auger Eric
2021-01-13 17:18         ` Auger Eric
2020-12-12 18:50 ` [PATCH 8/9] KVM: arm64: vgic-v3: Expose GICR_TYPER.Last for userspace Eric Auger
2020-12-12 18:50   ` Eric Auger
2021-01-12 17:02   ` Alexandru Elisei
2021-01-12 17:02     ` Alexandru Elisei
2021-01-14 10:16     ` Auger Eric
2021-01-14 10:16       ` Auger Eric
2021-01-20 16:13       ` Alexandru Elisei
2021-01-20 16:13         ` Alexandru Elisei
2021-03-12 17:26         ` Auger Eric
2021-03-12 17:26           ` Auger Eric
2021-01-12 17:28   ` Alexandru Elisei
2021-01-12 17:28     ` Alexandru Elisei
2021-01-12 17:48     ` Marc Zyngier
2021-01-12 17:48       ` Marc Zyngier
2020-12-12 18:50 ` [PATCH 9/9] KVM: selftests: aarch64/vgic-v3 init sequence tests Eric Auger
2020-12-12 18:50   ` Eric Auger

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=20201212185010.26579-6-eric.auger@redhat.com \
    --to=eric.auger@redhat.com \
    --cc=drjones@redhat.com \
    --cc=eric.auger.pro@gmail.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maz@kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=shuah@kernel.org \
    /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.