| Message ID | 20230111161317.52250-3-cohuck@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm: enable MTE for QEMU + kvm | expand |
On 11/1/23 17:13, Cornelia Huck wrote: > Acked-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > tests/qtest/arm-cpu-features.c | 76 ++++++++++++++++++++++++++++++++++ > 1 file changed, 76 insertions(+) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Hi Connie, On 1/11/23 17:13, Cornelia Huck wrote: > Acked-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Cornelia Huck <cohuck@redhat.com> Maybe add some extra information about what tests are run. Also you could add an example of test invocation so that any people interested in can easily run those new tests? > --- > tests/qtest/arm-cpu-features.c | 76 ++++++++++++++++++++++++++++++++++ > 1 file changed, 76 insertions(+) > > diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c > index 5a145273860c..e264d2178a8b 100644 > --- a/tests/qtest/arm-cpu-features.c > +++ b/tests/qtest/arm-cpu-features.c > @@ -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"); called twice > + > + assert_set_feature_str(qts, "max", "mte", "off", "{ 'mte': 'off' }"); > + assert_error(qts, cpu_type, "mte=on requires tag memory", > + "{ 'mte': 'on' }"); nit. with pauth_tests_default form: cannot enable mte without tag memory > +} > + > 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"); why isn't it possible to implement something like kvm_supports_steal_time = resp_get_feature(resp, "kvm-steal-time"); Could you elaborate? > + > /* > * 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(); Thanks Eric
On Mon, Jan 23 2023, Eric Auger <eauger@redhat.com> wrote: > Hi Connie, > On 1/11/23 17:13, Cornelia Huck wrote: >> Acked-by: Thomas Huth <thuth@redhat.com> >> Signed-off-by: Cornelia Huck <cohuck@redhat.com> > Maybe add some extra information about what tests are run. Also you > could add an example of test invocation so that any people interested in > can easily run those new tests? Hm, it's just a part of the normal, standard qtests -- not sure what I should add there? > >> --- >> tests/qtest/arm-cpu-features.c | 76 ++++++++++++++++++++++++++++++++++ >> 1 file changed, 76 insertions(+) (...) >> +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"); > called twice Ok, that's probably some kind of rebase artifact. >> + >> + assert_set_feature_str(qts, "max", "mte", "off", "{ 'mte': 'off' }"); >> + assert_error(qts, cpu_type, "mte=on requires tag memory", >> + "{ 'mte': 'on' }"); > nit. with pauth_tests_default form: cannot enable mte without tag memory Not sure what you mean here? >> +} >> + >> 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"); > why isn't it possible to implement something like > kvm_supports_steal_time = resp_get_feature(resp, "kvm-steal-time"); > Could you elaborate? I really should have written that down in detail, but I _think_ that's because of OnOffAuto... if the prop is not set explicitly, we don't know what is supported. Unless someone has an idea how to work around that?
diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index 5a145273860c..e264d2178a8b 100644 --- a/tests/qtest/arm-cpu-features.c +++ b/tests/qtest/arm-cpu-features.c @@ -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();