From nobody Sun Sep 28 16:32:22 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175885755122725.08968242307685; Thu, 25 Sep 2025 20:32:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v1zAf-00054u-Jt; Thu, 25 Sep 2025 23:30:57 -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 1v1zAc-000532-DL; Thu, 25 Sep 2025 23:30:54 -0400 Received: from zg8tmja5ljk3lje4ms43mwaa.icoremail.net ([209.97.181.73]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v1zAH-0006r4-7m; Thu, 25 Sep 2025 23:30:43 -0400 Received: from prodtpl.icoremail.net (unknown [10.12.1.20]) by hzbj-icmmx-7 (Coremail) with SMTP id AQAAfwAXWWzKCNZokH0_CQ--.1S2; Fri, 26 Sep 2025 11:30:18 +0800 (CST) Received: from phytium.com.cn (unknown [218.76.62.144]) by mail (Coremail) with SMTP id AQAAfwB32ufGCNZoBAAhAA--.9828S3; Fri, 26 Sep 2025 11:30:14 +0800 (CST) From: Tao Tang To: Eric Auger , Peter Maydell Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org, Chen Baozi , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Philippe Brucker , Mostafa Saleh , Tao Tang Subject: [PATCH v2 14/14] hw/arm/smmuv3: Optional Secure bank migration via subsections Date: Fri, 26 Sep 2025 11:30:13 +0800 Message-Id: <20250926033013.1099304-1-tangtao1634@phytium.com.cn> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250925162618.191242-1-tangtao1634@phytium.com.cn> References: <20250925162618.191242-1-tangtao1634@phytium.com.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: AQAAfwB32ufGCNZoBAAhAA--.9828S3 X-CM-SenderInfo: pwdqw3tdrrljuu6sx5pwlxzhxfrphubq/1tbiAQAFBWjVmkcBzQAAst Authentication-Results: hzbj-icmmx-7; spf=neutral smtp.mail=tangtao163 4@phytium.com.cn; X-Coremail-Antispam: 1Uk129KBjvJXoWxWF45uw4xXFy8Jw48Ww1kAFb_yoWruw4kpr s8G3Z8GryDGF4fZr4fJw4rCFs8CrWrGF4akrWDCa93ta1kJay2qrnFyFW8u3s5JrWjqa17 uF1xuFZrJr47ArJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj DUYxn0WfASr-VFAU7a7-sFnT9fnUUIcSsGvfJ3UbIYCTnIWIevJa73UjIFyTuYvj4RJUUU UUUUU 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=209.97.181.73; envelope-from=tangtao1634@phytium.com.cn; helo=zg8tmja5ljk3lje4ms43mwaa.icoremail.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=ham 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-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1758857553830116600 Content-Type: text/plain; charset="utf-8" My apologies, resending patches 13-14/14 to fix a threading mistake from my previous attempt. Introduce a generic vmstate_smmuv3_bank that serializes a single SMMUv3 bank (registers and queues). Add a 'smmuv3/bank_s' subsection guarded by secure_impl and a new 'migrate-secure-bank' property; when enabled, the S bank is migrated. Add a 'smmuv3/gbpa_secure' subsection which is only sent when GBPA differs from its reset value. This keeps the existing migration stream unchanged by default and remains backward compatible: older QEMUs can ignore unknown subsections, and with 'migrate-secure-bank' defaulting to off, the stream is identical to before. This also prepares for future RME extensions (Realm/Root) by reusing the bank subsection pattern. Usage: -global arm-smmuv3,secure-impl=3Don,migrate-secure-bank=3Don Signed-off-by: Tao Tang --- hw/arm/smmuv3.c | 70 +++++++++++++++++++++++++++++++++++++++++ include/hw/arm/smmuv3.h | 1 + 2 files changed, 71 insertions(+) diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 80fbc25cf5..2a1e80d179 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -2450,6 +2450,53 @@ static const VMStateDescription vmstate_smmuv3_queue= =3D { }, }; +static const VMStateDescription vmstate_smmuv3_bank =3D { + .name =3D "smmuv3_bank", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (const VMStateField[]) { + VMSTATE_UINT32(features, SMMUv3RegBank), + VMSTATE_UINT8(sid_split, SMMUv3RegBank), + VMSTATE_UINT32_ARRAY(cr, SMMUv3RegBank, 3), + VMSTATE_UINT32(cr0ack, SMMUv3RegBank), + VMSTATE_UINT32(irq_ctrl, SMMUv3RegBank), + VMSTATE_UINT32(gerror, SMMUv3RegBank), + VMSTATE_UINT32(gerrorn, SMMUv3RegBank), + VMSTATE_UINT64(gerror_irq_cfg0, SMMUv3RegBank), + VMSTATE_UINT32(gerror_irq_cfg1, SMMUv3RegBank), + VMSTATE_UINT32(gerror_irq_cfg2, SMMUv3RegBank), + VMSTATE_UINT64(strtab_base, SMMUv3RegBank), + VMSTATE_UINT32(strtab_base_cfg, SMMUv3RegBank), + VMSTATE_UINT64(eventq_irq_cfg0, SMMUv3RegBank), + VMSTATE_UINT32(eventq_irq_cfg1, SMMUv3RegBank), + VMSTATE_UINT32(eventq_irq_cfg2, SMMUv3RegBank), + VMSTATE_STRUCT(cmdq, SMMUv3RegBank, 0, + vmstate_smmuv3_queue, SMMUQueue), + VMSTATE_STRUCT(eventq, SMMUv3RegBank, 0, + vmstate_smmuv3_queue, SMMUQueue), + VMSTATE_END_OF_LIST(), + }, +}; + +static bool smmuv3_secure_bank_needed(void *opaque) +{ + SMMUv3State *s =3D opaque; + + return s->secure_impl && s->migrate_secure_bank; +} + +static const VMStateDescription vmstate_smmuv3_bank_s =3D { + .name =3D "smmuv3/bank_s", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D smmuv3_secure_bank_needed, + .fields =3D (const VMStateField[]) { + VMSTATE_STRUCT(bank[SMMU_SEC_IDX_S], SMMUv3State, 0, + vmstate_smmuv3_bank, SMMUv3RegBank), + VMSTATE_END_OF_LIST(), + }, +}; + static bool smmuv3_gbpa_needed(void *opaque) { SMMUv3State *s =3D opaque; @@ -2469,6 +2516,25 @@ static const VMStateDescription vmstate_gbpa =3D { } }; +static bool smmuv3_gbpa_secure_needed(void *opaque) +{ + SMMUv3State *s =3D opaque; + + return s->secure_impl && s->migrate_secure_bank && + s->bank[SMMU_SEC_IDX_S].gbpa !=3D SMMU_GBPA_RESET_VAL; +} + +static const VMStateDescription vmstate_gbpa_secure =3D { + .name =3D "smmuv3/gbpa_secure", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D smmuv3_gbpa_secure_needed, + .fields =3D (const VMStateField[]) { + VMSTATE_UINT32(bank[SMMU_SEC_IDX_S].gbpa, SMMUv3State), + VMSTATE_END_OF_LIST() + } +}; + static const VMStateDescription vmstate_smmuv3 =3D { .name =3D "smmuv3", .version_id =3D 1, @@ -2502,6 +2568,8 @@ static const VMStateDescription vmstate_smmuv3 =3D { }, .subsections =3D (const VMStateDescription * const []) { &vmstate_gbpa, + &vmstate_smmuv3_bank_s, + &vmstate_gbpa_secure, NULL } }; @@ -2521,6 +2589,8 @@ static const Property smmuv3_properties[] =3D { * Defaults to false (0) */ DEFINE_PROP_BOOL("secure-impl", SMMUv3State, secure_impl, false), + DEFINE_PROP_BOOL("migrate-secure-bank", SMMUv3State, + migrate_secure_bank, false), }; static void smmuv3_instance_init(Object *obj) diff --git a/include/hw/arm/smmuv3.h b/include/hw/arm/smmuv3.h index 572f15251e..5ffb609fa2 100644 --- a/include/hw/arm/smmuv3.h +++ b/include/hw/arm/smmuv3.h @@ -71,6 +71,7 @@ struct SMMUv3State { QemuMutex mutex; char *stage; bool secure_impl; + bool migrate_secure_bank; }; typedef enum { -- 2.34.1