[PULL 0/3] target-arm queue
[PULL 0/1] target-arm queue
1
Only thing for Arm for rc1 is RTH's fix for the KVM SVE probe code.
1
Just one bugfix patch for this rc:
2
2
3
-- PMM
3
The following changes since commit ca5f3d4df1b47d7f66a109cdb504e83dfd7ec433:
4
4
5
The following changes since commit 4e06b3fc1b5e1ec03f22190eabe56891dc9c2236:
5
Merge tag 'pull-la-20220808' of https://gitlab.com/rth7680/qemu into staging (2022-08-08 19:51:12 -0700)
6
7
Merge tag 'pull-hex-20220731' of https://github.com/quic/qemu into staging (2022-07-31 21:38:54 -0700)
8
6
9
are available in the Git repository at:
7
are available in the Git repository at:
10
8
11
https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220801
9
https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220809
12
10
13
for you to fetch changes up to 5265d24c981dfdda8d29b44f7e84a514da75eedc:
11
for you to fetch changes up to c7f26ded6d5065e4116f630f6a490b55f6c5f58e:
14
12
15
target/arm: Move sve probe inside kvm >= 4.15 branch (2022-08-01 16:21:18 +0100)
13
icount: Take iothread lock when running QEMU timers (2022-08-09 10:55:14 +0100)
16
14
17
----------------------------------------------------------------
15
----------------------------------------------------------------
18
target-arm queue:
16
target-arm queue:
19
* Fix KVM SVE ID register probe code
17
* icount: Take iothread lock when running QEMU timers
20
18
21
----------------------------------------------------------------
19
----------------------------------------------------------------
22
Richard Henderson (3):
20
Peter Maydell (1):
23
target/arm: Use kvm_arm_sve_supported in kvm_arm_get_host_cpu_features
21
icount: Take iothread lock when running QEMU timers
24
target/arm: Set KVM_ARM_VCPU_SVE while probing the host
25
target/arm: Move sve probe inside kvm >= 4.15 branch
26
22
27
target/arm/kvm64.c | 45 ++++++++++++++++++++++-----------------------
23
accel/tcg/tcg-accel-ops-icount.c | 6 ++++++
28
1 file changed, 22 insertions(+), 23 deletions(-)
24
1 file changed, 6 insertions(+)
diff view generated by jsdifflib
[PULL 1/3] target/arm: Use kvm_arm_sve_supported in kvm_arm_get_host_cpu_features
Deleted patch
1
From: Richard Henderson <richard.henderson@linaro.org>
2
1
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
[PULL 2/3] target/arm: Set KVM_ARM_VCPU_SVE while probing the host
Deleted patch
1
From: Richard Henderson <richard.henderson@linaro.org>
2
1
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
[PULL 3/3] target/arm: Move sve probe inside kvm >= 4.15 branch
[PULL 1/1] icount: Take iothread lock when running QEMU timers
1
From: Richard Henderson <richard.henderson@linaro.org>
1
The function icount_prepare_for_run() is called with the iothread
2
unlocked, but it can call icount_notify_aio_contexts() which will
3
run qemu timer handlers. Those are supposed to be run only with
4
the iothread lock held, so take the lock while we do that.
2
5
3
The test for the IF block indicates no ID registers are exposed, much
6
Since icount mode runs everything on a single thread anyway,
4
less host support for SVE. Move the SVE probe into the ELSE block.
7
not holding the lock is likely mostly not going to introduce
8
races, but it can cause us to trip over assertions that we
9
do hold the lock, such as the one reported in issue 1130.
5
10
6
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
11
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1130
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>
12
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
13
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
14
Tested-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
15
Message-id: 20220801164527.3134765-1-peter.maydell@linaro.org
10
---
16
---
11
target/arm/kvm64.c | 22 +++++++++++-----------
17
accel/tcg/tcg-accel-ops-icount.c | 6 ++++++
12
1 file changed, 11 insertions(+), 11 deletions(-)
18
1 file changed, 6 insertions(+)
13
19
14
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
20
diff --git a/accel/tcg/tcg-accel-ops-icount.c b/accel/tcg/tcg-accel-ops-icount.c
15
index XXXXXXX..XXXXXXX 100644
21
index XXXXXXX..XXXXXXX 100644
16
--- a/target/arm/kvm64.c
22
--- a/accel/tcg/tcg-accel-ops-icount.c
17
+++ b/target/arm/kvm64.c
23
+++ b/accel/tcg/tcg-accel-ops-icount.c
18
@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
24
@@ -XXX,XX +XXX,XX @@ void icount_prepare_for_run(CPUState *cpu)
19
err |= read_sys_reg64(fdarray[2], &ahcf->isar.reset_pmcr_el0,
25
replay_mutex_lock();
20
ARM64_SYS_REG(3, 3, 9, 12, 0));
26
21
}
27
if (cpu->icount_budget == 0) {
22
- }
28
+ /*
23
29
+ * We're called without the iothread lock, so must take it while
24
- if (sve_supported) {
30
+ * we're calling timer handlers.
25
- /*
31
+ */
26
- * There is a range of kernels between kernel commit 73433762fcae
32
+ qemu_mutex_lock_iothread();
27
- * and f81cb2c3ad41 which have a bug where the kernel doesn't expose
33
icount_notify_aio_contexts();
28
- * SYS_ID_AA64ZFR0_EL1 via the ONE_REG API unless the VM has enabled
34
+ qemu_mutex_unlock_iothread();
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
}
35
}
46
36
}
47
kvm_arm_destroy_scratch_host_vcpu(fdarray);
37
48
--
38
--
49
2.25.1
39
2.25.1
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.