From: Sebastian Ene <sebastianene@google.com>
To: kvm@vger.kernel.org
Cc: maz@kernel.org, will@kernel.org, kvmarm@lists.cs.columbia.edu
Subject: [PATCH kvmtool v11 1/3] aarch64: Populate the vCPU struct before target->init()
Date: Sun, 13 Mar 2022 16:19:48 +0000 [thread overview]
Message-ID: <20220313161949.3565171-2-sebastianene@google.com> (raw)
In-Reply-To: <20220313161949.3565171-1-sebastianene@google.com>
Move the vCPU structure initialisation before the target->init() call to
keep a reference to the kvm structure during init().
This is required by the pvtime peripheral to reserve a memory region
while the vCPU is beeing initialised.
Reviewed-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Sebastian Ene <sebastianene@google.com>
---
arm/kvm-cpu.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arm/kvm-cpu.c b/arm/kvm-cpu.c
index 6a2408c..84ac1e9 100644
--- a/arm/kvm-cpu.c
+++ b/arm/kvm-cpu.c
@@ -116,6 +116,13 @@ struct kvm_cpu *kvm_cpu__arch_init(struct kvm *kvm, unsigned long cpu_id)
die("Unable to find matching target");
}
+ /* Populate the vcpu structure. */
+ vcpu->kvm = kvm;
+ vcpu->cpu_id = cpu_id;
+ vcpu->cpu_type = vcpu_init.target;
+ vcpu->cpu_compatible = target->compatible;
+ vcpu->is_running = true;
+
if (err || target->init(vcpu))
die("Unable to initialise vcpu");
@@ -125,13 +132,6 @@ struct kvm_cpu *kvm_cpu__arch_init(struct kvm *kvm, unsigned long cpu_id)
vcpu->ring = (void *)vcpu->kvm_run +
(coalesced_offset * PAGE_SIZE);
- /* Populate the vcpu structure. */
- vcpu->kvm = kvm;
- vcpu->cpu_id = cpu_id;
- vcpu->cpu_type = vcpu_init.target;
- vcpu->cpu_compatible = target->compatible;
- vcpu->is_running = true;
-
if (kvm_cpu__configure_features(vcpu))
die("Unable to configure requested vcpu features");
--
2.35.1.723.g4982287a31-goog
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2022-03-13 16:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-13 16:19 [PATCH kvmtool v11 0/3] aarch64: Add stolen time support Sebastian Ene
2022-03-13 16:19 ` Sebastian Ene [this message]
2022-03-13 16:19 ` [PATCH kvmtool v11 2/3] " Sebastian Ene
2022-03-13 16:19 ` [PATCH kvmtool v11 3/3] Add --no-pvtime command line argument Sebastian Ene
2022-03-21 13:57 ` [PATCH kvmtool v11 0/3] aarch64: Add stolen time support Will Deacon
2022-03-21 14:00 ` Will Deacon
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=20220313161949.3565171-2-sebastianene@google.com \
--to=sebastianene@google.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=maz@kernel.org \
--cc=will@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox