From: Auger Eric <eric.auger@redhat.com>
To: Andrew Jones <drjones@redhat.com>
Cc: peter.maydell@linaro.org, richard.henderson@linaro.org,
qemu-devel@nongnu.org, armbru@redhat.com, qemu-arm@nongnu.org,
imammedo@redhat.com, alex.bennee@linaro.org, Dave.Martin@arm.com
Subject: Re: [Qemu-devel] [PATCH v2 01/14] target/arm/cpu64: Ensure kvm really supports aarch64=off
Date: Wed, 24 Jul 2019 14:51:15 +0200 [thread overview]
Message-ID: <8dea18ae-39ed-6f7d-0e91-61abd22eb74e@redhat.com> (raw)
In-Reply-To: <20190625133452.3f4ik4xn7vh5zi2b@kamzik.brq.redhat.com>
Hi Drew,
On 6/25/19 3:34 PM, Andrew Jones wrote:
> On Tue, Jun 25, 2019 at 11:35:12AM +0200, Auger Eric wrote:
>> Hi Drew,
>>
>> On 6/21/19 6:34 PM, Andrew Jones wrote:
>>> If -cpu <cpu>,aarch64=off is used then KVM must also be used, and it
>>> and the host must support running the vcpu in 32-bit mode. Also, if
s/and it//
>>> -cpu <cpu>,aarch64=on is used, then it doesn't matter if kvm is
>>> enabled or not.
>>>
>>> Signed-off-by: Andrew Jones <drjones@redhat.com>
>>
>>
>>> ---
>>> target/arm/cpu64.c | 12 ++++++------
>>> target/arm/kvm64.c | 11 +++++++++++
>>> target/arm/kvm_arm.h | 14 ++++++++++++++
>>> 3 files changed, 31 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
>>> index 1901997a0645..946994838d8a 100644
>>> --- a/target/arm/cpu64.c
>>> +++ b/target/arm/cpu64.c
>>> @@ -407,13 +407,13 @@ static void aarch64_cpu_set_aarch64(Object *obj, bool value, Error **errp)
>>> * restriction allows us to avoid fixing up functionality that assumes a
>>> * uniform execution state like do_interrupt.
>>> */> - if (!kvm_enabled()) {
>>> - error_setg(errp, "'aarch64' feature cannot be disabled "
>>> - "unless KVM is enabled");
>>> - return;
>>> - }
>>> -
>>> if (value == false) {
>>> + if (!kvm_enabled() || !kvm_arm_aarch32_supported(CPU(cpu))) {
>>> + error_setg(errp, "'aarch64' feature cannot be disabled "
>>> + "unless KVM is enabled and 32-bit EL1 "
>>> + "is supported");
>>> + return;
>>> + }
>>> unset_feature(&cpu->env, ARM_FEATURE_AARCH64);
>>> } else {
>>> set_feature(&cpu->env, ARM_FEATURE_AARCH64);
>>> diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
>>> index 22d19c9aec6f..45ccda589903 100644
>>> --- a/target/arm/kvm64.c
>>> +++ b/target/arm/kvm64.c
>>> @@ -24,7 +24,9 @@
>>> #include "exec/gdbstub.h"
>>> #include "sysemu/sysemu.h"
>>> #include "sysemu/kvm.h"
>>> +#include "sysemu/kvm_int.h"
>>> #include "kvm_arm.h"
>>> +#include "hw/boards.h"
By the way those two new headers are not needed by this patch
>>> #include "internals.h"
>>>
>>> static bool have_guest_debug;
>>> @@ -593,6 +595,15 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
>>> return true;
>>> }
>>>
>>> +bool kvm_arm_aarch32_supported(CPUState *cpu)
>>> +{
>>> + KVMState *s = KVM_STATE(current_machine->accelerator);
>>> + int ret;
>>> +
>>> + ret = kvm_check_extension(s, KVM_CAP_ARM_EL1_32BIT);
>>> + return ret > 0;
>> nit: return kvm_check_extension() should be sufficient
>
> Ah yes, I forgot kvm_check_extension() already converts negative
> error codes to zero. I'll fix that for v3.
>
>>> +}
>>> +
>>> #define ARM_CPU_ID_MPIDR 3, 0, 0, 0, 5
>>>
>>> int kvm_arch_init_vcpu(CPUState *cs)
>>> diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h
>>> index 2a07333c615f..812125f805a1 100644
>>> --- a/target/arm/kvm_arm.h
>>> +++ b/target/arm/kvm_arm.h
>>> @@ -207,6 +207,15 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf);
>>> */
>>> void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu);
>>>
>>> +/**
>>> + * kvm_arm_aarch32_supported:
>>> + * @cs: CPUState
>> use kernel-doc comment style?
>
> This file (kvm_arm.h) doesn't appear to have a super consistent comment
> style. I see some use @var: for the parameters and some have 'Returns:
> ...' lines as well. I'm happy to do whatever the maintainers prefer. For
> now I was just trying to mimic whatever caught my eye.>
>>> + *
>>> + * Returns true if the KVM VCPU can enable AArch32 mode and false
>>> + * otherwise.
>>> + */
>>> +bool kvm_arm_aarch32_supported(CPUState *cs);
>>> +
>>> /**
>>> * kvm_arm_get_max_vm_ipa_size - Returns the number of bits in the
>>> * IPA address space supported by KVM
>>> @@ -247,6 +256,11 @@ static inline void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu)
>>> cpu->host_cpu_probe_failed = true;
>>> }
>>>
>>> +static inline bool kvm_arm_aarch32_supported(CPUState *cs)
>>> +{
>>> + return false;
>>> +}
>>> +
>>> static inline int kvm_arm_get_max_vm_ipa_size(MachineState *ms)
>>> {
>>> return -ENOENT;
>>>
>> Reviewed-by: Eric Auger <eric.auger@redhat.com>
Thanks
Eric
>>
>
> Thanks,
> drew
>
next prev parent reply other threads:[~2019-07-24 12:51 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-21 16:34 [Qemu-devel] [PATCH v2 00/14] target/arm/kvm: enable SVE in guests Andrew Jones
2019-06-21 16:34 ` [Qemu-devel] [PATCH v2 01/14] target/arm/cpu64: Ensure kvm really supports aarch64=off Andrew Jones
2019-06-25 9:35 ` Auger Eric
2019-06-25 13:34 ` Andrew Jones
2019-07-24 12:51 ` Auger Eric [this message]
2019-07-24 13:52 ` Andrew Jones
2019-07-24 14:19 ` Auger Eric
2019-06-21 16:34 ` [Qemu-devel] [PATCH v2 02/14] target/arm/cpu: Ensure we can use the pmu with kvm Andrew Jones
2019-06-25 9:35 ` Auger Eric
2019-06-26 9:49 ` Richard Henderson
2019-06-26 13:11 ` Andrew Jones
2019-06-21 16:34 ` [Qemu-devel] [PATCH v2 03/14] target/arm/monitor: Introduce qmp_query_cpu_model_expansion Andrew Jones
2019-06-26 7:43 ` Auger Eric
2019-06-26 13:26 ` Andrew Jones
2019-07-24 12:51 ` Auger Eric
2019-07-24 14:05 ` Andrew Jones
2019-07-24 14:25 ` Auger Eric
2019-07-24 14:44 ` Andrew Jones
2019-07-24 12:55 ` Auger Eric
2019-07-24 14:13 ` Andrew Jones
2019-07-25 8:04 ` Auger Eric
2019-06-21 16:34 ` [Qemu-devel] [PATCH v2 04/14] tests: arm: Introduce cpu feature tests Andrew Jones
2019-07-25 7:54 ` Auger Eric
2019-06-21 16:34 ` [Qemu-devel] [PATCH v2 05/14] target/arm/helper: zcr: Add build bug next to value range assumption Andrew Jones
2019-06-24 11:05 ` Dave Martin
2019-06-24 11:30 ` Andrew Jones
2019-06-24 16:03 ` Dave Martin
2019-06-25 6:11 ` Andrew Jones
2019-06-25 6:14 ` Andrew Jones
2019-06-26 10:01 ` Auger Eric
2019-06-26 13:28 ` Andrew Jones
2019-06-26 13:40 ` Auger Eric
2019-06-26 13:58 ` Andrew Jones
2019-06-26 14:06 ` Auger Eric
2019-06-26 10:07 ` Richard Henderson
2019-06-21 16:34 ` [Qemu-devel] [PATCH v2 06/14] target/arm: Allow SVE to be disabled via a CPU property Andrew Jones
2019-06-21 16:55 ` Philippe Mathieu-Daudé
2019-06-21 17:11 ` Andrew Jones
2019-06-26 10:00 ` Auger Eric
2019-06-26 13:38 ` Andrew Jones
2019-06-26 10:20 ` Richard Henderson
2019-06-26 13:52 ` Andrew Jones
2019-07-17 15:43 ` Andrew Jones
2019-06-21 16:34 ` [Qemu-devel] [PATCH v2 07/14] target/arm/cpu64: max cpu: Introduce sve<vl-bits> properties Andrew Jones
2019-06-24 11:05 ` Dave Martin
2019-06-24 11:49 ` Andrew Jones
2019-06-24 12:10 ` Andrew Jones
2019-06-24 16:06 ` Dave Martin
2019-06-26 14:58 ` Auger Eric
2019-06-27 9:40 ` Andrew Jones
2019-06-27 10:51 ` Auger Eric
2019-06-27 11:43 ` Andrew Jones
2019-06-26 16:56 ` Auger Eric
2019-06-27 10:46 ` Andrew Jones
2019-06-27 11:00 ` Auger Eric
2019-06-27 11:47 ` Andrew Jones
2019-06-27 15:16 ` Dave Martin
2019-06-27 16:19 ` Richard Henderson
2019-06-27 16:49 ` Richard Henderson
2019-06-28 7:27 ` Andrew Jones
2019-06-28 8:31 ` Andrew Jones
2019-06-29 0:10 ` Richard Henderson
2019-07-17 8:13 ` Andrew Jones
2019-06-21 16:34 ` [Qemu-devel] [PATCH v2 08/14] target/arm/kvm64: Fix error returns Andrew Jones
2019-06-26 10:53 ` Richard Henderson
2019-06-26 11:50 ` Richard Henderson
2019-06-21 16:34 ` [Qemu-devel] [PATCH v2 09/14] target/arm/kvm64: Move the get/put of fpsimd registers out Andrew Jones
2019-06-26 10:35 ` Richard Henderson
2019-06-21 16:34 ` [Qemu-devel] [PATCH v2 10/14] target/arm/kvm64: Add kvm_arch_get/put_sve Andrew Jones
2019-06-24 11:05 ` Dave Martin
2019-06-24 11:55 ` Andrew Jones
2019-06-24 16:09 ` Dave Martin
2019-06-26 15:22 ` Richard Henderson
2019-06-27 10:59 ` Dave Martin
2019-06-27 11:26 ` Richard Henderson
2019-06-27 15:02 ` Dave Martin
2019-07-17 9:25 ` Andrew Jones
2019-07-17 9:35 ` Andrew Jones
2019-06-27 6:56 ` Auger Eric
2019-06-27 10:59 ` Andrew Jones
2019-06-21 16:34 ` [Qemu-devel] [PATCH v2 11/14] target/arm/kvm64: max cpu: Enable SVE when available Andrew Jones
2019-06-26 11:09 ` Richard Henderson
2019-06-27 11:56 ` Andrew Jones
2019-06-28 16:14 ` Auger Eric
2019-06-21 16:34 ` [Qemu-devel] [PATCH v2 12/14] target/arm/kvm: scratch vcpu: Preserve input kvm_vcpu_init features Andrew Jones
2019-06-26 11:11 ` Richard Henderson
2019-06-27 7:30 ` Auger Eric
2019-06-27 10:53 ` Andrew Jones
2019-06-27 11:01 ` Dave Martin
2019-06-21 16:34 ` [Qemu-devel] [PATCH v2 13/14] target/arm/cpu64: max cpu: Support sve properties with KVM Andrew Jones
2019-06-28 15:55 ` Auger Eric
2019-07-17 8:41 ` Andrew Jones
2019-06-21 16:34 ` [Qemu-devel] [PATCH v2 14/14] target/arm/kvm: host cpu: Add support for sve<vl-bits> properties Andrew Jones
2019-06-27 17:15 ` Auger Eric
2019-06-28 7:05 ` Andrew Jones
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=8dea18ae-39ed-6f7d-0e91-61abd22eb74e@redhat.com \
--to=eric.auger@redhat.com \
--cc=Dave.Martin@arm.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=drjones@redhat.com \
--cc=imammedo@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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;
as well as URLs for NNTP newsgroup(s).