From nobody Sat Sep 21 02:52:32 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1647956630; cv=none; d=zohomail.com; s=zohoarc; b=csVxdel33y6CMuwb1TCvm5qfej35Cc9Zq7oUI8Eohc7zKl6C3knmy/TQ20t566YljXHb5Y48zsfnB6U6HL1p9Hx6rIIUhWVZMk3fRMyvlLoS0BbHKOM8uwEWipuU7FYUeFLc5pN0APv5PD9E5UhtlLMhwm6ttFpA5mOV4AalhtY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647956630; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=7MiFWbxn0OlxTDdKDRVVlxJUDcW9QG+46FFdHfSR7F0=; b=BbFktbrMMGGZX76fwWNCkeYO0oClE7mHFnjf2z76NPi9Uo1HlYNbapZvvqhndZSXIceO/rJapAltL8pdo2UEZIu07+3piMW1RBalqZk2h+bk1UMqspif0VO4Gnnh8a4TAeZwO1Sf32OT2Hr/10UZVKDguC+T2EbqUEZVT4tFT/k= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647956630188790.3459275280762; Tue, 22 Mar 2022 06:43:50 -0700 (PDT) Received: from localhost ([::1]:37986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWenc-0008Mv-E8 for importer@patchew.org; Tue, 22 Mar 2022 09:43:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWemT-0006nT-Es for qemu-devel@nongnu.org; Tue, 22 Mar 2022 09:42:37 -0400 Received: from [2607:f8b0:4864:20::631] (port=35361 helo=mail-pl1-x631.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWemR-0006iH-CB for qemu-devel@nongnu.org; Tue, 22 Mar 2022 09:42:37 -0400 Received: by mail-pl1-x631.google.com with SMTP id n15so15504012plh.2 for ; Tue, 22 Mar 2022 06:42:35 -0700 (PDT) Received: from ThinkPad-T490.dc1.ventanamicro.com ([171.50.204.174]) by smtp.googlemail.com with ESMTPSA id ij17-20020a17090af81100b001c67c964d93sm3101216pjb.2.2022.03.22.06.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Mar 2022 06:42:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7MiFWbxn0OlxTDdKDRVVlxJUDcW9QG+46FFdHfSR7F0=; b=F/aTP2/KIzdJhEB/+KU1jSBOXw+/WnMrq3kH03OflB7epJ5+ih5aPGCgx6hmvpBZj+ NDMw7L2JS5ujdlKV0ownymsPK6V5V+uUCKwaYvIXcd6BCSKPjB/hP+Ovz867IylIlIXd B3lTtN9kuWop7InMqaNn5LK4OOttbfsWCSYpZkUpvZQjAoWYyidw9qaQYX9UXQAvVtay PxA0EeG+f8R/NV5roWICClxVAwWJSJYxyGaHQifT+hShGu4eZDhhVYRsesY3WvoTrSKO NaGYiyWJPL8G2aWsR8PGZ61lcda1+IoYaf5DbAAi1nxBZf6wBeeG4AMhmuQvrT+vr9on aDjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7MiFWbxn0OlxTDdKDRVVlxJUDcW9QG+46FFdHfSR7F0=; b=XGNL7ZeAtWLf11JVmD2M+hB8o79/Kt7bVywbbbF5wiZHAl76NzP2kz5lluZ/NrBtCQ 1V4Pzeuzft4eqCM6oZ+fxuwt76nDFFv3eMku7tCQRcmPAdWHxq2tvRiAHB23LZRPu9Hl WiFq1AFs+gF8XbYHLvKGNesdnQCS+GHeySNa7HEsdvGyzMhUzuML5Z+zuuCkBEYaCJIn xdixFRpO7FDlpa9B5LIE2Xrb8Qek8WRNZTDw0B9fu97ztMUAI+193B4cRf22Yo259x9y etHRd+7AAZCOntIYMTRosWWep7pjfCCgpmSUE6cd62KaPMDeKMejzNtf0Z+SGLKLBdN4 6XpA== X-Gm-Message-State: AOAM533Bp8dt91n+P9ECC0HjYZhdDQZnOhp6Kn2+NFKF1CyC0Yv6NC9+ P0DxixHuAzvKMYUwLgJ6xLPLXQ== X-Google-Smtp-Source: ABdhPJx03Kngp7+vs104H6LdTCrZoVXz7rCDI3CjihmhZ+NAw0/ELUNp3MC6O0/n38ZDcvwH5ABcRw== X-Received: by 2002:a17:902:9348:b0:14d:8ee9:329f with SMTP id g8-20020a170902934800b0014d8ee9329fmr18105826plp.80.1647956553733; Tue, 22 Mar 2022 06:42:33 -0700 (PDT) From: Mayuresh Chitale To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Subject: [RFC PATCH v1 1/4] target/riscv: Add smstateen support Date: Tue, 22 Mar 2022 19:12:15 +0530 Message-Id: <20220322134218.27322-2-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220322134218.27322-1-mchitale@ventanamicro.com> References: <20220322134218.27322-1-mchitale@ventanamicro.com> X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::631 (failed) 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::631; envelope-from=mchitale@ventanamicro.com; helo=mail-pl1-x631.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Mayuresh Chitale , alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1647956631741100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Smstateen extension specifies a mechanism to close the potential covert channels that could cause security issues. This patch adds the CSRs defined in the specification and the corresponding predicates and read/write functions. Signed-off-by: Mayuresh Chitale --- target/riscv/cpu.c | 2 + target/riscv/cpu.h | 4 + target/riscv/cpu_bits.h | 36 +++++++ target/riscv/csr.c | 210 ++++++++++++++++++++++++++++++++++++++++ target/riscv/machine.c | 22 ++++- 5 files changed, 273 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 8e338daf72..832602d91f 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -807,6 +807,7 @@ static Property riscv_cpu_properties[] =3D { DEFINE_PROP_BOOL("mmu", RISCVCPU, cfg.mmu, true), DEFINE_PROP_BOOL("pmp", RISCVCPU, cfg.pmp, true), DEFINE_PROP_BOOL("sstc", RISCVCPU, cfg.ext_sstc, true), + DEFINE_PROP_BOOL("smstateen", RISCVCPU, cfg.ext_smstateen, true), =20 DEFINE_PROP_STRING("priv_spec", RISCVCPU, cfg.priv_spec), DEFINE_PROP_STRING("vext_spec", RISCVCPU, cfg.vext_spec), @@ -970,6 +971,7 @@ static void riscv_isa_string_ext(RISCVCPU *cpu, char **= isa_str, int max_str_len) ISA_EDATA_ENTRY(svinval, ext_svinval), ISA_EDATA_ENTRY(svnapot, ext_svnapot), ISA_EDATA_ENTRY(svpbmt, ext_svpbmt), + ISA_EDATA_ENTRY(smstateen, ext_smstateen), }; =20 for (i =3D 0; i < ARRAY_SIZE(isa_edata_arr); i++) { diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index ea23666e8e..8e61edca6f 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -338,6 +338,9 @@ struct CPURISCVState { =20 /* CSRs for execution enviornment configuration */ uint64_t menvcfg; + uint64_t mstateen[SMSTATEEN_MAX_COUNT]; + uint64_t hstateen[SMSTATEEN_MAX_COUNT]; + uint64_t sstateen[SMSTATEEN_MAX_COUNT]; target_ulong senvcfg; uint64_t henvcfg; #endif @@ -416,6 +419,7 @@ struct RISCVCPUConfig { bool ext_zve32f; bool ext_zve64f; bool ext_sscofpmf; + bool ext_smstateen; =20 /* Vendor-specific custom extensions */ bool ext_XVentanaCondOps; diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index 7454f4087f..66edb26686 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -205,6 +205,12 @@ /* Supervisor Configuration CSRs */ #define CSR_SENVCFG 0x10A =20 +/* Supervisor state CSRs */ +#define CSR_SSTATEEN0 0x10C +#define CSR_SSTATEEN1 0x10D +#define CSR_SSTATEEN2 0x10E +#define CSR_SSTATEEN3 0x10F + /* Supervisor Trap Handling */ #define CSR_SSCRATCH 0x140 #define CSR_SEPC 0x141 @@ -258,6 +264,16 @@ #define CSR_HENVCFG 0x60A #define CSR_HENVCFGH 0x61A =20 +/* Hypervisor state CSRs */ +#define CSR_HSTATEEN0 0x60C +#define CSR_HSTATEEN0H 0x61C +#define CSR_HSTATEEN1 0x60D +#define CSR_HSTATEEN1H 0x61D +#define CSR_HSTATEEN2 0x60E +#define CSR_HSTATEEN2H 0x61E +#define CSR_HSTATEEN3 0x60F +#define CSR_HSTATEEN3H 0x61F + /* Virtual CSRs */ #define CSR_VSSTATUS 0x200 #define CSR_VSIE 0x204 @@ -309,6 +325,26 @@ #define CSR_MENVCFG 0x30A #define CSR_MENVCFGH 0x31A =20 +/* Machine state CSRs */ +#define CSR_MSTATEEN0 0x30C +#define CSR_MSTATEEN0H 0x31C +#define CSR_MSTATEEN1 0x30D +#define CSR_MSTATEEN1H 0x31D +#define CSR_MSTATEEN2 0x30E +#define CSR_MSTATEEN2H 0x31E +#define CSR_MSTATEEN3 0x30F +#define CSR_MSTATEEN3H 0x31F + +/* Common defines for all smstateen */ +#define SMSTATEEN_MAX_COUNT 4 +#define SMSTATEEN0_CS 0 +#define SMSTATEEN0_FCSR 0 +#define SMSTATEEN0_IMSIC 58 +#define SMSTATEEN0_AIA 59 +#define SMSTATEEN0_SVSLCT 60 +#define SMSTATEEN0_HSENVCFG 62 +#define SMSTATEEN_STATEN 63 + /* Enhanced Physical Memory Protection (ePMP) */ #define CSR_MSECCFG 0x747 #define CSR_MSECCFGH 0x757 diff --git a/target/riscv/csr.c b/target/riscv/csr.c index d3d16d71de..215c8ecef1 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -265,6 +265,42 @@ static RISCVException hmode32(CPURISCVState *env, int = csrno) =20 } =20 +static RISCVException mstateen(CPURISCVState *env, int csrno) +{ + CPUState *cs =3D env_cpu(env); + RISCVCPU *cpu =3D RISCV_CPU(cs); + + if (!cpu->cfg.ext_smstateen) { + return RISCV_EXCP_ILLEGAL_INST; + } + + return any(env, csrno); +} + +static RISCVException hstateen(CPURISCVState *env, int csrno) +{ + CPUState *cs =3D env_cpu(env); + RISCVCPU *cpu =3D RISCV_CPU(cs); + + if (!cpu->cfg.ext_smstateen) { + return RISCV_EXCP_ILLEGAL_INST; + } + + return hmode(env, csrno); +} + +static RISCVException sstateen(CPURISCVState *env, int csrno) +{ + CPUState *cs =3D env_cpu(env); + RISCVCPU *cpu =3D RISCV_CPU(cs); + + if (!cpu->cfg.ext_smstateen) { + return RISCV_EXCP_ILLEGAL_INST; + } + + return smode(env, csrno); +} + /* Checks if PointerMasking registers could be accessed */ static RISCVException pointer_masking(CPURISCVState *env, int csrno) { @@ -1882,6 +1918,129 @@ static RISCVException write_henvcfgh(CPURISCVState = *env, int csrno, return RISCV_EXCP_NONE; } =20 +static inline void write_smstateen(CPURISCVState *env, uint64_t *reg, + uint64_t wr_mask, uint64_t new_val) +{ + *reg =3D (*reg & ~wr_mask) | (new_val & wr_mask); +} + +static RISCVException read_mstateen(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->mstateen[csrno - CSR_MSTATEEN0]; + + return RISCV_EXCP_NONE; +} + +static RISCVException write_mstateen(CPURISCVState *env, int csrno, + target_ulong new_val) +{ + uint64_t *reg; + uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; + + reg =3D &env->mstateen[csrno - CSR_MSTATEEN0]; + write_smstateen(env, reg, wr_mask, new_val); + + return RISCV_EXCP_NONE; +} + +static RISCVException read_mstateenh(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->mstateen[csrno - CSR_MSTATEEN0H - 0x10] >> 32; + + return RISCV_EXCP_NONE; +} + +static RISCVException write_mstateenh(CPURISCVState *env, int csrno, + target_ulong new_val) +{ + uint64_t *reg; + uint64_t val; + uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; + + reg =3D &env->mstateen[csrno - CSR_MSTATEEN0H - 0x10]; + val =3D (uint64_t)new_val << 32; + val |=3D *reg & 0xFFFFFFFF; + write_smstateen(env, reg, wr_mask, val); + + return RISCV_EXCP_NONE; +} + +static RISCVException read_hstateen(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->hstateen[csrno - CSR_HSTATEEN0]; + + return RISCV_EXCP_NONE; +} + +static RISCVException write_hstateen(CPURISCVState *env, int csrno, + target_ulong new_val) +{ + uint64_t *reg; + uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; + int index =3D csrno - CSR_HSTATEEN0; + + reg =3D &env->hstateen[index]; + wr_mask &=3D env->mstateen[index]; + write_smstateen(env, reg, wr_mask, new_val); + + return RISCV_EXCP_NONE; +} + +static RISCVException read_hstateenh(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->hstateen[csrno - CSR_HSTATEEN0H - 0x10] >> 32; + + return RISCV_EXCP_NONE; +} + +static RISCVException write_hstateenh(CPURISCVState *env, int csrno, + target_ulong new_val) +{ + uint64_t *reg; + uint64_t val; + uint64_t wr_mask =3D 1UL << SMSTATEEN_STATEN; + int index =3D csrno - CSR_HSTATEEN0H - 0x10; + + reg =3D &env->hstateen[index]; + val =3D (uint64_t)new_val << 32; + val |=3D *reg & 0xFFFFFFFF; + wr_mask &=3D env->mstateen[index]; + + write_smstateen(env, reg, wr_mask, val); + return RISCV_EXCP_NONE; +} + +static RISCVException read_sstateen(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->sstateen[csrno - CSR_SSTATEEN0]; + + return RISCV_EXCP_NONE; +} + +static RISCVException write_sstateen(CPURISCVState *env, int csrno, + target_ulong new_val) +{ + uint64_t *reg; + uint64_t wr_mask =3D 0; + int index =3D csrno - CSR_SSTATEEN0; + bool virt =3D riscv_cpu_virt_enabled(env); + + reg =3D &env->sstateen[index]; + if (virt) { + wr_mask &=3D env->mstateen[index]; + } else { + wr_mask &=3D env->hstateen[index]; + } + write_smstateen(env, reg, wr_mask, new_val); + + return RISCV_EXCP_NONE; +} + static RISCVException rmw_mip64(CPURISCVState *env, int csrno, uint64_t *ret_val, uint64_t new_val, uint64_t wr_mask) @@ -3664,6 +3823,57 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] =3D { [CSR_HENVCFGH] =3D { "henvcfgh", hmode32, read_henvcfgh, write_henvcfg= h, .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, =20 + /* Smstateen extension CSRs */ + [CSR_MSTATEEN0] =3D { "mstateen0", mstateen, read_mstateen, write_msta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_MSTATEEN0H] =3D { "mstateen0h", mstateen, read_mstateenh, + write_mstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_MSTATEEN1] =3D { "mstateen1", mstateen, read_mstateen, write_msta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_MSTATEEN1H] =3D { "mstateen1h", mstateen, read_mstateenh, + write_mstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_MSTATEEN2] =3D { "mstateen2", mstateen, read_mstateen, write_msta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_MSTATEEN2H] =3D { "mstateen2h", mstateen, read_mstateenh, + write_mstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_MSTATEEN3] =3D { "mstateen3", mstateen, read_mstateen, write_msta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_MSTATEEN3H] =3D { "mstateen3h", mstateen, read_mstateenh, + write_mstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + + [CSR_HSTATEEN0] =3D { "hstateen0", hstateen, read_hstateen, write_hsta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_HSTATEEN0H] =3D { "hstateen0h", hstateen, read_hstateenh, + write_hstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_HSTATEEN1] =3D { "hstateen1", hstateen, read_hstateen, write_hsta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_HSTATEEN1H] =3D { "hstateen1h", hstateen, read_hstateenh, + write_hstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_HSTATEEN2] =3D { "hstateen2", hstateen, read_hstateen, write_hsta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_HSTATEEN2H] =3D { "hstateen2h", hstateen, read_hstateenh, + write_hstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_HSTATEEN3] =3D { "hstateen3", hstateen, read_hstateen, write_hsta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_HSTATEEN3H] =3D { "hstateen3h", hstateen, read_hstateenh, + write_hstateenh, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + + [CSR_SSTATEEN0] =3D { "sstateen0", sstateen, read_sstateen, write_ssta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_SSTATEEN1] =3D { "sstateen1", sstateen, read_sstateen, write_ssta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_SSTATEEN2] =3D { "sstateen2", sstateen, read_sstateen, write_ssta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_SSTATEEN3] =3D { "sstateen3", sstateen, read_sstateen, write_ssta= teen, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, /* Supervisor Trap Setup */ [CSR_SSTATUS] =3D { "sstatus", smode, read_sstatus, write_sst= atus, NULL, read_sstatus_i128 = }, diff --git a/target/riscv/machine.c b/target/riscv/machine.c index aa968dc29c..e376f82ca0 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -232,6 +232,26 @@ static int riscv_cpu_post_load(void *opaque, int versi= on_id) return 0; } =20 +static bool smstateen_needed(void *opaque) +{ + RISCVCPU *cpu =3D opaque; + + return cpu->cfg.ext_smstateen; +} + +static const VMStateDescription vmstate_smstateen =3D { + .name =3D "cpu/smtateen", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D smstateen_needed, + .fields =3D (VMStateField[]) { + VMSTATE_UINT64_ARRAY(env.mstateen, RISCVCPU, 4), + VMSTATE_UINT64_ARRAY(env.hstateen, RISCVCPU, 4), + VMSTATE_UINT64_ARRAY(env.sstateen, RISCVCPU, 4), + VMSTATE_END_OF_LIST() + } +}; + static bool envcfg_needed(void *opaque) { RISCVCPU *cpu =3D opaque; @@ -331,7 +351,6 @@ const VMStateDescription vmstate_riscv_cpu =3D { VMSTATE_UINT64(env.mtohost, RISCVCPU), VMSTATE_UINT64(env.mtimecmp, RISCVCPU), VMSTATE_UINT64(env.stimecmp, RISCVCPU), - VMSTATE_END_OF_LIST() }, .subsections =3D (const VMStateDescription * []) { @@ -342,6 +361,7 @@ const VMStateDescription vmstate_riscv_cpu =3D { &vmstate_rv128, &vmstate_kvmtimer, &vmstate_envcfg, + &vmstate_smstateen, NULL } }; --=20 2.17.1