[Qemu-devel] [PULL 0/9] target-arm queue
[PULL 0/3] target-arm queue
1
A last collection of patches to squeeze in before rc0.
1
Only thing for Arm for rc1 is RTH's fix for the KVM SVE probe code.
2
The patches from me are all bugfixes. Philippe's are just
3
code-movement, but I wanted to get these into 4.1 because
4
that kind of patch is so painful to have to rebase.
5
(The diffstat is huge but it's just code moving from file to file.)
6
2
7
v2: fix up for clash with the qapi refactor which only
8
showed up in a build-from-clean.
9
10
thanks
11
-- PMM
3
-- PMM
12
4
5
The following changes since commit 4e06b3fc1b5e1ec03f22190eabe56891dc9c2236:
13
6
14
The following changes since commit c3e1d838cfa5aac1a6210c8ddf182d0ef7d95dd8:
7
Merge tag 'pull-hex-20220731' of https://github.com/quic/qemu into staging (2022-07-31 21:38:54 -0700)
15
16
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190704-pull-request' into staging (2019-07-04 16:43:13 +0100)
17
8
18
are available in the Git repository at:
9
are available in the Git repository at:
19
10
20
https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20190704-1
11
https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220801
21
12
22
for you to fetch changes up to 89a11ff756410aecb87d2c774df6e45dbf4105c1:
13
for you to fetch changes up to 5265d24c981dfdda8d29b44f7e84a514da75eedc:
23
14
24
target/arm: Correct VMOV_imm_dp handling of short vectors (2019-07-04 17:25:30 +0100)
15
target/arm: Move sve probe inside kvm >= 4.15 branch (2022-08-01 16:21:18 +0100)
25
16
26
----------------------------------------------------------------
17
----------------------------------------------------------------
27
target-arm queue:
18
target-arm queue:
28
* more code-movement to separate TCG-only functions into their own files
19
* Fix KVM SVE ID register probe code
29
* Correct VMOV_imm_dp handling of short vectors
30
* Execute Thumb instructions when their condbits are 0xf
31
* armv7m_systick: Forbid non-privileged accesses
32
* Use _ra versions of cpu_stl_data() in v7M helpers
33
* v8M: Check state of exception being returned from
34
* v8M: Forcibly clear negative-priority exceptions on deactivate
35
20
36
----------------------------------------------------------------
21
----------------------------------------------------------------
37
Peter Maydell (6):
22
Richard Henderson (3):
38
arm v8M: Forcibly clear negative-priority exceptions on deactivate
23
target/arm: Use kvm_arm_sve_supported in kvm_arm_get_host_cpu_features
39
target/arm: v8M: Check state of exception being returned from
24
target/arm: Set KVM_ARM_VCPU_SVE while probing the host
40
target/arm: Use _ra versions of cpu_stl_data() in v7M helpers
25
target/arm: Move sve probe inside kvm >= 4.15 branch
41
hw/timer/armv7m_systick: Forbid non-privileged accesses
42
target/arm: Execute Thumb instructions when their condbits are 0xf
43
target/arm: Correct VMOV_imm_dp handling of short vectors
44
26
45
Philippe Mathieu-Daudé (3):
27
target/arm/kvm64.c | 45 ++++++++++++++++++++++-----------------------
46
target/arm: Move debug routines to debug_helper.c
28
1 file changed, 22 insertions(+), 23 deletions(-)
47
target/arm: Restrict semi-hosting to TCG
48
target/arm/helper: Move M profile routines to m_helper.c
49
50
target/arm/Makefile.objs | 5 +-
51
target/arm/cpu.h | 7 +
52
hw/intc/armv7m_nvic.c | 54 +-
53
hw/timer/armv7m_systick.c | 26 +-
54
target/arm/cpu.c | 9 +-
55
target/arm/debug_helper.c | 311 +++++
56
target/arm/helper.c | 2646 +--------------------------------------
57
target/arm/m_helper.c | 2679 ++++++++++++++++++++++++++++++++++++++++
58
target/arm/op_helper.c | 295 -----
59
target/arm/translate-vfp.inc.c | 2 +-
60
target/arm/translate.c | 15 +-
61
11 files changed, 3096 insertions(+), 2953 deletions(-)
62
create mode 100644 target/arm/debug_helper.c
63
create mode 100644 target/arm/m_helper.c
64
diff view generated by jsdifflib
New patch
[PULL 1/3] target/arm: Use kvm_arm_sve_supported in kvm_arm_get_host_cpu_features
1
From: Richard Henderson <richard.henderson@linaro.org>
1
2
3
Indication for support for SVE will not depend on whether we
4
perform the query on the main kvm_state or the temp vcpu.
5
6
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
7
Message-id: 20220726045828.53697-2-richard.henderson@linaro.org
8
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
9
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10
---
11
target/arm/kvm64.c | 2 +-
12
1 file changed, 1 insertion(+), 1 deletion(-)
13
14
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
15
index XXXXXXX..XXXXXXX 100644
16
--- a/target/arm/kvm64.c
17
+++ b/target/arm/kvm64.c
18
@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
19
}
20
}
21
22
- sve_supported = ioctl(fdarray[0], KVM_CHECK_EXTENSION, KVM_CAP_ARM_SVE) > 0;
23
+ sve_supported = kvm_arm_sve_supported();
24
25
/* Add feature bits that can't appear until after VCPU init. */
26
if (sve_supported) {
27
--
28
2.25.1
diff view generated by jsdifflib
New patch
[PULL 2/3] target/arm: Set KVM_ARM_VCPU_SVE while probing the host
1
From: Richard Henderson <richard.henderson@linaro.org>
1
2
3
Because we weren't setting this flag, our probe of ID_AA64ZFR0
4
was always returning zero. This also obviates the adjustment
5
of ID_AA64PFR0, which had sanitized the SVE field.
6
7
The effects of the bug are not visible, because the only thing that
8
ID_AA64ZFR0 is used for within qemu at present is tcg translation.
9
The other tests for SVE within KVM are via ID_AA64PFR0.SVE.
10
11
Reported-by: Zenghui Yu <yuzenghui@huawei.com>
12
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
13
Message-id: 20220726045828.53697-3-richard.henderson@linaro.org
14
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
15
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
16
---
17
target/arm/kvm64.c | 27 +++++++++++++--------------
18
1 file changed, 13 insertions(+), 14 deletions(-)
19
20
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
21
index XXXXXXX..XXXXXXX 100644
22
--- a/target/arm/kvm64.c
23
+++ b/target/arm/kvm64.c
24
@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
25
bool sve_supported;
26
bool pmu_supported = false;
27
uint64_t features = 0;
28
- uint64_t t;
29
int err;
30
31
/* Old kernels may not know about the PREFERRED_TARGET ioctl: however
32
@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
33
struct kvm_vcpu_init init = { .target = -1, };
34
35
/*
36
- * Ask for Pointer Authentication if supported. We can't play the
37
- * SVE trick of synthesising the ID reg as KVM won't tell us
38
- * whether we have the architected or IMPDEF version of PAuth, so
39
- * we have to use the actual ID regs.
40
+ * Ask for SVE if supported, so that we can query ID_AA64ZFR0,
41
+ * which is otherwise RAZ.
42
+ */
43
+ sve_supported = kvm_arm_sve_supported();
44
+ if (sve_supported) {
45
+ init.features[0] |= 1 << KVM_ARM_VCPU_SVE;
46
+ }
47
+
48
+ /*
49
+ * Ask for Pointer Authentication if supported, so that we get
50
+ * the unsanitized field values for AA64ISAR1_EL1.
51
*/
52
if (kvm_arm_pauth_supported()) {
53
init.features[0] |= (1 << KVM_ARM_VCPU_PTRAUTH_ADDRESS |
54
@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
55
}
56
}
57
58
- sve_supported = kvm_arm_sve_supported();
59
-
60
- /* Add feature bits that can't appear until after VCPU init. */
61
if (sve_supported) {
62
- t = ahcf->isar.id_aa64pfr0;
63
- t = FIELD_DP64(t, ID_AA64PFR0, SVE, 1);
64
- ahcf->isar.id_aa64pfr0 = t;
65
-
66
/*
67
* There is a range of kernels between kernel commit 73433762fcae
68
* and f81cb2c3ad41 which have a bug where the kernel doesn't expose
69
* SYS_ID_AA64ZFR0_EL1 via the ONE_REG API unless the VM has enabled
70
- * SVE support, so we only read it here, rather than together with all
71
- * the other ID registers earlier.
72
+ * SVE support, which resulted in an error rather than RAZ.
73
+ * So only read the register if we set KVM_ARM_VCPU_SVE above.
74
*/
75
err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64zfr0,
76
ARM64_SYS_REG(3, 0, 0, 4, 4));
77
--
78
2.25.1
diff view generated by jsdifflib
New patch
[PULL 3/3] target/arm: Move sve probe inside kvm >= 4.15 branch
1
From: Richard Henderson <richard.henderson@linaro.org>
1
2
3
The test for the IF block indicates no ID registers are exposed, much
4
less host support for SVE. Move the SVE probe into the ELSE block.
5
6
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
7
Message-id: 20220726045828.53697-4-richard.henderson@linaro.org
8
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
9
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10
---
11
target/arm/kvm64.c | 22 +++++++++++-----------
12
1 file changed, 11 insertions(+), 11 deletions(-)
13
14
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
15
index XXXXXXX..XXXXXXX 100644
16
--- a/target/arm/kvm64.c
17
+++ b/target/arm/kvm64.c
18
@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
19
err |= read_sys_reg64(fdarray[2], &ahcf->isar.reset_pmcr_el0,
20
ARM64_SYS_REG(3, 3, 9, 12, 0));
21
}
22
- }
23
24
- if (sve_supported) {
25
- /*
26
- * There is a range of kernels between kernel commit 73433762fcae
27
- * and f81cb2c3ad41 which have a bug where the kernel doesn't expose
28
- * SYS_ID_AA64ZFR0_EL1 via the ONE_REG API unless the VM has enabled
29
- * SVE support, which resulted in an error rather than RAZ.
30
- * So only read the register if we set KVM_ARM_VCPU_SVE above.
31
- */
32
- err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64zfr0,
33
- ARM64_SYS_REG(3, 0, 0, 4, 4));
34
+ if (sve_supported) {
35
+ /*
36
+ * There is a range of kernels between kernel commit 73433762fcae
37
+ * and f81cb2c3ad41 which have a bug where the kernel doesn't
38
+ * expose SYS_ID_AA64ZFR0_EL1 via the ONE_REG API unless the VM has
39
+ * enabled SVE support, which resulted in an error rather than RAZ.
40
+ * So only read the register if we set KVM_ARM_VCPU_SVE above.
41
+ */
42
+ err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64zfr0,
43
+ ARM64_SYS_REG(3, 0, 0, 4, 4));
44
+ }
45
}
46
47
kvm_arm_destroy_scratch_host_vcpu(fdarray);
48
--
49
2.25.1
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.