From patchwork Thu Feb 20 16:13:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13984183 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4F0B9C021B3 for ; Thu, 20 Feb 2025 16:14:16 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tl9B5-0008LF-7j; Thu, 20 Feb 2025 11:13:31 -0500 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 1tl9B3-0008Kh-Rz for qemu-devel@nongnu.org; Thu, 20 Feb 2025 11:13:29 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tl9Az-0007Gr-3M for qemu-devel@nongnu.org; Thu, 20 Feb 2025 11:13:29 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-220d601886fso17655185ad.1 for ; Thu, 20 Feb 2025 08:13:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1740068003; x=1740672803; 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=J6hKjm1PNeQza0PKd959xqXDq72ucY0kQWVFSTPldi8=; b=acfTUL+ahD7wdDwNu/yID027a5J4Nl9xfnLt8gyhRlT+yOKSnYbeR7mGnEGYo+QHt8 FecvjMiD6vilS4p7oshBae8sWJkx/j4ZYhKWlUNUyiP9U2uBRW7PBra+o9N2fLPECmng IuOqqC8W02PKNsccO7HSxECHrlXobfdzO9F5AUfFJQN9QeJExFqsw4w7WVQgivt4KMAm VVsMPxj4fpyFfgHF4erTOR0REThcXXDPakRd8xLqJ8+8IrbHsuJZvuGO7iUogFIrRM5N WQwHVy/lDmiuLbLeQnZDn7IP9MUHu4dlJA5dAiKcmy+GzsJwXqwVGR3yIvoTOjous3oC o1Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740068003; x=1740672803; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J6hKjm1PNeQza0PKd959xqXDq72ucY0kQWVFSTPldi8=; b=opQGDdIxFEvs6Leb3MTvtQ1TeJCXFrnHQ77qXSrtGsN95wWzVSP4PdzLQ9hTZCH1a9 bFEgvzm1G/Yja9m+tjHnVE0zK6gScSrCK6JL3uC3S+78qZeBV6Sy+JKDWPSQAHdgpXz9 A20oWmty7mluAXvlu19Gbv4wuECQUNryn4AxWX+JLtsGFvmdNGCkw7BX6Y3NP2IqPQTq LdfzXHNHIXPWrzk3ZcWCHSGwAILMxoameS/e+bW0awCzs7qoY+EztFl+GzOMZD6g0jgF wx+y1Uy67Trv1h/nOXuTQf177GItvFotCwnpQ2NKr6Yoyv/9m91NHSsG1Ubw0EnUc3e4 07mg== X-Gm-Message-State: AOJu0Yx1HiSN9+aQK/PAozOLIFnQtitVDCTsBluPYcDh91rOl4P4l9b3 zsx2+P0yEee8BpdvLCdQ/fyXKe1pCm9o8KrUcdOuIpGtkGqIDN15hn98WuOgR1j0Lr+azrXWDnc W X-Gm-Gg: ASbGncslW0lrHzOdNGSlKR/BxnEzVz6MRu6hVDY7ss7lyL5KDldMqXhiHbxrJIKiFmu uvtu1QMXvBI8QaMXBI9ZNL4UWTm3TZjDhu8AMU8uN0GlnGw8PEKGaUoGchIAyo69aMlUTYuLe7t al2DXrO1phFl0lUyCi43YHndHd9QoC9eerdUTyqpjItSxEjyIY8XXj+/k0ucRm6evWEdLRRDZ15 ywbiBCpjUN1PoEHC2nYvDOuQ7a8hnRO+bHUQvMs3ORpk0qorrzDrr1Gw+FQvMI+D7LozPfAuvZQ swvBJX0wUUhykf6A5g== X-Google-Smtp-Source: AGHT+IH9nnmLwB722yY0ER4TU1940DB85PnQdq1rKn7khu8sEUt1a7TFfJUT+JnR7OwzrN+eu7EaDQ== X-Received: by 2002:a05:6a00:99a:b0:72d:710d:611c with SMTP id d2e1a72fcca58-732618fb538mr36899182b3a.20.1740068003153; Thu, 20 Feb 2025 08:13:23 -0800 (PST) Received: from grind.. ([187.11.154.120]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7324254618dsm14074072b3a.26.2025.02.20.08.13.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 08:13:22 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, Daniel Henrique Barboza Subject: [PATCH 1/3] target/riscv/cpu: ignore TCG init for KVM CPUs in reset_hold Date: Thu, 20 Feb 2025 13:13:11 -0300 Message-ID: <20250220161313.127376-2-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250220161313.127376-1-dbarboza@ventanamicro.com> References: <20250220161313.127376-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x62f.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, T_SPF_TEMPERROR=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org riscv_cpu_reset_hold() does a lot of TCG-related initializations that aren't relevant for KVM, but nevertheless are impacting the reset state of KVM vcpus. When running a KVM guest, kvm_riscv_reset_vcpu() is called at the end of reset_hold(). At that point env->mstatus is initialized to a non-zero value, and it will be use to write 'sstatus' in the vcpu (kvm_arch_put_registers() then kvm_riscv_put_regs_csr()). Do an early exit in riscv_cpu_reset_hold() if we're running KVM. All the KVM reset procedure will be centered in kvm_riscv_reset_vcpu(). While we're at it, remove the kvm_enabled() check in kvm_riscv_reset_vcpu() since it's already being gated in riscv_cpu_reset_hold(). Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/cpu.c | 9 +++++---- target/riscv/kvm/kvm-cpu.c | 3 --- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 522d6584e4..8e6e629ec4 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1050,6 +1050,11 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type) mcc->parent_phases.hold(obj, type); } #ifndef CONFIG_USER_ONLY + if (kvm_enabled()) { + kvm_riscv_reset_vcpu(cpu); + return; + } + env->misa_mxl = mcc->misa_mxl_max; env->priv = PRV_M; env->mstatus &= ~(MSTATUS_MIE | MSTATUS_MPRV); @@ -1146,10 +1151,6 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type) env->rnmip = 0; env->mnstatus = set_field(env->mnstatus, MNSTATUS_NMIE, false); } - - if (kvm_enabled()) { - kvm_riscv_reset_vcpu(cpu); - } #endif } diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 23ce779359..484b6afe7c 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -1603,9 +1603,6 @@ void kvm_riscv_reset_vcpu(RISCVCPU *cpu) CPURISCVState *env = &cpu->env; int i; - if (!kvm_enabled()) { - return; - } for (i = 0; i < 32; i++) { env->gpr[i] = 0; } From patchwork Thu Feb 20 16:13:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13984181 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 40174C021B2 for ; Thu, 20 Feb 2025 16:13:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tl9B6-0008Lk-Om; Thu, 20 Feb 2025 11:13:32 -0500 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 1tl9B4-0008Kr-Rw for qemu-devel@nongnu.org; Thu, 20 Feb 2025 11:13:30 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tl9B2-0007HK-Jt for qemu-devel@nongnu.org; Thu, 20 Feb 2025 11:13:30 -0500 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-220c665ef4cso18540515ad.3 for ; Thu, 20 Feb 2025 08:13:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1740068006; x=1740672806; 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=T2VTiue3zdQb2l8bI0P0GLPoVCeHbENvgfswjU/R/0A=; b=eLGAkTn5xoFhVhBQLa5gQLHaT2XsT8d3mO6xTjG/yibMvxcxPexyj0dYyBGXK4YNHM rI9nFEDsNWWKMWsrMwVQfwHfGs/nsoiOp39QclKsb9hVJlWJOai6RMvA1iwQhC2q7eTu JQG4MGOqCvMQtnezw9TZ15GVuvLFQxt5qYl8Tdx00amJxMB25Z13F4inKy9u+v3w3/eS efx2tv5Pv3s9fbTyH+mXNEVA1vk3jQUvMKALQhe9iWGXrrDTD0pfEVnt93Vf8XFeaMIo fBOtkdEV8qKu7URk9fe2rcw+ZalXe6pOvwxOtZ9DGFO4apJKu5GCXJwv4ZX+qm/dChR6 +OAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740068006; x=1740672806; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T2VTiue3zdQb2l8bI0P0GLPoVCeHbENvgfswjU/R/0A=; b=wCfgAahUeL6T+DW4jS4YLnMpWPRi7SOEo1Xf+OipzcBWJYVFk9MX26gEFg1VlkuPBT ozY7Xke8udcIst4+T3rNeQ9kvsPFvjVFdblDuSNRJwzLfFG0r20PILGoZN8JwSrSUt9x aTczH5+tmiBXJKdTYpo2ybizaL48g/lEgpRzl/nTrsqEKk9H2Tx964BGvrma6HeC3UlV EkvlCVrElQ7iCkknMgHrg224j3eUFox5idBrxUEdz4VV6ea0olLY3F+mWtnoOlSwu99o LEMntZ3qmC1hqk7dKM8TFk8nT+sx5xLbg3buTifrVLuyGWN+eOUFSlSXHaU233jTUmKu IkBg== X-Gm-Message-State: AOJu0YzUc/2PDw+Blg3RskjgZydULaCOgyeg9ZDhKNtnb4dh/nBeVhy1 /Z85JIteinKv52GzaCpjy28z6uLFl9pahXn3j8Z1rc27nN3IgojVD7o8keaSSU9B/1GOEhXL62T 9 X-Gm-Gg: ASbGncuyJ5E9M4/HB+XeA0/ECk5O4IthsriKU3xecmZ4Rw3QJBfTLADk2oPGqVCDtRe fQmiyDbhb5ssMpHI/4vDQqOABZiTseRT3hi/iF1pNNhmW2xthrXtF8SwRiK3Yt+1Dqlj9aSyj0W 9GfcMhQCXGUrLeKwu8SVFhjEMA9OqJfyzxRqnGwDeutJimCePuenSyTG9kI9LeirU6ncF1xSCz/ 3/rdQePjEQLwFENQIG+l9Kp8AFwFeQrCoJJJai5fPsXtSwlMBaFqA4OEqnaWlbAGpmqq84ORqb6 mWJQVYoQJOjtve1cSA== X-Google-Smtp-Source: AGHT+IGvpfESrKSiN8xmfsUV8xyDJytgPDwBN1a7WhR3MFgyEtzPHv7MvFk818kJh0AcPH3fEDMsgw== X-Received: by 2002:a05:6a00:3d0c:b0:730:75b1:720a with SMTP id d2e1a72fcca58-7341737d88fmr4756149b3a.23.1740068006233; Thu, 20 Feb 2025 08:13:26 -0800 (PST) Received: from grind.. ([187.11.154.120]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7324254618dsm14074072b3a.26.2025.02.20.08.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 08:13:25 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, Daniel Henrique Barboza Subject: [PATCH 2/3] target/riscv/kvm: use env->sie to read/write 'sie' CSR Date: Thu, 20 Feb 2025 13:13:12 -0300 Message-ID: <20250220161313.127376-3-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250220161313.127376-1-dbarboza@ventanamicro.com> References: <20250220161313.127376-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x636.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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Using env->sie is clearer than using env->mie. Signed-off-by: Daniel Henrique Barboza --- target/riscv/kvm/kvm-cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 484b6afe7c..fea03f3657 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -610,7 +610,7 @@ static int kvm_riscv_get_regs_csr(CPUState *cs) CPURISCVState *env = &RISCV_CPU(cs)->env; KVM_RISCV_GET_CSR(cs, env, sstatus, env->mstatus); - KVM_RISCV_GET_CSR(cs, env, sie, env->mie); + KVM_RISCV_GET_CSR(cs, env, sie, env->sie); KVM_RISCV_GET_CSR(cs, env, stvec, env->stvec); KVM_RISCV_GET_CSR(cs, env, sscratch, env->sscratch); KVM_RISCV_GET_CSR(cs, env, sepc, env->sepc); @@ -627,7 +627,7 @@ static int kvm_riscv_put_regs_csr(CPUState *cs) CPURISCVState *env = &RISCV_CPU(cs)->env; KVM_RISCV_SET_CSR(cs, env, sstatus, env->mstatus); - KVM_RISCV_SET_CSR(cs, env, sie, env->mie); + KVM_RISCV_SET_CSR(cs, env, sie, env->sie); KVM_RISCV_SET_CSR(cs, env, stvec, env->stvec); KVM_RISCV_SET_CSR(cs, env, sscratch, env->sscratch); KVM_RISCV_SET_CSR(cs, env, sepc, env->sepc); From patchwork Thu Feb 20 16:13:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13984182 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CC1BBC021B1 for ; Thu, 20 Feb 2025 16:14:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tl9B8-0008OW-Ud; Thu, 20 Feb 2025 11:13:34 -0500 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 1tl9B7-0008NQ-LR for qemu-devel@nongnu.org; Thu, 20 Feb 2025 11:13:33 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tl9B6-0007Hp-2e for qemu-devel@nongnu.org; Thu, 20 Feb 2025 11:13:33 -0500 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-220c8cf98bbso23964735ad.1 for ; Thu, 20 Feb 2025 08:13:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1740068010; x=1740672810; 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=qnvQ9cuHygS6JjjK+o31ZflMYYOqbA8EhtHcyFl2E2k=; b=Ntx62Sinjob2m1IBvn5xAFVsUrYShegpQW1YPNa4KRwpt24GWbCwxStJG5UBac6gC/ 76Oox1VCcg2kQyWlSTBAyMxixHgZbufVDL0SS4uX4HHOkvXUP9VekpISTKVjwA/j/iTV MMyeo2lOIIkcXxinLgeJr34w5Su8TX7HClIY9NHMqNudy/htcfK6Z4b8cR+yW/Nl18Qk A56qwnggS6ymJhfCLU7CwB7xdct8Zx1YsJEGQSixfT44U0pwUR8VtMkDQK/r3ehTPDrn 5/IDpzF/6guxLgZI6LGeXACNjyFPCYJqxrEie7ntTpjBIQhQ4FkfwawBAJBuRB+hKWjh dLfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740068010; x=1740672810; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qnvQ9cuHygS6JjjK+o31ZflMYYOqbA8EhtHcyFl2E2k=; b=ZGufNMpsuxmRFZuyMyRv1cW+w8xlfRw04JjrBcUiwiz9gYSQzm1rlY414L3+R9SnfC bvKCRyYElEig5TQjaYKCouYJysQCmSxvz+Zh5CvOn/OQbUI8Vl/99+UQ5iHsYuKDcud9 AAq+fkBwJQeLq2i2WKHI36ODULKsl8sm/aNWugg78c2oETcBgElRtY7hjBUE1BpsKLCw lVwgLDLYIF8YZ3MtO6XcA0/Xta83Pa/9Cibb6WQTALEH/nfCBCv2NQoPlCbNMPexPDS9 UWcgvDt9jx8NrY4V63AREmdqd+jcjepJaQWKsDK7Eowq4yuL6OrUoEWrwl7kpwip55+D JiBg== X-Gm-Message-State: AOJu0YwwPFeWYHZ2hgT1/sWwWKyn460ntH3YUV0E6QseJ+QgrGwWlYg4 K6OLWyoRtvdXS0b4yRolh3w1BKUcNALtOqbCtKYdhSmEMGxkrL0YOxlAvbdGzCDY65gT8Jugtg7 S X-Gm-Gg: ASbGncsXUyqS656TDpY2c0Un52ss3ublpV+se2QJYbU576XCR6YuPPjN9Nj6KbOWGoq M0INRG59uniZEc9atOPkbl+xWW9210AtKZ9RuXGjvM8IuE9ZOTcvQqQRF8Nxv38xRyiR+wDqN4i mu2yJ2rdaxHxpA9gm2gNMJzPXKVwLqfp5Ec4pEJXIbnrEDohbPfsRI1xLrfwtxxK9q3BkvMfDA7 +C9o0K1Lrr81FPWbpQYZgl82NOqDDY3RBDQRA0du2g12TNBZ21+wsZ+WJbqk0KRFLZjCY/dikV2 tet9nJU2Xl3M9bgwtA== X-Google-Smtp-Source: AGHT+IF7qg/nAKrRf2bIhKIIaR+koI+Ix4VMnGxIXEdT5Nrhvr5j22A1Wl4ahx+4+d8PloaCKM6x6Q== X-Received: by 2002:a05:6a21:6004:b0:1ee:e4f0:62a with SMTP id adf61e73a8af0-1eee4f008a3mr6193126637.20.1740068010195; Thu, 20 Feb 2025 08:13:30 -0800 (PST) Received: from grind.. ([187.11.154.120]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7324254618dsm14074072b3a.26.2025.02.20.08.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 08:13:29 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, Daniel Henrique Barboza Subject: [PATCH 3/3] target/riscv/kvm: reset all available KVM CSRs in kvm_reset() Date: Thu, 20 Feb 2025 13:13:13 -0300 Message-ID: <20250220161313.127376-4-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250220161313.127376-1-dbarboza@ventanamicro.com> References: <20250220161313.127376-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x62e.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Explictly reset env->mstatus and env->sie. Add a comment about env->mip being read/written into KVM 'sip' CSR. We're also not read/writing 'scounteren' which is available in the KVM UAPI. Add it in kvm_reset() and get/put_regs_csr(). Signed-off-by: Daniel Henrique Barboza --- target/riscv/kvm/kvm-cpu.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index fea03f3657..ee7a9295b4 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -618,6 +618,7 @@ static int kvm_riscv_get_regs_csr(CPUState *cs) KVM_RISCV_GET_CSR(cs, env, stval, env->stval); KVM_RISCV_GET_CSR(cs, env, sip, env->mip); KVM_RISCV_GET_CSR(cs, env, satp, env->satp); + KVM_RISCV_GET_CSR(cs, env, scounteren, env->scounteren); return 0; } @@ -635,6 +636,7 @@ static int kvm_riscv_put_regs_csr(CPUState *cs) KVM_RISCV_SET_CSR(cs, env, stval, env->stval); KVM_RISCV_SET_CSR(cs, env, sip, env->mip); KVM_RISCV_SET_CSR(cs, env, satp, env->satp); + KVM_RISCV_SET_CSR(cs, env, scounteren, env->scounteren); return 0; } @@ -1609,6 +1611,10 @@ void kvm_riscv_reset_vcpu(RISCVCPU *cpu) env->pc = cpu->env.kernel_addr; env->gpr[10] = kvm_arch_vcpu_id(CPU(cpu)); /* a0 */ env->gpr[11] = cpu->env.fdt_addr; /* a1 */ + + /* sstatus is read/written into mstatus */ + env->mstatus = 0; + env->sie = 0; env->satp = 0; env->mie = 0; env->stvec = 0; @@ -1616,7 +1622,9 @@ void kvm_riscv_reset_vcpu(RISCVCPU *cpu) env->sepc = 0; env->scause = 0; env->stval = 0; + /* sip is read/written into mip */ env->mip = 0; + env->scounteren = 0; } void kvm_riscv_set_irq(RISCVCPU *cpu, int irq, int level)