arm: enable MTE for QEMU + kvm
v3 cover arm: enable MTE for QEMU + kvm
After wayyy too long (last version was sent in *July*), a respin of my kvm/mte series. Still no migration support. I've been hacking around on a device for transferring tags while stopped, but don't really have anything to show, probably because I get distra- <ohh, what's that?>
...I guess you get the point :(
Anyway, I wanted to post this as non-RFC; likely too late for 7.2, but maybe for 8.0 (and I'd get a chance to make at least pre-copy migration work; I'm open to suggestions for that. Support for post-copy needs kernel-side changes.) Tested on the FVP models; qtests only on a non-MTE KVM host.
Changes v2->v3:
- rebase to current master
- drop some parts of the qtests that didn't actually work
- really minor stuff
- drop RFC
Cornelia Huck (2):
arm/kvm: add support for MTE
qtests/arm: add some mte tests
docs/system/arm/cpu-features.rst | 21 +++++ target/arm/cpu.c | 18 ++--- target/arm/cpu.h | 1 + target/arm/cpu64.c | 133 +++++++++++++++++++++++++++++++ target/arm/internals.h | 1 + target/arm/kvm64.c | 5 ++ target/arm/kvm_arm.h | 12 +++ target/arm/monitor.c | 1 + tests/qtest/arm-cpu-features.c | 76 ++++++++++++++++++ 9 files changed, 256 insertions(+), 12 deletions(-)
Signature · 1 line
2.37.3
PATCH v3 1/2 arm/kvm: add support for MTE
Introduce a new cpu feature flag to control MTE support. To preserve backwards compatibility for tcg, MTE will continue to be enabled as long as tag memory has been provided.
If MTE has been enabled, we need to disable migration, as we do not yet have a way to migrate the tags as well. Therefore, MTE will stay off with KVM unless requested explicitly.
--- docs/system/arm/cpu-features.rst | 21 +++++ target/arm/cpu.c | 18 ++--- target/arm/cpu.h | 1 + target/arm/cpu64.c | 133 +++++++++++++++++++++++++++++++ target/arm/internals.h | 1 + target/arm/kvm64.c | 5 ++ target/arm/kvm_arm.h | 12 +++ target/arm/monitor.c | 1 + 8 files changed, 180 insertions(+), 12 deletions(-)
docs/system/arm/cpu-features.rst +21 -0
@@ -443,3 +443,24 @@ As with ``sve-default-vector-length``, if the default length is larger than the maximum vector length enabled, the actual vector length will be reduced. If this property is set to ``-1`` then the default vector length is set to the maximum possible length. + +MTE CPU Property +================ + +The ``mte`` property controls the Memory Tagging Extension. For TCG, it requires +presence of tag memory (which can be turned on for the ``virt`` machine via +``mte=on``). For KVM, it requires the ``KVM_CAP_ARM_MTE`` capability; until +proper migration support is implemented, enabling MTE will install a migration +blocker. + +If not specified explicitly via ``on`` or ``off``, MTE will be available +according to the following rules: + +* When TCG is used, MTE will be available iff tag memory is available; i.e. it + preserves the behaviour prior to introduction of the feature. + +* When KVM is used, MTE will default to off, so that migration will not + unintentionally be blocked. + +* Other accelerators currently don't support MTE. +
target/arm/cpu.c +6 -12
@@ -1479,6 +1479,11 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp)error_propagate (errp, local_err); return; } +arm_cpu_mte_finalize (cpu, &local_err); +if (local_err !=NULL ) { +error_propagate (errp, local_err); +return ; + } }#endif
@@ -1555,7 +1560,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) }if (cpu->tag_memory) {error_setg (errp, -"Cannot enable %s when guest CPUs has MTE enabled" , +"Cannot enable %s when guest CPUs has tag memory enabled" ,current_accel_name ());return ; }
@@ -1934,17 +1939,6 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) ID_PFR1, VIRTUALIZATION, 0); } -#ifndef CONFIG_USER_ONLY -if (cpu->tag_memory ==NULL &&cpu_isar_feature (aa64_mte, cpu)) { -/* -* Disable the MTE feature bits if we do not have tag-memory -* provided by the machine. -*/ - cpu->isar.id_aa64pfr1 = -FIELD_DP64 (cpu->isar.id_aa64pfr1,ID_AA64PFR1 ,MTE ,0 ); - } -#endif -if (tcg_enabled ()) {/* * Don't report the Statistical Profiling Extension in the ID
target/arm/cpu.h +1 -0
@@ -1027,6 +1027,7 @@ struct ArchCPU {bool prop_pauth;bool prop_pauth_impdef;bool prop_lpa2; +OnOffAuto prop_mte;/* DCZ blocksize, in log_2(words), ie low 4 bits of DCZID_EL0 */ uint32_t dcz_blocksize;
target/arm/cpu64.c +133 -0
157 lines not on this page · raw message
target/arm/internals.h +1 -0
@@ -1313,6 +1313,7 @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp);void arm_cpu_sme_finalize (ARMCPU *cpu,Error **errp);void arm_cpu_pauth_finalize (ARMCPU *cpu,Error **errp);void arm_cpu_lpa2_finalize (ARMCPU *cpu,Error **errp); +void arm_cpu_mte_finalize (ARMCPU *cpu,Error **errp);#endif #ifdef CONFIG_USER_ONLY
target/arm/kvm64.c +5 -0
@@ -764,6 +764,11 @@ bool kvm_arm_steal_time_supported(void)return kvm_check_extension (kvm_state,KVM_CAP_STEAL_TIME ); } +bool kvm_arm_mte_supported (void ) +{ +return kvm_check_extension (kvm_state,KVM_CAP_ARM_MTE ); +} +QEMU_BUILD_BUG_ON (KVM_ARM64_SVE_VQ_MIN !=1 );uint32_t kvm_arm_sve_get_vls (CPUState *cs)
target/arm/kvm_arm.h +12 -0
@@ -305,6 +305,13 @@ bool kvm_arm_pmu_supported(void);*/ bool kvm_arm_sve_supported (void ); +/** +* kvm_arm_mte_supported: +* +* Returns: true if KVM can enable MTE, and false otherwise. +*/ +bool kvm_arm_mte_supported (void ); +/** * kvm_arm_get_max_vm_ipa_size: * @ms: Machine state handle
@@ -395,6 +402,11 @@ static inline bool kvm_arm_steal_time_supported(void)return false; } +static inline bool kvm_arm_mte_supported (void ) +{ +return false; +} +/* * These functions should never actually be called without KVM support. */
target/arm/monitor.c +1 -0
@@ -96,6 +96,7 @@ static const char *cpu_model_advertised_features[] = {"sve1408" ,"sve1536" ,"sve1664" ,"sve1792" ,"sve1920" ,"sve2048" ,"kvm-no-adjvtime" ,"kvm-steal-time" ,"pauth" ,"pauth-impdef" , +"mte" ,NULL };
Signature · 1 line
2.37.3
PATCH v3 2/2 qtests/arm: add some mte tests
In reply to Cornelia Huck--- tests/qtest/arm-cpu-features.c | 76 ++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)
tests/qtest/arm-cpu-features.c +76 -0
@@ -22,6 +22,7 @@#define MACHINE "-machine virt,gic-version=max -accel tcg "#define MACHINE_KVM "-machine virt,gic-version=max -accel kvm -accel tcg " +#define MACHINE_MTE "-machine virt,gic-version=max,mte=on -accel tcg "#define QUERY_HEAD "{ 'execute': 'query-cpu-model-expansion', " \ " 'arguments': { 'type': 'full', "#define QUERY_TAIL "}}"
@@ -155,6 +156,18 @@ static bool resp_get_feature(QDict *resp, const char *feature)g_assert (qdict_get_bool (_props, feature) == (expected_value)); \ }) +#define resp_assert_feature_str (resp, feature, expected_value) \ +({ \ + QDict *_props; \ + \ + g_assert(_resp); \ + g_assert(resp_has_props(_resp)); \ + _props = resp_get_props(_resp); \ + g_assert(qdict_get(_props, feature)); \ + g_assert_cmpstr(qdict_get_try_str(_props, feature), ==, \ + expected_value); \ +}) +#define assert_feature (qts, cpu_type, feature, expected_value) \ ({ \ QDict *_resp; \
@@ -165,6 +178,16 @@ static bool resp_get_feature(QDict *resp, const char *feature)qobject_unref (_resp); \ }) +#define assert_feature_str (qts, cpu_type, feature, expected_value) \ +({ \ + QDict *_resp; \ + \ + _resp = do_query_no_props(qts, cpu_type); \ + g_assert(_resp); \ + resp_assert_feature_str(_resp, feature, expected_value); \ + qobject_unref(_resp); \ +}) +#define assert_set_feature (qts, cpu_type, feature, value) \ ({ \ const char *_fmt = (value) ? "{ %s: true }" : "{ %s: false }"; \
@@ -176,6 +199,16 @@ static bool resp_get_feature(QDict *resp, const char *feature)qobject_unref (_resp); \ }) +#define assert_set_feature_str (qts, cpu_type, feature, value, _fmt) \ +({ \ + QDict *_resp; \ + \ + _resp = do_query(qts, cpu_type, _fmt, feature); \ + g_assert(_resp); \ + resp_assert_feature_str(_resp, feature, value); \ + qobject_unref(_resp); \ +}) +#define assert_has_feature_enabled (qts, cpu_type, feature) \ assert_feature(qts, cpu_type, feature, true)
@@ -412,6 +445,24 @@ static void sve_tests_sve_off_kvm(const void *data)qtest_quit (qts); } +static void mte_tests_tag_memory_on (const void *data) +{ +QTestState *qts; + + qts =qtest_init (MACHINE_MTE "-cpu max" ); + +/* +* With tag memory, "mte" should default to on, and explicitly specifying +* either on or off should be fine. +*/ +assert_has_feature (qts,"max" ,"mte" ); + +assert_set_feature_str (qts,"max" ,"mte" ,"off" ,"{ 'mte': 'off' }" ); +assert_set_feature_str (qts,"max" ,"mte" ,"on" ,"{ 'mte': 'on' }" ); + +qtest_quit (qts); +} +static void pauth_tests_default (QTestState *qts,const char *cpu_type) {assert_has_feature_enabled (qts, cpu_type,"pauth" );
@@ -424,6 +475,21 @@ static void pauth_tests_default(QTestState *qts, const char *cpu_type) "{ 'pauth': false, 'pauth-impdef': true }"); } +static void mte_tests_default (QTestState *qts,const char *cpu_type) +{ +assert_has_feature (qts, cpu_type,"mte" ); + +/* +* Without tag memory, mte will be off under tcg. +* Explicitly enabling it yields an error. +*/ +assert_has_feature (qts, cpu_type,"mte" ); + +assert_set_feature_str (qts,"max" ,"mte" ,"off" ,"{ 'mte': 'off' }" ); +assert_error (qts, cpu_type,"mte=on requires tag memory" , +"{ 'mte': 'on' }" ); +} +static void test_query_cpu_model_expansion (const void *data) {QTestState *qts;
@@ -473,6 +539,7 @@ static void test_query_cpu_model_expansion(const void *data)sve_tests_default (qts,"max" );pauth_tests_default (qts,"max" ); +mte_tests_default (qts,"max" );/* Test that features that depend on KVM generate errors without. */ assert_error(qts, "max",
@@ -516,6 +583,13 @@ static void test_query_cpu_model_expansion_kvm(const void *data)assert_set_feature (qts,"host" ,"pmu" , false);assert_set_feature (qts,"host" ,"pmu" , true); +/* +* Unfortunately, there's no easy way to test whether this instance +* of KVM supports MTE. So we can only assert that the feature +* is present, but not whether it can be toggled. +*/ +assert_has_feature (qts,"host" ,"mte" ); +/* * Some features would be enabled by default, but they're disabled * because this instance of KVM doesn't support them. Test that the
@@ -630,6 +704,8 @@ int main(int argc, char **argv) NULL, sve_tests_sve_off);qtest_add_data_func ("/arm/kvm/query-cpu-model-expansion/sve-off" ,NULL , sve_tests_sve_off_kvm); +qtest_add_data_func ("/arm/max/query-cpu-model-expansion/tag-memory" , +NULL , mte_tests_tag_memory_on); }return g_test_run ();
Signature · 1 line
2.37.3
Re: [PATCH v3 2/2] qtests/arm: add some mte tests
Quoted 140 lines · Cornelia Huck
Signed-off-by Cornelia Huck <[email protected]>--- tests/qtest/arm-cpu-features.c | 76 ++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)tests/qtest/arm-cpu-features.c +74
-0@@ -22,6 +22,7 @@#define MACHINE "-machine virt,gic-version=max -accel tcg "#define MACHINE_KVM "-machine virt,gic-version=max -accel kvm -accel tcg " +#define MACHINE_MTE "-machine virt,gic-version=max,mte=on -accel tcg "#define QUERY_HEAD "{ 'execute': 'query-cpu-model-expansion', " \ " 'arguments': { 'type': 'full', "#define QUERY_TAIL "}}"@@ -155,6 +156,18 @@ static bool resp_get_feature(QDict *resp, const char *feature)g_assert (qdict_get_bool (_props, feature) == (expected_value)); \ }) +#define resp_assert_feature_str (resp, feature, expected_value) \ +({ \ + QDict *_props; \ + \ + g_assert(_resp); \ + g_assert(resp_has_props(_resp)); \ + _props = resp_get_props(_resp); \ + g_assert(qdict_get(_props, feature)); \ + g_assert_cmpstr(qdict_get_try_str(_props, feature), ==, \ + expected_value); \ +}) +#define assert_feature (qts, cpu_type, feature, expected_value) \ ({ \ QDict *_resp; \@@ -165,6 +178,16 @@ static bool resp_get_feature(QDict *resp, const char *feature)qobject_unref (_resp); \ }) +#define assert_feature_str (qts, cpu_type, feature, expected_value) \ +({ \ + QDict *_resp; \ + \ + _resp = do_query_no_props(qts, cpu_type); \ + g_assert(_resp); \ + resp_assert_feature_str(_resp, feature, expected_value); \ + qobject_unref(_resp); \ +}) +#define assert_set_feature (qts, cpu_type, feature, value) \ ({ \ const char *_fmt = (value) ? "{ %s: true }" : "{ %s: false }"; \@@ -176,6 +199,16 @@ static bool resp_get_feature(QDict *resp, const char *feature)qobject_unref (_resp); \ }) +#define assert_set_feature_str (qts, cpu_type, feature, value, _fmt) \ +({ \ + QDict *_resp; \ + \ + _resp = do_query(qts, cpu_type, _fmt, feature); \ + g_assert(_resp); \ + resp_assert_feature_str(_resp, feature, value); \ + qobject_unref(_resp); \ +}) +#define assert_has_feature_enabled (qts, cpu_type, feature) \ assert_feature(qts, cpu_type, feature, true)@@ -412,6 +445,24 @@ static void sve_tests_sve_off_kvm(const void *data)qtest_quit (qts); } +static void mte_tests_tag_memory_on (const void *data) +{ +QTestState *qts; + + qts =qtest_init (MACHINE_MTE "-cpu max" ); + +/* +* With tag memory, "mte" should default to on, and explicitly specifying +* either on or off should be fine. +*/ +assert_has_feature (qts,"max" ,"mte" ); + +assert_set_feature_str (qts,"max" ,"mte" ,"off" ,"{ 'mte': 'off' }" ); +assert_set_feature_str (qts,"max" ,"mte" ,"on" ,"{ 'mte': 'on' }" ); + +qtest_quit (qts); +} +static void pauth_tests_default (QTestState *qts,const char *cpu_type) {assert_has_feature_enabled (qts, cpu_type,"pauth" );@@ -424,6 +475,21 @@ static void pauth_tests_default(QTestState *qts, const char *cpu_type) "{ 'pauth': false, 'pauth-impdef': true }"); } +static void mte_tests_default (QTestState *qts,const char *cpu_type) +{ +assert_has_feature (qts, cpu_type,"mte" ); + +/* +* Without tag memory, mte will be off under tcg. +* Explicitly enabling it yields an error. +*/ +assert_has_feature (qts, cpu_type,"mte" ); + +assert_set_feature_str (qts,"max" ,"mte" ,"off" ,"{ 'mte': 'off' }" ); +assert_error (qts, cpu_type,"mte=on requires tag memory" , +"{ 'mte': 'on' }" ); +} +static void test_query_cpu_model_expansion (const void *data) {QTestState *qts;@@ -473,6 +539,7 @@ static void test_query_cpu_model_expansion(const void *data)sve_tests_default (qts,"max" );pauth_tests_default (qts,"max" ); +mte_tests_default (qts,"max" );/* Test that features that depend on KVM generate errors without. */ assert_error(qts, "max",@@ -516,6 +583,13 @@ static void test_query_cpu_model_expansion_kvm(const void *data)assert_set_feature (qts,"host" ,"pmu" , false);assert_set_feature (qts,"host" ,"pmu" , true); +/* +* Unfortunately, there's no easy way to test whether this instance +* of KVM supports MTE. So we can only assert that the feature +* is present, but not whether it can be toggled. +*/ +assert_has_feature (qts,"host" ,"mte" ); +/* * Some features would be enabled by default, but they're disabled * because this instance of KVM doesn't support them. Test that the
tests/qtest/arm-cpu-features.c int main(int argc, char **argv) · line 708
Quoted 5 lines
tests/qtest/arm-cpu-features.c +2
-0@@ -630,6 +704,8 @@ int main(int argc, char **argv) NULL, sve_tests_sve_off);qtest_add_data_func ("/arm/kvm/query-cpu-model-expansion/sve-off" ,NULL , sve_tests_sve_off_kvm); +qtest_add_data_func ("/arm/max/query-cpu-model-expansion/tag-memory" , +NULL , mte_tests_tag_memory_on);
Is it already possible to compile qemu-system-aarch64 with --disable-tcg ? If so, I'd recommend a qtest_has_accel("tcg") here ... but apart from that:
Re: [PATCH v3 2/2] qtests/arm: add some mte tests
Quoted 5 lines · Thomas Huth
tests/qtest/arm-cpu-features.c int main(int argc, char **argv) · line 708
Quoted 2 lines · Cornelia Huck
tests/qtest/arm-cpu-features.c +2
-0+qtest_add_data_func ("/arm/max/query-cpu-model-expansion/tag-memory" , +NULL , mte_tests_tag_memory_on);Is it already possible to compile qemu-system-aarch64 with --disable-tcg ?
Not yet, the code is too entangled... I tried a bit ago, but didn't make much progress (on my todo list, but won't mind someone else doing it :)
Quoted 3 lines
If so, I'd recommend a
qtest_has_accel("tcg")here ... but apart from that:Acked-by Thomas Huth <[email protected]>
Thanks!
Quoted 22 lines · Cornelia Huck
After wayyy too long (last version was sent in *July*), a respin of my kvm/mte series. Still no migration support. I've been hacking around on a device for transferring tags while stopped, but don't really have anything to show, probably because I get distra- <ohh, what's that?>
...I guess you get the point :(
Anyway, I wanted to post this as non-RFC; likely too late for 7.2, but maybe for 8.0 (and I'd get a chance to make at least pre-copy migration work; I'm open to suggestions for that. Support for post-copy needs kernel-side changes.) Tested on the FVP models; qtests only on a non-MTE KVM host.
Changes
v2->v3:
- rebase to current master
- drop some parts of the qtests that didn't actually work
- really minor stuff
- drop RFCCornelia Huck (2):
arm/kvm: add support for MTE
qtests/arm: add some mte tests
Quoted 11 lines
docs/system/arm/cpu-features.rst | 21 +++++ target/arm/cpu.c | 18 ++--- target/arm/cpu.h | 1 + target/arm/cpu64.c | 133 +++++++++++++++++++++++++++++++ target/arm/internals.h | 1 + target/arm/kvm64.c | 5 ++ target/arm/kvm_arm.h | 12 +++ target/arm/monitor.c | 1 + tests/qtest/arm-cpu-features.c | 76 ++++++++++++++++++ 9 files changed, 256 insertions(+), 12 deletions(-)
Friendly ping, as 7.2 has been released now... this should still apply without problems AFAICS. I can also respin, if needed.