Only thing for Arm for rc1 is RTH's fix for the KVM SVE probe code.

The following changes since commit 4e06b3fc1b5e1ec03f22190eabe56891dc9c2236:

Merge tag 'pull-hex-20220731' of https://github.com/quic/qemu into staging (2022-07-31 21:38:54 -0700)

are available in the Git repository at:

https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220801

for you to fetch changes up to 5265d24c981dfdda8d29b44f7e84a514da75eedc:

target/arm: Move sve probe inside kvm >= 4.15 branch (2022-08-01 16:21:18 +0100)

* Fix KVM SVE ID register probe code

Richard Henderson (3):

target/arm: Use kvm_arm_sve_supported in kvm_arm_get_host_cpu_features

target/arm: Set KVM_ARM_VCPU_SVE while probing the host

target/arm: Move sve probe inside kvm >= 4.15 branch

target/arm/kvm64.c | 45 ++++++++++++++++++++++-----------------------

1 file changed, 22 insertions(+), 23 deletions(-)

From: Richard Henderson <richard.henderson@linaro.org>

Indication for support for SVE will not depend on whether we

perform the query on the main kvm_state or the temp vcpu.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Message-id: 20220726045828.53697-2-richard.henderson@linaro.org

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

target/arm/kvm64.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c

--- a/target/arm/kvm64.c

+++ b/target/arm/kvm64.c

@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)

}

- sve_supported = ioctl(fdarray[0], KVM_CHECK_EXTENSION, KVM_CAP_ARM_SVE) > 0;

+ sve_supported = kvm_arm_sve_supported();

/* Add feature bits that can't appear until after VCPU init. */

if (sve_supported) {

2.25.1

From: Richard Henderson <richard.henderson@linaro.org>

Because we weren't setting this flag, our probe of ID_AA64ZFR0

was always returning zero. This also obviates the adjustment

of ID_AA64PFR0, which had sanitized the SVE field.

The effects of the bug are not visible, because the only thing that

ID_AA64ZFR0 is used for within qemu at present is tcg translation.

The other tests for SVE within KVM are via ID_AA64PFR0.SVE.

Reported-by: Zenghui Yu <yuzenghui@huawei.com>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Message-id: 20220726045828.53697-3-richard.henderson@linaro.org

target/arm/kvm64.c | 27 +++++++++++++--------------

1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c

--- a/target/arm/kvm64.c

+++ b/target/arm/kvm64.c

@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)

bool sve_supported;

bool pmu_supported = false;

uint64_t features = 0;

- uint64_t t;

int err;

/* Old kernels may not know about the PREFERRED_TARGET ioctl: however

@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)

struct kvm_vcpu_init init = { .target = -1, };

/*

- * Ask for Pointer Authentication if supported. We can't play the

- * SVE trick of synthesising the ID reg as KVM won't tell us

- * whether we have the architected or IMPDEF version of PAuth, so

- * we have to use the actual ID regs.

+ * Ask for SVE if supported, so that we can query ID_AA64ZFR0,

+ * which is otherwise RAZ.

+ sve_supported = kvm_arm_sve_supported();

+ if (sve_supported) {

+ init.features[0] |= 1 << KVM_ARM_VCPU_SVE;

+ /*

+ * Ask for Pointer Authentication if supported, so that we get

+ * the unsanitized field values for AA64ISAR1_EL1.

*/

if (kvm_arm_pauth_supported()) {

init.features[0] |= (1 << KVM_ARM_VCPU_PTRAUTH_ADDRESS |

@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)

}

- sve_supported = kvm_arm_sve_supported();

-

- /* Add feature bits that can't appear until after VCPU init. */

if (sve_supported) {

- t = ahcf->isar.id_aa64pfr0;

- t = FIELD_DP64(t, ID_AA64PFR0, SVE, 1);

- ahcf->isar.id_aa64pfr0 = t;

-

/*

* There is a range of kernels between kernel commit 73433762fcae

* and f81cb2c3ad41 which have a bug where the kernel doesn't expose

* SYS_ID_AA64ZFR0_EL1 via the ONE_REG API unless the VM has enabled

- * SVE support, so we only read it here, rather than together with all

- * the other ID registers earlier.

+ * SVE support, which resulted in an error rather than RAZ.

+ * So only read the register if we set KVM_ARM_VCPU_SVE above.

*/

err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64zfr0,

ARM64_SYS_REG(3, 0, 0, 4, 4));

2.25.1

From: Richard Henderson <richard.henderson@linaro.org>

The test for the IF block indicates no ID registers are exposed, much

less host support for SVE. Move the SVE probe into the ELSE block.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Message-id: 20220726045828.53697-4-richard.henderson@linaro.org

target/arm/kvm64.c | 22 +++++++++++-----------

1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c

--- a/target/arm/kvm64.c

+++ b/target/arm/kvm64.c

@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)

err |= read_sys_reg64(fdarray[2], &ahcf->isar.reset_pmcr_el0,

ARM64_SYS_REG(3, 3, 9, 12, 0));

}

- }

- if (sve_supported) {

- /*

- * There is a range of kernels between kernel commit 73433762fcae

- * and f81cb2c3ad41 which have a bug where the kernel doesn't expose

- * SYS_ID_AA64ZFR0_EL1 via the ONE_REG API unless the VM has enabled

- * SVE support, which resulted in an error rather than RAZ.

- * So only read the register if we set KVM_ARM_VCPU_SVE above.

- */

- err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64zfr0,

- ARM64_SYS_REG(3, 0, 0, 4, 4));

+ if (sve_supported) {

+ /*

+ * There is a range of kernels between kernel commit 73433762fcae

+ * and f81cb2c3ad41 which have a bug where the kernel doesn't

+ * expose SYS_ID_AA64ZFR0_EL1 via the ONE_REG API unless the VM has

+ * enabled SVE support, which resulted in an error rather than RAZ.

+ * So only read the register if we set KVM_ARM_VCPU_SVE above.

+ */

+ err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64zfr0,

+ ARM64_SYS_REG(3, 0, 0, 4, 4));

+ }

}

kvm_arm_destroy_scratch_host_vcpu(fdarray);

2.25.1