From nobody Mon Apr 6 17:30:34 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1773887308; cv=none; d=zohomail.com; s=zohoarc; b=fk10KRMEc5PecOqwYhLQpZWeuDrCPMpUDJogaDqSthw56TMghL0SLqNmETKe13WkPkpIb2r8bd6Mb9pxh5nO3Q8N9aU/Y+/7U/Tg10dAkeZD3MMp3zTKnV/3lMSIhxhC5RSlgRdgdefLUesX6KZjRYnaef4RSqQnZdxxqvdobug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773887308; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Tj5zvCy48mw2g9/BEVzB0FOExoU07LA09j0teQZUMxY=; b=jrHz/o1p4i29sJGdsR81oeF1FgLgIjllS2sFisErxFvohuRRIiB0v3H9RoxuVV59WSVugy3lDd1vnXWNx0vXF32+Xh+NoPWs0x+OvHpEBxjLaeYko269nMKxbwsIT7Njk+JgomY/u/DVDhV0RKU1bFi+Sz/O4jQu3Y94+DokEAE= 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 1773887308440248.75008815677245; Wed, 18 Mar 2026 19:28:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w335x-0003ma-T3; Wed, 18 Mar 2026 22:26:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w335t-0003jX-Ku for qemu-devel@nongnu.org; Wed, 18 Mar 2026 22:26:41 -0400 Received: from mail-yw1-x112a.google.com ([2607:f8b0:4864:20::112a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w335r-0002sn-Vv for qemu-devel@nongnu.org; Wed, 18 Mar 2026 22:26:41 -0400 Received: by mail-yw1-x112a.google.com with SMTP id 00721157ae682-7947cf097c1so5340317b3.2 for ; Wed, 18 Mar 2026 19:26:39 -0700 (PDT) Received: from gromero0.. ([177.146.137.168]) by smtp.gmail.com with ESMTPSA id 00721157ae682-79a7141eb65sm28159417b3.21.2026.03.18.19.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 19:26:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773887199; x=1774491999; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Tj5zvCy48mw2g9/BEVzB0FOExoU07LA09j0teQZUMxY=; b=KbybQ//RwTPSOkMhhQnKZ35QBMlv4ccKDrtSsAv/IWCY8pzIwGC63EGo8ZJgIzjzTM G5SeY1XxYXy7L1PHpbRINC9Cif4b9Aofb5k4J5dx67ZtFjEntMol+++/Y2LeFlwnwQm0 TUmlQguQehMsYvqw2jCKtmEyikqecj5M1zJRUifqRhBGYR7IKATVJRQZqJ/UuMIt57SV n3brlpOVbnltPaI/VOY5+KhXLeQ5YIXIOPI6PridFPNulb3MGD6PcN4V3k9l5wvKR++d zjFep4mzndWS4nKi5meqqDfqOJzw/ctiC4n7+0X4ZRmR+QPQQLvR9yt8lGr/0CfsGZe1 KsOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773887199; x=1774491999; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Tj5zvCy48mw2g9/BEVzB0FOExoU07LA09j0teQZUMxY=; b=XrU/Eg2yOZ3G2sSgqdu4z22KLJJeEsr3uR616gkTE1V04FQEN0am8FKCLG80yDg1pL 8GRgcAH0nWokwKxaf6LGj9aNC5dZ/+1/7P4onIEDJpJi2TNjaGstTTd/8+6ul/EZL7li 1YzVwto3X53fCdOoPD1WyAIPMNtzKd21MLGWkbbi2l9lNrKMsMcAQlOhv8vVP+HnYI0G FT/yvzY3Qh05ePyftvFY5+67fzPT/quHuEDcTUw2s9g6Igk3TEq3jikT8wCHfOVgG+CP qcGhywePTu02moMj2LiEfby1c5cpih2Ob0kO8ObcXfC4O2Ogk5hY19IUjdnKEiB5lMIE j8gQ== X-Gm-Message-State: AOJu0YywvHBmir2bsx+8yFrPJzXlmQjCEKLr+6L/OGiQxVLQvyhYAUyI 6ecIwMTushNxNbBn5qn69tCPtI1otCSJtjF1Xj2f4eUo6WB2sjtzqLHlKPUlQ4FOwRwCZSYz1+D 9Gan3s2k= X-Gm-Gg: ATEYQzy2Z+dbsGAOvxT/PMhgY+2iKj/FaRNMXZNECtnRmhQikGJGbEU/y55O6KGw7bs jV7mqvSajqYnp6/SETKcLlTBI35iV0Nayhh3sA4M/AOSpJnoYbUzVqzdHuDxlHfXXxwLoPmkViK UVnA9x0Qj3dLAUo3TjjZnkx1h+zmyyV1Qc/uFIactuYn0WQcJIS2rW0GYbabHArKr6x4ZVoFrQl 6ppLpR7vnBQ3x4D+xwL4ZLq3rx8IjeHEWYlCqsKRL/zvBxqMpN3a8FMKEXLcWYQmwBLyYvzyYuE 1AvY3BZbnxJ3pnF6/6Qd0F1T+Fl6aDOgTE5DQA2EFKFVNkKUhtgYiKM0TBovKeIiWnJElgTKnre cnoAGVi2xQ0t347opuDTKKtSARA1Nn8x1svuTfDoxFheF3wSO0aPvcBr/5zKqMPHi9Qk98qz3Q5 5eboQkwybZ3gnqsCytiMKJgo8VnqPzGg== X-Received: by 2002:a05:690c:4dc5:20b0:799:266:83ba with SMTP id 00721157ae682-79a71830746mr47572837b3.4.1773887198700; Wed, 18 Mar 2026 19:26:38 -0700 (PDT) From: Gustavo Romero To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, richard.henderson@linaro.org Cc: alex.bennee@linaro.org, peter.maydell@linaro.org, gustavo.romero@linaro.org Subject: [RFC PATCH 5/7] hw/arm/virt: Add machine option 'mec' Date: Wed, 18 Mar 2026 23:23:33 -0300 Message-Id: <20260319022335.22523-6-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260319022335.22523-1-gustavo.romero@linaro.org> References: <20260319022335.22523-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::112a; envelope-from=gustavo.romero@linaro.org; helo=mail-yw1-x112a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1773887309425158500 Content-Type: text/plain; charset="utf-8" Add new machine option 'mec' that enables and sets the memory used by FEAT_MEC. Signed-off-by: Gustavo Romero --- hw/arm/virt.c | 76 +++++++++++++++++++++++++++++++++++++++++++ include/hw/arm/virt.h | 1 + 2 files changed, 77 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index cab2e21e8a..7d127a4205 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1762,6 +1762,27 @@ static void create_tag_ram(MemoryRegion *tag_sysmem, memory_region_add_subregion(tag_sysmem, base / 32, tagram); } =20 +static void create_mec_ram(MemoryRegion *tag_sysmem, + hwaddr base, hwaddr size, + const char *name) +{ + memory_region_init_ram(tag_sysmem, NULL, name, size / 32, &error_fatal= ); +} + +static void create_mec_ram_fake_page(MemoryRegion *mr, uint64_t size, cons= t char *name) +{ + assert(is_power_of_2(size) ); + assert(size >=3D sizeof(uint32_t)); + + uint32_t *ptr =3D g_malloc(size); + + for (int i =3D 0; i < size / sizeof(uint32_t); i++) { + ptr[i] =3D 0xDEADBEEF; + } + + memory_region_init_ram_ptr(mr, NULL, name, size, ptr); +} + static void create_secure_ram(VirtMachineState *vms, MemoryRegion *secure_sysmem, MemoryRegion *secure_tag_sysmem) @@ -2267,6 +2288,8 @@ static void machvirt_init(MachineState *machine) MemoryRegion *secure_sysmem =3D NULL; MemoryRegion *tag_sysmem =3D NULL; MemoryRegion *secure_tag_sysmem =3D NULL; + MemoryRegion *pseudo_encrypted_page =3D NULL; + MemoryRegion *tuple_memory =3D NULL; int n, virt_max_cpus; bool firmware_loaded; bool aarch64 =3D true; @@ -2495,6 +2518,28 @@ static void machvirt_init(MachineState *machine) } } =20 + if (vms->mec) { + if (tcg_enabled()) { + if (tuple_memory =3D=3D NULL) { + /* XXX(gromero): Add object_property_find(cpuobj, "tup= le-memory", ...) here. */ + + tuple_memory =3D g_new(MemoryRegion, 1); + memory_region_init(tuple_memory, OBJECT(machine), "mec= ", UINT64_MAX / 32); + + pseudo_encrypted_page =3D g_new(MemoryRegion, 1); + memory_region_init(pseudo_encrypted_page, OBJECT(machi= ne), "mec-page", 4 * 1024 /* 4 KiB */); + } + + object_property_set_link(cpuobj, "mec", OBJECT(tuple_memo= ry), &error_abort); + object_property_set_link(cpuobj, "mec-page", OBJECT(pseud= o_encrypted_page), &error_abort); + + } else { + /* Check for other accels here. */ + error_report("MEC requested, but not supported"); + exit(1); + } + } + qdev_realize(DEVICE(cpuobj), NULL, &error_fatal); object_unref(cpuobj); } @@ -2561,6 +2606,14 @@ static void machvirt_init(MachineState *machine) machine->ram_size, "mach-virt.tag"); } =20 + if (tuple_memory) { + create_mec_ram(tuple_memory, vms->memmap[VIRT_MEM].base, machine->= ram_size, "tuple-memory"); + } + + if(pseudo_encrypted_page) { + create_mec_ram_fake_page(pseudo_encrypted_page, 4 * 1024, "mec-fake= -page"); + } + vms->highmem_ecam &=3D (!firmware_loaded || aarch64); =20 create_rtc(vms); @@ -2966,6 +3019,20 @@ static void virt_set_mte(Object *obj, bool value, Er= ror **errp) vms->mte =3D value; } =20 +static bool virt_get_mec(Object *obj, Error **errp) +{ + VirtMachineState *vms =3D VIRT_MACHINE(obj); + + return vms->mec; +} + +static void virt_set_mec(Object *obj, bool value, Error **errp) +{ + VirtMachineState *vms =3D VIRT_MACHINE(obj); + + vms->mec =3D value; +} + static char *virt_get_gic_version(Object *obj, Error **errp) { VirtMachineState *vms =3D VIRT_MACHINE(obj); @@ -3602,6 +3669,12 @@ static void virt_machine_class_init(ObjectClass *oc,= const void *data) "guest CPU which implements the = ARM " "Memory Tagging Extension"); =20 + object_class_property_add_bool(oc, "mec", virt_get_mec, virt_set_mec); + object_class_property_set_description(oc, "mec", + "Set on/off to enable/disable emulating a" + "guest CPU which implements the ARM" + "Memory Encryption Extention"); + object_class_property_add_bool(oc, "its", virt_get_its, virt_set_its); object_class_property_set_description(oc, "its", @@ -3686,6 +3759,9 @@ static void virt_instance_init(Object *obj) /* MTE is disabled by default. */ vms->mte =3D false; =20 + /* FEAT_MEC is disabled by default. */ + vms->mec =3D false; + /* Supply kaslr-seed and rng-seed by default */ vms->dtb_randomness =3D true; =20 diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index dba8ac7f2f..4e49eb1d13 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -154,6 +154,7 @@ struct VirtMachineState { bool virt; bool ras; bool mte; + bool mec; bool dtb_randomness; bool second_ns_uart_present; OnOffAuto acpi; --=20 2.34.1