Skip to contentSkip to conversation

KVM: arm64: Making BT Field in ID_AA64PFR1_EL1 writable

PATCH In review Shaoqin Huang 2 participants 5 messages Jun 17, 2024 – Jun 18, 2024

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover KVM: arm64: Making BT Field in ID_AA64PFR1_EL1 writable

In this patch series, we try to make more register fields writable like ID_AA64PFR1_EL1.BT since this can benifit the migration between some of the machines which have different BT values.

Changelog:
----------
RFCv1 -> v1:
* Fix the compilation error.
* Delete the machine specific information and make the description more generable.

RFCv1: https://lore.kernel.org/all/[email protected]/

Shaoqin Huang (2):
KVM: arm64: Allow BT field in ID_AA64PFR1_EL1 writable
KVM: selftests: aarch64: Add writable test for ID_AA64PFR1_EL1

 arch/arm64/kvm/sys_regs.c                         | 2 +-
 tools/testing/selftests/kvm/aarch64/set_id_regs.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
Signature · 1 line
2.40.1
#1 lore raw

PATCH 1/2 KVM: arm64: Allow BT field in ID_AA64PFR1_EL1 writable

When migrating between some of the ARM machines, the BT field value in ID_AA64PFR1_EL1 register is different and not writable. This causes migration failed.

The BT field means Branch Target Identification mechanism support in AArch64 state. The value 0 means BT is not implemented, the value 1 means BT is implemented.

Here is an example of the migration if the BT value is different:
* On Migration Src, the BT value is 0.
* On Migration Dst, the BT value is 1.

As it defined in the ftr_id_aa64dfr0, the samller value is safe. So if we make the BT field writable, on the Migration Dst the BT field will be overrided with value 0.

---
 arch/arm64/kvm/sys_regs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kvm/sys_regs.c +1 -1
index c9f4f387155f..958e4d251535 100644
@@ -2292,7 +2292,7 @@ static const struct sys_reg_desc sys_reg_descs[] = {
 		   ID_AA64PFR0_EL1_GIC |
 		   ID_AA64PFR0_EL1_AdvSIMD |
 		   ID_AA64PFR0_EL1_FP), },
-	ID_SANITISED(ID_AA64PFR1_EL1),
+	ID_WRITABLE(ID_AA64PFR1_EL1, ID_AA64PFR1_EL1_BT),
 	ID_UNALLOCATED(4,2),
 	ID_UNALLOCATED(4,3),
 	ID_WRITABLE(ID_AA64ZFR0_EL1, ~ID_AA64ZFR0_EL1_RES0),
Signature · 1 line
2.40.1
#2 lore raw

PATCH 2/2 KVM: selftests: aarch64: Add writable test for ID_AA64PFR1_EL1

In reply to Shaoqin Huang

Add test for the BT field in the ID_AA64PFR1_EL1 register.

---
 tools/testing/selftests/kvm/aarch64/set_id_regs.c | 6 ++++++
 1 file changed, 6 insertions(+)
tools/testing/selftests/kvm/aarch64/set_id_regs.c +6 -0
index 16e2338686c1..5381b8ec5562 100644
@@ -133,6 +133,11 @@ static const struct reg_ftr_bits ftr_id_aa64pfr0_el1[] = {
 	REG_FTR_END,
 };
 
+static const struct reg_ftr_bits ftr_id_aa64pfr1_el1[] = {
+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR1_EL1, BT, 0),
+	REG_FTR_END,
+};
+
 static const struct reg_ftr_bits ftr_id_aa64mmfr0_el1[] = {
 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR0_EL1, ECV, 0),
 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR0_EL1, EXS, 0),
@@ -199,6 +204,7 @@ static struct test_feature_reg test_regs[] = {
 	TEST_REG(SYS_ID_AA64ISAR1_EL1, ftr_id_aa64isar1_el1),
 	TEST_REG(SYS_ID_AA64ISAR2_EL1, ftr_id_aa64isar2_el1),
 	TEST_REG(SYS_ID_AA64PFR0_EL1, ftr_id_aa64pfr0_el1),
+	TEST_REG(SYS_ID_AA64PFR1_EL1, ftr_id_aa64pfr1_el1),
 	TEST_REG(SYS_ID_AA64MMFR0_EL1, ftr_id_aa64mmfr0_el1),
 	TEST_REG(SYS_ID_AA64MMFR1_EL1, ftr_id_aa64mmfr1_el1),
 	TEST_REG(SYS_ID_AA64MMFR2_EL1, ftr_id_aa64mmfr2_el1),
Signature · 1 line
2.40.1
#3 lore raw
In reply to Shaoqin Huang
Quoted 10 lines · Shaoqin Huang

In this patch series, we try to make more register fields writable like ID_AA64PFR1_EL1.BT since this can benifit the migration between some of the machines which have different BT values.

Changelog:
----------
RFCv1 -> v1:
* Fix the compilation error.
* Delete the machine specific information and make the description more generable.

Can you please address Marc's feedback?

If we only make things writable a field at a time it's going to take forever to catch up w/ the architecture.

https://lore.kernel.org/kvmarm/[email protected]/

Signature · 2 lines
Thanks,
Oliver
#4 lore raw

Hi Oliver,

Quoted 12 lines · Oliver Upton
Quoted 10 lines · Shaoqin Huang

In this patch series, we try to make more register fields writable like ID_AA64PFR1_EL1.BT since this can benifit the migration between some of the machines which have different BT values.

Changelog:
----------
RFCv1 -> v1:
* Fix the compilation error.
* Delete the machine specific information and make the description more generable.

Quoted 6 lines

Can you please address Marc's feedback?

If we only make things writable a field at a time it's going to take forever to catch up w/ the architecture.

https://lore.kernel.org/kvmarm/[email protected]/

Ok. I will update the patch series again with tackling the full register.

Thanks,
Shaoqin

Quoted 1 line
Signature · 1 line
Shaoqin