From nobody Mon Feb 9 08:11:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657211400; cv=none; d=zohomail.com; s=zohoarc; b=izNEu8yKUu4hAQjUp53TJ+XM1v4Lhrec/7d1T+rQB0qjAdvhYrFlYmwsVu/3hGACLgha/5jn7A/vngobJELFidU8YQUVmmRBh7FYZH9iJOZGHpjv+MCHJK4tmvMkUNkPTEjMJb2qAN2E8pJc6otmDKBTzzU8Xtg0AyQdYb4cYsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657211400; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=E8sCoaxLOXpg7pnv4sV/NFcTS/eGnW5V+4PYPvvHC2M=; b=Hk/NiKBG4OMcX0M4SFRpwCs4YkU28QubhrVP9e9gAui829N/kQH9gRQCGiR7llpjD/cPsoS9dEMj2FUqCl5DkwcgT22o+2pTHcI+4vkmakWCsn7aM3GZcAbvM2H2/LWEs4m5BM/4th2CMqNr8bTWksdLNVgjSYGFnl2Acgb5XSc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657211400755530.5153186489705; Thu, 7 Jul 2022 09:30:00 -0700 (PDT) Received: from localhost ([::1]:35164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9UO6-0003mH-P9 for importer@patchew.org; Thu, 07 Jul 2022 12:29:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9UBr-00084c-Fz for qemu-devel@nongnu.org; Thu, 07 Jul 2022 12:17:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9UBp-0007Ag-DZ for qemu-devel@nongnu.org; Thu, 07 Jul 2022 12:17:19 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-308-3df8Gv1NMRGRwL9hfhEsCw-1; Thu, 07 Jul 2022 12:17:05 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 94A0C811E75; Thu, 7 Jul 2022 16:17:05 +0000 (UTC) Received: from gondolin.fritz.box (unknown [10.39.192.81]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CF1E2166B26; Thu, 7 Jul 2022 16:17:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657210636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E8sCoaxLOXpg7pnv4sV/NFcTS/eGnW5V+4PYPvvHC2M=; b=VYT/O0qEo/05H7AccwRHfbyB6In/vLq79XlIJLSY08MqQa1OPt8De8IsmmbgidvcYmSyH6 Pjo+/Qvw8TLwh2bYd+ljRkkLmUYvLyAh/g8BER4Qjn744IqH0/+x7YBaolchd6Wy9qor0i KWlAAOdjXEWtfogSdlh862jQdsFqByw= X-MC-Unique: 3df8Gv1NMRGRwL9hfhEsCw-1 From: Cornelia Huck To: Peter Maydell , Thomas Huth , Laurent Vivier Cc: Eric Auger , "Dr. David Alan Gilbert" , Juan Quintela , qemu-arm@nongnu.org, qemu-devel@nongnu.org, kvm@vger.kernel.org, Cornelia Huck Subject: [PATCH RFC v2 2/2] qtests/arm: add some mte tests Date: Thu, 7 Jul 2022 18:16:56 +0200 Message-Id: <20220707161656.41664-3-cohuck@redhat.com> In-Reply-To: <20220707161656.41664-1-cohuck@redhat.com> References: <20220707161656.41664-1-cohuck@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657211402185100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Cornelia Huck --- tests/qtest/arm-cpu-features.c | 77 ++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index 5a145273860c..466be857d391 100644 --- a/tests/qtest/arm-cpu-features.c +++ b/tests/qtest/arm-cpu-features.c @@ -22,6 +22,7 @@ =20 #define MACHINE "-machine virt,gic-version=3Dmax -accel tcg " #define MACHINE_KVM "-machine virt,gic-version=3Dmax -accel kvm -accel tcg= " +#define MACHINE_MTE "-machine virt,gic-version=3Dmax,mte=3Don -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) =3D=3D (expected_value)); = \ }) =20 +#define resp_assert_feature_str(resp, feature, expected_value) \ +({ \ + QDict *_props; \ + \ + g_assert(_resp); \ + g_assert(resp_has_props(_resp)); \ + _props =3D resp_get_props(_resp); \ + g_assert(qdict_get(_props, feature)); \ + g_assert_cmpstr(qdict_get_try_str(_props, feature), =3D=3D, = \ + 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); \ }) =20 +#define assert_feature_str(qts, cpu_type, feature, expected_value) \ +({ \ + QDict *_resp; \ + \ + _resp =3D 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 =3D (value) ? "{ %s: true }" : "{ %s: false }"; \ @@ -176,6 +199,16 @@ static bool resp_get_feature(QDict *resp, const char *= feature) qobject_unref(_resp); \ }) =20 +#define assert_set_feature_str(qts, cpu_type, feature, value, _fmt) \ +({ \ + QDict *_resp; \ + \ + _resp =3D 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) =20 @@ -412,6 +445,24 @@ static void sve_tests_sve_off_kvm(const void *data) qtest_quit(qts); } =20 +static void mte_tests_tag_memory_on(const void *data) +{ + QTestState *qts; + + qts =3D qtest_init(MACHINE_MTE "-cpu max"); + + /* + * With tag memory, "mte" should default to on, and explicitly specify= ing + * 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 }"); } =20 +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=3Don 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) =20 sve_tests_default(qts, "max"); pauth_tests_default(qts, "max"); + mte_tests_default(qts, "max"); =20 /* Test that features that depend on KVM generate errors without. = */ assert_error(qts, "max", @@ -499,6 +566,7 @@ static void test_query_cpu_model_expansion_kvm(const vo= id *data) if (g_str_equal(qtest_get_arch(), "aarch64")) { bool kvm_supports_steal_time; bool kvm_supports_sve; + bool kvm_supports_mte; char max_name[8], name[8]; uint32_t max_vq, vq; uint64_t vls; @@ -523,10 +591,12 @@ static void test_query_cpu_model_expansion_kvm(const = void *data) */ assert_has_feature(qts, "host", "kvm-steal-time"); assert_has_feature(qts, "host", "sve"); + assert_has_feature(qts, "host", "mte"); =20 resp =3D do_query_no_props(qts, "host"); kvm_supports_steal_time =3D resp_get_feature(resp, "kvm-steal-time= "); kvm_supports_sve =3D resp_get_feature(resp, "sve"); + kvm_supports_mte =3D resp_get_feature(resp, "mte"); vls =3D resp_get_sve_vls(resp); qobject_unref(resp); =20 @@ -592,6 +662,11 @@ static void test_query_cpu_model_expansion_kvm(const v= oid *data) } else { g_assert(vls =3D=3D 0); } + if (kvm_supports_mte) { + /* If we have mte then we should be able to toggle it. */ + assert_set_feature(qts, "host", "mte", false); + assert_set_feature(qts, "host", "mte", true); + } } else { assert_has_not_feature(qts, "host", "aarch64"); assert_has_not_feature(qts, "host", "pmu"); @@ -630,6 +705,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); } =20 return g_test_run(); --=20 2.35.3