From nobody Thu Apr 25 23:10:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684234469; cv=none; d=zohomail.com; s=zohoarc; b=AXPuyMP747ZdjJQXF+ko7eRQmpqLQIveFzvdLB49BhChEX6FbOJb46myIBZEfyr6RlZ+NzfJTLi277k7uO+9ZUa3Vf33yU01FhfC9mZJnykcA6Eh9pd3Uv45SlL3gPypI5ypaSQukCVTicqo0gFlbFJG6cG4KHhaZz+CD7cY4Vw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684234469; h=Content-Type:Content-Transfer-Encoding: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=5IKM/xc8C3UBvBlX3YnH3BYOF70HTzPpC4KydfM7laM=; b=G/FRE5yBPDVSYcA2+SWdW8cxmPokvLZGr+rroyLgYQ1kU1XXdpqXLXqTiN37NneZNxQWkTgKGYwGW6NbCckzZSKVH0DF2IPmozUIQUKmaLMfCiEyYRQeZtBSMr2SjludbkpEwO3tapdIEgrztJI7ro+LoETy5MLIEFGxHu3IYNA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 16842344692221018.1654905796607; Tue, 16 May 2023 03:54:29 -0700 (PDT) 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-647-3JCHIq3WNfuXiOKm4jX_3A-1; Tue, 16 May 2023 06:54:25 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8A8C685A5B1; Tue, 16 May 2023 10:54:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7691814171C1; Tue, 16 May 2023 10:54:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5B92E19466DF; Tue, 16 May 2023 10:54:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D4D0619465A3 for ; Tue, 16 May 2023 10:54:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5057C2026D16; Tue, 16 May 2023 10:54:18 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC1C82027043 for ; Tue, 16 May 2023 10:54:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684234468; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=5IKM/xc8C3UBvBlX3YnH3BYOF70HTzPpC4KydfM7laM=; b=EmjjWDRd25VU7bgbNP0UIW5TAz55kEHuVaZQNI0v97K/r9fGCscKh+qxMFc95nnKHjxAxV s6cRMgXWvlaPFk4aW1pKrlw0Qmdr4iroQic4/ecdp9H5m4siIh2gCulhLVuzGT6JLpCitC /CRuULE21W1RTNV+T520+q8qQ2m4NYU= X-MC-Unique: 3JCHIq3WNfuXiOKm4jX_3A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/4] conf: Introduce MTE domain feature Date: Tue, 16 May 2023 12:54:13 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684234471190100005 Content-Type: text/plain; charset="utf-8"; x-default="true" The Memory Tagging Extensions are hardware acceleration present in some ARM processors that allow memory error detection [1]. Introduce a domain XML knob that turns them on or off. 1: https://www.arm.com/blogs/blueprint/memory-safety-arm-memory-tagging-ext= ension Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- docs/formatdomain.rst | 7 +++++++ src/conf/domain_conf.c | 6 +++++- src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 5 +++++ src/qemu/qemu_validate.c | 1 + tests/qemuxml2argvdata/aarch64-gic-v3.xml | 1 + tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml | 1 + 7 files changed, 21 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 99383e725c..1f52f58d37 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2000,6 +2000,7 @@ Hypervisors may allow certain CPU / machine features = to be toggled on/off. 128 + ... =20 @@ -2230,6 +2231,12 @@ are: tb-cache The size of translation block cache size an integer (= a multiple of MiB) :since:`8.0.0` =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D =20 +``mte`` + Configure Memory Tagging Extensions for ARM guests. Possible values for= the + ``state`` attribute are ``on`` and ``off``. If the attribute is not + defined, the hypervisor default will be used. :since:`Since 9.4.0` (QEM= U/KVM + only) + Time keeping ------------ =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6a864a8db9..047a4c97bf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -181,6 +181,7 @@ VIR_ENUM_IMPL(virDomainFeature, "sbbc", "ibs", "tcg", + "mte", ); =20 VIR_ENUM_IMPL(virDomainCapabilitiesPolicy, @@ -16645,7 +16646,8 @@ virDomainFeaturesDefParse(virDomainDef *def, =20 case VIR_DOMAIN_FEATURE_HTM: case VIR_DOMAIN_FEATURE_NESTED_HV: - case VIR_DOMAIN_FEATURE_CCF_ASSIST: { + case VIR_DOMAIN_FEATURE_CCF_ASSIST: + case VIR_DOMAIN_FEATURE_MTE: { virTristateSwitch state; =20 if (virXMLPropTristateSwitch(nodes[i], "state", @@ -20486,6 +20488,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef = *src, case VIR_DOMAIN_FEATURE_HTM: case VIR_DOMAIN_FEATURE_NESTED_HV: case VIR_DOMAIN_FEATURE_CCF_ASSIST: + case VIR_DOMAIN_FEATURE_MTE: if (src->features[i] !=3D dst->features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("State of feature '%1$s' differs: source:= '%2$s', destination: '%3$s'"), @@ -27005,6 +27008,7 @@ virDomainDefFormatFeatures(virBuffer *buf, case VIR_DOMAIN_FEATURE_HTM: case VIR_DOMAIN_FEATURE_NESTED_HV: case VIR_DOMAIN_FEATURE_CCF_ASSIST: + case VIR_DOMAIN_FEATURE_MTE: switch ((virTristateSwitch) def->features[i]) { case VIR_TRISTATE_SWITCH_LAST: case VIR_TRISTATE_SWITCH_ABSENT: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c1cb2ed69d..3f8d6e81c0 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2169,6 +2169,7 @@ typedef enum { VIR_DOMAIN_FEATURE_SBBC, VIR_DOMAIN_FEATURE_IBS, VIR_DOMAIN_FEATURE_TCG, + VIR_DOMAIN_FEATURE_MTE, =20 VIR_DOMAIN_FEATURE_LAST } virDomainFeature; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index f8c7b6a648..37e350ac2c 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6653,6 +6653,11 @@ + + + + + diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index da4b9a3b35..99c7775e9b 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -123,6 +123,7 @@ qemuValidateDomainDefFeatures(const virDomainDef *def, break; =20 case VIR_DOMAIN_FEATURE_GIC: + case VIR_DOMAIN_FEATURE_MTE: if (def->features[i] =3D=3D VIR_TRISTATE_SWITCH_ON && !qemuDomainIsARMVirt(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.xml b/tests/qemuxml2argv= data/aarch64-gic-v3.xml index 247d6025f7..b9317284b0 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v3.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-v3.xml @@ -10,6 +10,7 @@ + diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml b/t= ests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml index 5b2fb7df75..1a74903aaa 100644 --- a/tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml @@ -10,6 +10,7 @@ + --=20 2.39.3 From nobody Thu Apr 25 23:10:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684234468; cv=none; d=zohomail.com; s=zohoarc; b=nx65w2au+6cwv1H1Vj5b8t1Xff2J3YIgVZmva/3yYVUg/ishX7R6xT/H+T6SkAQfgxXyZV3KZQvuEr+UXHfF9D8Ei4J5krVMlEvR13tz76InifmDEItn6yb3WjlIU9yTrCSfutNUZthsco8651kdP5J73ju/noDTh2Jz8G7XCJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684234468; h=Content-Type:Content-Transfer-Encoding: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=FNxkp13WM+l3yMNnfzk4YasJCJqOrWp5xnxizWJLvDs=; b=jhe52uqPx53lEfTfVVgQ9ncaOZ6tzvaUxadryMtJ0pedd+tFlxz1sTlO9N4rfyisI2xq9HZpb69Wkn+kKA3voEKNk/M+sqyzXqu3ypWiG1TwS8s91k/k2hwsxUggXRPWClukpT8fZ4i/a4yvYYX1fhbfFzsOd77q9Oi75l8ZN0k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1684234468376505.9315715099864; Tue, 16 May 2023 03:54:28 -0700 (PDT) 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-623-u-FoiJ4aNhiqt80JzT0NPw-1; Tue, 16 May 2023 06:54:24 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8A0A4182506F; Tue, 16 May 2023 10:54:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 768D9492B00; Tue, 16 May 2023 10:54:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5846019465BC; Tue, 16 May 2023 10:54:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EC7DB1946595 for ; Tue, 16 May 2023 10:54:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E14E42026D3C; Tue, 16 May 2023 10:54:18 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87F192026D25 for ; Tue, 16 May 2023 10:54:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684234467; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=FNxkp13WM+l3yMNnfzk4YasJCJqOrWp5xnxizWJLvDs=; b=XFU/bIhsKHZSoJsjBX9kXD358BpMiy1JN3P4tD8vgAdp94U07tqoj+LnJhB3aB0Q25TTl8 d4PZEtl6vL0mrJJThH6iLHU2LFD73eTNfPU0zBhKddcNRZRa1GgTlPYT4PNrlFTyF4b5e0 6pk9EYVtRY56nTI0+jCQ8n2lUbplFWQ= X-MC-Unique: u-FoiJ4aNhiqt80JzT0NPw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/4] qemu:: Introduce QEMU_CAPS_MACHINE_VIRT_MTE capability Date: Tue, 16 May 2023 12:54:14 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684234468729100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The MTE feature (introduced in QEMU commit of v5.1.0-rc1~8^2~11) is detectable via 'qom-list-properties' for 'virt' machine type. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml | 1 + tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml | 1 + 7 files changed, 8 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index cf85d42198..a88c4070ab 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -693,6 +693,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "virtio-gpu.blob", /* QEMU_CAPS_VIRTIO_GPU_BLOB */ "rbd-encryption-layering", /* QEMU_CAPS_RBD_ENCRYPTION_LAYER= ING */ "rbd-encryption-luks-any", /* QEMU_CAPS_RBD_ENCRYPTION_LUKS_= ANY */ + "machine.virt.mte", /* QEMU_CAPS_MACHINE_VIRT_MTE */ ); =20 =20 @@ -1720,6 +1721,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsMachi= nePropsPSeries[] =3D { =20 static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsVirt[] =3D { { "iommu", QEMU_CAPS_MACHINE_VIRT_IOMMU }, + { "mte", QEMU_CAPS_MACHINE_VIRT_MTE }, }; =20 static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsGeneric[] =3D { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3b55aed07a..ffece17877 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -672,6 +672,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_VIRTIO_GPU_BLOB, /* -device virtio-gpu-*.blob=3D */ QEMU_CAPS_RBD_ENCRYPTION_LAYERING, /* layered encryption support for C= eph RBD */ QEMU_CAPS_RBD_ENCRYPTION_LUKS_ANY, /* luks-any (LUKS and LUKS2) encryp= tion format for Ceph RBD */ + QEMU_CAPS_MACHINE_VIRT_MTE, /* -machine virt,mte=3D* for ARM guests */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0_aarch64.xml index b1c5c21abb..4843b32a45 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml @@ -130,6 +130,7 @@ + 5002000 61700243 v5.2.0 diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0_aarch64.xml index 6faf407a97..78e297c7f4 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml @@ -140,6 +140,7 @@ + 6000000 61700242 v6.0.0 diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0_aarch64.xml index e312801b89..f37b84d399 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml @@ -153,6 +153,7 @@ + 6001050 61700244 diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/= qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml index 3517e81d15..d0f1815e85 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml @@ -161,6 +161,7 @@ + 6002092 61700243 v7.0.0-rc2 diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0_aarch64.xml index 58db75d1d7..5ca98e19be 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml @@ -161,6 +161,7 @@ + 6002092 61700243 v7.0.0-rc2 --=20 2.39.3 From nobody Thu Apr 25 23:10:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684234504; cv=none; d=zohomail.com; s=zohoarc; b=ElzlQtYGbrFphNWh4kLs/y/XQEOzGMevjPtYQaI0CAHw+vXIkBmpUVSKdmMH7ox1ndcESmXa69/S/yJS/ooQjF+XYFwMs2pT/KveIsn0dh70h11qe/79VPUlCS1OITtxbgR48Lu9rV8DGgnyvsAS+llRm7Pt9g1WsbCW2URO/G4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684234504; h=Content-Type:Content-Transfer-Encoding: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=QGijerk9eHI0p2B+GwLbvmzaTank/FsveSMUASp92yo=; b=A1wEAttFjgRj4ubChL0kDulAlM5+7O1WYRtaBgZb0Z4AqrG9cwd1D/HZeffjUQicvd2eDAG8z4qRRMG/UVvI3xLuXnz/dmUrptEWUb8w14lPCe/zt9GEx75V8pA+3h/fJy7uQcSUhEm1bzirdUH1FB40KHIxNT+VYkh+r7Ej5rY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 168423450430214.041360917900079; Tue, 16 May 2023 03:55:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-80-AoDEq3RiMYmIKKl677_PFw-1; Tue, 16 May 2023 06:54:26 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4FD6A280AA50; Tue, 16 May 2023 10:54:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3784214171C1; Tue, 16 May 2023 10:54:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 93BA819465A3; Tue, 16 May 2023 10:54:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8859E1946595 for ; Tue, 16 May 2023 10:54:19 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7D2A22026D25; Tue, 16 May 2023 10:54:19 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 246062026D16 for ; Tue, 16 May 2023 10:54:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684234503; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=QGijerk9eHI0p2B+GwLbvmzaTank/FsveSMUASp92yo=; b=atYll7wGakvHZeBxs8NSdiqDRMIZJTHze3+lPHyUsXNVTNSZRNgWNwgeg9SymMJ6Z4oLfU DqmXKcuyI/jgBiXxW9asMMBiD9tZesWHXTa/s9HUiXX+U3ApNXRAPDqLrJgoT1l46E5MG0 jYOcOnU6YDM4qU//uLjS4ouq/hG756E= X-MC-Unique: AoDEq3RiMYmIKKl677_PFw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/4] qemu: Validate MTE feature Date: Tue, 16 May 2023 12:54:15 +0200 Message-Id: <693cf04b99d5298ba6ae4116b26f5466ec38be37.1684234431.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684234504887100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The MTE feature is not supported by all QEMUs, only those with QEMU_CAPS_MACHINE_VIRT_MTE capability. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/qemu/qemu_validate.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 99c7775e9b..aec1801672 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -124,14 +124,23 @@ qemuValidateDomainDefFeatures(const virDomainDef *def, =20 case VIR_DOMAIN_FEATURE_GIC: case VIR_DOMAIN_FEATURE_MTE: - if (def->features[i] =3D=3D VIR_TRISTATE_SWITCH_ON && - !qemuDomainIsARMVirt(def)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("The '%1$s' feature is not supported for = architecture '%2$s' or machine type '%3$s'"), - featureName, - virArchToString(def->os.arch), - def->os.machine); - return -1; + if (def->features[i] =3D=3D VIR_TRISTATE_SWITCH_ON) { + if (!qemuDomainIsARMVirt(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("The '%1$s' feature is not supported = for architecture '%2$s' or machine type '%3$s'"), + featureName, + virArchToString(def->os.arch), + def->os.machine); + return -1; + } + + if (i =3D=3D VIR_DOMAIN_FEATURE_MTE && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_VIRT_MTE))= { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("The '%1$s' feature is not supported = with this QEMU binary"), + featureName); + return -1; + } } break; =20 --=20 2.39.3 From nobody Thu Apr 25 23:10:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684234471; cv=none; d=zohomail.com; s=zohoarc; b=D2tg69nG17xU6pzurhzgvdJkL2WcvX7JPOTDBp3Yo6zoWggBa1Rig7NSXaib3Fmm8HVxzw5tEhnAnHxYFj6a1i5ffTnpXKSinzT41ZsWu58Bp1LRiXV5hJCpfWwmbCFJNJf1XqYMoKqHGW50aJHppLb4M2GlmwQGR70mNyU+SJ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684234471; h=Content-Type:Content-Transfer-Encoding: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=4mjp/yyPLz3LOhQAy3r2yCwIsikOG3CuOl2RuKb5jmw=; b=ZgO4jmDPjtzthGb0Np8PwyjTVke7tWZ1Hdo46gv9ITHHsRDMk48nPPFknu2w4r2ZyoTmocn24FqYdi7xo0T0oKWro8M+ZlHS06eu4ceRZ7eJjCEX0FTH7p25EhvAk6VKsGVjygmYyFsQNn+WSYOBF5GyKq+VgGIbzmEUI4vnX7U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 168423447149472.96891825401906; Tue, 16 May 2023 03:54:31 -0700 (PDT) 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-619-EvpfCONKOHu00mZb7CG4zA-1; Tue, 16 May 2023 06:54:25 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 59275852647; Tue, 16 May 2023 10:54:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4672020239E2; Tue, 16 May 2023 10:54:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 980FA19465B1; Tue, 16 May 2023 10:54:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 31F7519465B3 for ; Tue, 16 May 2023 10:54:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 188522026D25; Tue, 16 May 2023 10:54:20 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id B464F2026D16 for ; Tue, 16 May 2023 10:54:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684234470; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=4mjp/yyPLz3LOhQAy3r2yCwIsikOG3CuOl2RuKb5jmw=; b=CFcyJlw5QyxeltUlHGOWa11NNC+xZGcjbbx57SBlNjJurAPyA4H8M+BXXYuVCEF+dg4zH7 82IF/wP32W0MO9Pw4qZu7OEOhAdinKitYxsXlDMT78TjdVO6sqpRWQPRIULzwAwnR+0+KG m/lD8W5MRjCFzSXDEdnafuPvHf0qDH4= X-MC-Unique: EvpfCONKOHu00mZb7CG4zA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 4/4] qemu: Generate command line for MTE feature Date: Tue, 16 May 2023 12:54:16 +0200 Message-Id: <36923726820280a6e2868cbc30ed87f6773fe869.1684234431.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684234472995100007 Content-Type: text/plain; charset="utf-8"; x-default="true" This is pretty trivia, just append "mte=3Don/off" to -machine arguments. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/qemu/qemu_command.c | 6 ++++++ tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2a6d9408f6..9b993c3aad 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6797,6 +6797,12 @@ qemuAppendDomainFeaturesMachineParam(virBuffer *buf, virBufferAsprintf(buf, ",cap-ibs=3D%s", str); } =20 + if (def->features[VIR_DOMAIN_FEATURE_MTE] !=3D VIR_TRISTATE_SWITCH_ABS= ENT) { + const char *str; + str =3D virTristateSwitchTypeToString(def->features[VIR_DOMAIN_FEA= TURE_MTE]); + virBufferAsprintf(buf, ",mte=3D%s", str); + } + return 0; } =20 diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args b/tests/qemuxml2arg= vdata/aarch64-gic-v3.args index 0d7a1c259a..0244951d87 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v3.args +++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ +-machine virt,usb=3Doff,gic-version=3D3,mte=3Don,dump-guest-core=3Doff,mem= ory-backend=3Dmach-virt.ram \ -accel kvm \ -cpu host \ -m 1024 \ --=20 2.39.3