From nobody Sat Nov 15 23:41:52 2025 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=1745581211; cv=none; d=zohomail.com; s=zohoarc; b=ONkerOLuLRUZd/KLgcwD/Z4D+0rWBtw5oomZWeI12Rmvs4RSGFVdFcDfym4cF5EtXmPvzVEIBe3GxdkEgb5Ve5t6NRFrUzZe5j4pQQHC3hx5oVjyojiO6+CcCQT+OFDi1Bst0EUkQKK3IJZJmh1fIpoenoKCM7G4oBy3leG3mFQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745581211; 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=/xE7yE+VfO5HYyjZXuEBehNSR+hFc01/eJnRx7ZSIFg=; b=OnV8l+x+wT4tkv9DKRFF3Q9Qideb+wqGbbqRGlaAB/xfVnrdkE6FkQDBmRsFxZh5oMS4IAr9XM91NMR5nzGHEgp2L9WpTZRHMhlWzgsaERIAciJj7sU01YnNhvSfW9GGgv/HyX5nvviU3GE2si80z0cN8EyV2hILKFMqd2dbvvA= 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 1745581211859903.4226996418441; Fri, 25 Apr 2025 04:40:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HNE-00018r-N0; Fri, 25 Apr 2025 07:37:40 -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 1u8HNC-00017T-Ot for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:38 -0400 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 1u8HN9-0006Vu-AD for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:38 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-223fb0f619dso23656745ad.1 for ; Fri, 25 Apr 2025 04:37:24 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([152.234.125.33]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db50e7a40sm29881055ad.147.2025.04.25.04.37.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 04:37:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1745581043; x=1746185843; 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=/xE7yE+VfO5HYyjZXuEBehNSR+hFc01/eJnRx7ZSIFg=; b=b8NXDMmB9ekYRF6aBqFNDLZH02ZYBIgjtp2QUVwsbuF1FhsYvmAfNcsW8B1/S726o1 lvNIQvIUDnaPEbQ6+IOWcpb0QRvcv7G0GAJF1YAjJqlPkU4uwLJzE+Q9KY9PbNmna0sL 6MOVPRGzsS4K6kZR+jNdt95XnZkKAwIq1HSutH7vJdsVHDLvoz5jYCNqy1aHA+75JsWl 4iFtdTd1WLXvLb6xmp4ZjeU39Pu7xP8Lyj0OSnH1DjOl7CNYzssOcE5egc/WpFdBI9VH uMdzS+p41NpK8Jz9uhvBwiXmcxJXDDPbvMfExLjX+k8IuOmZT/GkBA1Xa29jFP2WsVUq mSqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745581043; x=1746185843; 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=/xE7yE+VfO5HYyjZXuEBehNSR+hFc01/eJnRx7ZSIFg=; b=UPmtfKyrRRXpEnBPLK3PNljemp55Udv35HddkAGsp0zkm91l2YyjyUxOwrZZvy9b8F AOZwZVchn52fCLF2/h2Wh93f9fCsdAoAfyHDo7NLK/cPEqiOUbEH7ptvDzeGaoZZ4um9 ZDY/OZ1MjnjSg29Xmr1t0o3YgN4Fv8R8Ym222YyTVC/04r4fIXGjIRVMqqY/dIhNIpmp mrf0i5eb//imiPa54Ru7fc2BWkYy5tF6j3h6ExG7NlcuWPBUtBPCyyzPzV9iOOgLBa8c 8/nGsrRsT7dEVVrKaSiMjUV+VwntvcSkmRl1ay8uAz9gFdufNKrp+DpYUYftMNEUyCzw oZiw== X-Gm-Message-State: AOJu0YzhahwAsCocxaRWk+Q0iHqg8Xzw6nB3zO/P4kpI1AxrVkhofovs uFRzkzsy0UEQJI+HBPRhJpAFIaGdxAD31/JZYFTHelXkT42c87rUMBTn+IpK2+JodmRmEfkn9aG / X-Gm-Gg: ASbGncse5+BNtOco90M1zWe60qMTR1kP6IYNXvo7ID4+6qMbCqD7+trZKVJv1uEgaBo 6ym0szxAprrcc1Qq7BaHTZAwwD3mnm+uIya67VH/rMN9XwD5iLAg8HBGGZu6/wj+mreGtZdsfV4 30AxsC8zhu7exhbAXDlX1ylmeMj1wNV6efFtuP3CPOJmMbbkOb1Ks9p9T4TQTaUibCNxjV9kLe8 0/XT+gSjFaH4jBavfCSTO8WskPndnZ0Yt6GEgqAF94b/SUsEdIAUI10Js3TR6ZUgMTDGFzRa01c EHXkf47tVQkH7nGWSxQnixdsQmkSopuLP0vSGibmThF8e5sLnZtT03A9orDY2b7alWQ/EInKFA6 1fuM= X-Google-Smtp-Source: AGHT+IE/OyCR8d3Q5+sn1AC7dw44Kkl+GnydtgznWDhOMK8DCOkyXcM01gSBltb8eKbuoFMwdd1sjg== X-Received: by 2002:a17:902:f651:b0:224:24d3:60f4 with SMTP id d9443c01a7336-22dbf5ef6bdmr30356485ad.15.1745581040846; Fri, 25 Apr 2025 04:37:20 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH v2 1/9] target/riscv/kvm: minor fixes/tweaks Date: Fri, 25 Apr 2025 08:36:57 -0300 Message-ID: <20250425113705.2741457-2-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425113705.2741457-1-dbarboza@ventanamicro.com> References: <20250425113705.2741457-1-dbarboza@ventanamicro.com> 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::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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1745581212829019000 Content-Type: text/plain; charset="utf-8" Remove an unused 'KVMScratchCPU' pointer argument in kvm_riscv_check_sbi_dbcn_support(). Put kvm_riscv_reset_regs_csr() after kvm_riscv_put_regs_csr(). This will make a future patch diff easier to read, when changes in kvm_riscv_reset_regs_csr() and kvm_riscv_get_regs_csr() will be made. Fixes: a6b53378f5 ("target/riscv/kvm: implement SBI debug console (DBCN) ca= lls") Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/kvm/kvm-cpu.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 9214ce490c..accad4c28e 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -613,19 +613,6 @@ static int kvm_riscv_put_regs_core(CPUState *cs) return ret; } =20 -static void kvm_riscv_reset_regs_csr(CPURISCVState *env) -{ - env->mstatus =3D 0; - env->mie =3D 0; - env->stvec =3D 0; - env->sscratch =3D 0; - env->sepc =3D 0; - env->scause =3D 0; - env->stval =3D 0; - env->mip =3D 0; - env->satp =3D 0; -} - static int kvm_riscv_get_regs_csr(CPUState *cs) { CPURISCVState *env =3D &RISCV_CPU(cs)->env; @@ -660,6 +647,19 @@ static int kvm_riscv_put_regs_csr(CPUState *cs) return 0; } =20 +static void kvm_riscv_reset_regs_csr(CPURISCVState *env) +{ + env->mstatus =3D 0; + env->mie =3D 0; + env->stvec =3D 0; + env->sscratch =3D 0; + env->sepc =3D 0; + env->scause =3D 0; + env->stval =3D 0; + env->mip =3D 0; + env->satp =3D 0; +} + static int kvm_riscv_get_regs_fp(CPUState *cs) { int ret =3D 0; @@ -1078,7 +1078,6 @@ static int uint64_cmp(const void *a, const void *b) } =20 static void kvm_riscv_check_sbi_dbcn_support(RISCVCPU *cpu, - KVMScratchCPU *kvmcpu, struct kvm_reg_list *reglist) { struct kvm_reg_list *reg_search; @@ -1197,7 +1196,7 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu= , KVMScratchCPU *kvmcpu) kvm_riscv_read_vlenb(cpu, kvmcpu, reglist); } =20 - kvm_riscv_check_sbi_dbcn_support(cpu, kvmcpu, reglist); + kvm_riscv_check_sbi_dbcn_support(cpu, reglist); } =20 static void riscv_init_kvm_registers(Object *cpu_obj) --=20 2.49.0 From nobody Sat Nov 15 23:41:52 2025 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=1745581129; cv=none; d=zohomail.com; s=zohoarc; b=U51mnL+su/26yIppqJVwaaSpK8SlqRpJj4v4/E1uJSuFEOXWUGOTXGp4ah59bS/ASDznyzOmz5wUP3j8xbh5zbqqr8gx3Y8OE6rWxlU92l0X1HKBjOBq2AyT0g8QboUU7u8qTabprODHvAhVJe7mm1xCqKl9lfjd2iVMz8qJr80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745581129; 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=v8t6U7neLyn+Bxz6GCvwrIlJBwqlaStNkHlN+bZWuP4=; b=mRToLB0pIM+GM5d/kVs2cRyGtPgQUv5n4pwTA56nHrqmtBDnS8iox5dKKUhu0fL7lXZzLHybMODJ+nMh8jilfJcqRWXbBVz5M7zo4qfyRnjGrmw3vFOyGOHG98+vX+zmmM/T4NdmqsQSRC3LiIGvSbt9HZuebDhv8j4Sh8P+3nw= 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 1745581129973806.8643205678104; Fri, 25 Apr 2025 04:38:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HNG-00019f-FS; Fri, 25 Apr 2025 07:37:42 -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 1u8HNC-00017a-Sc for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:38 -0400 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 1u8HN6-0006WA-NY for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:38 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-22c33677183so22083405ad.2 for ; Fri, 25 Apr 2025 04:37:27 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([152.234.125.33]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db50e7a40sm29881055ad.147.2025.04.25.04.37.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 04:37:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1745581045; x=1746185845; 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=v8t6U7neLyn+Bxz6GCvwrIlJBwqlaStNkHlN+bZWuP4=; b=NeXT/g9OPbYDtSOi0xzA3+GVLkGSVHpXEehnH3Xh7y+M0giOCqMUr7qAseypzmijvg zjsQZVU6Gj3jqv1OvRTRSdz2Zp4rMDdU1bcx3nRmZYYxSovsvfgrILp/718HBC82MMRf uUqVW5WcKk9jVmv2139xMoONCXz9iA5EW6ymmLwXeUM3FMEEKigWALKBe2qOl2K3NyPS L/IFWWZIbjmK5qG8ighWCq6J2m1+EOE1F4oj/wwRikjxUM5v8v7ZTb/6mnW9wxMd+Vk6 6TyilPby6WIqRvA40kbV7aGppvw12LchLgwvKezAEf/BDBfmmjXizxW37O3KaUHzsWmB 7NQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745581045; x=1746185845; 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=v8t6U7neLyn+Bxz6GCvwrIlJBwqlaStNkHlN+bZWuP4=; b=Xok08dcPIsspmBL4IKic2+ZYGccBO8gjtnoWR5m5H2RSUbDjkriWkInBF4wdY4wzZv olv+alNI8mP2wthpm+AzC+gosIzjqzYQiLIH7/g5peUbpFhtLOjVGxyvF+rtqy//MrCA 0lqZomsjKk/Y0ODoMbWdtduOm2Skzt+lPPfoNR2UolWCzvwt+suF7vMYre6iCnE/T5jT 0P9h7RRQgFngNranjz1fwWZIxvW9ZVEsJ9sUxicsiAP6BXqGvfgiWWtdcps/II7xy57Z vbzO27LG/iYqzS9Bgp5uHHl98r8hI82mfKiQ4+Gy3GJhgonx8g7At+v3R1N6XEAUoD24 +rGA== X-Gm-Message-State: AOJu0YyPuVexXa1XtIfSLZvq8FVabQmi1umH8E4zEFsgSXO7k8WyLea+ WmSQnxgX0MdSaoo34MiPe8afNIF20Yy1MqxlNyQOAyQRm5XPbCQsYQBOkNwdkodE5jJq15mqHak t X-Gm-Gg: ASbGncuRGrXIcB5awNJ8h2K9+jxS8xltZbK8iKRtfJnlAAQs3wCt6VAE8N0tzVlVikp yiotqltqzLIluTimXfwH9SU2yBrINcw3YgmStrmwekHX/yUMvhMm1kku1jg/SKFHvaP5/aWMQKV m7E1dtYljeqe63zARJPD5+msRIyuQHu4+RWIm3vhx/B8fVz7kYfvd4+qRPp0rkpwseo6H1mn5IQ zkrCqFuBWeBUIOLVIUUh5AVtsUcLSx3ei33JcdFRxkQM1uYZ2lJC12ZQ8itGqm7T3iUstzSwycY 0QBpzubiWbwi3eq8tJ+Kf9Nabniz1Y+qVQeS7VDMHJm4zE+te589oFcv3N0sEaE6OL23 X-Google-Smtp-Source: AGHT+IEpcbzQeM9LaLyXdJvKby1QLX/t4ODxigsMNLZcZBV6/IRjeFpMmNFgJ/HPpeQYvSbFrSFVfw== X-Received: by 2002:a17:903:1111:b0:224:1157:6d26 with SMTP id d9443c01a7336-22dbf5de52cmr28785745ad.4.1745581045605; Fri, 25 Apr 2025 04:37:25 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH v2 2/9] target/riscv/kvm: fix leak in kvm_riscv_init_multiext_cfg() Date: Fri, 25 Apr 2025 08:36:58 -0300 Message-ID: <20250425113705.2741457-3-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425113705.2741457-1-dbarboza@ventanamicro.com> References: <20250425113705.2741457-1-dbarboza@ventanamicro.com> 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::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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1745581132358019100 Content-Type: text/plain; charset="utf-8" 'reglist' is being g+malloc'ed but never freed. Reported-by: Andrew Jones Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/kvm/kvm-cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index accad4c28e..6ba122f360 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -1119,10 +1119,10 @@ static void kvm_riscv_read_vlenb(RISCVCPU *cpu, KVM= ScratchCPU *kvmcpu, =20 static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmc= pu) { + g_autofree struct kvm_reg_list *reglist =3D NULL; KVMCPUConfig *multi_ext_cfg; struct kvm_one_reg reg; struct kvm_reg_list rl_struct; - struct kvm_reg_list *reglist; uint64_t val, reg_id, *reg_search; int i, ret; =20 --=20 2.49.0 From nobody Sat Nov 15 23:41:52 2025 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=1745581340; cv=none; d=zohomail.com; s=zohoarc; b=HfB6i1U1tVWHS+WyavI4beEhwWS/Ryo1ARskQke4nwcU8Ys3h2wKxc0wBR7eieNB9H8hBtSq2mqPfMjI+FabJuPZhn6MQHR2dA6RPbdlB4iqIh6Lo4G7wBXeEcUhYSbV9pWTenjqXFjG+8N4w/IObkgtxVmiOdOv5pr6Rnh0ROY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745581340; 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=/qeMLbhxYt641Ue91qpH+f53Zg+Wm4yrzhBDmgbYMgo=; b=i8UhtMJH62hkXZ2ZTs/rPg/B497Zr94swRSkb6i3QaOJCiSWbHepKxNqw4x2x8oAhwPJ86PO4j9yPJYzsAQt83S9N4CPhTH26PcC502LZdqBrW5c7sZ0NxZTawxunw0/g1lsDsHF7Vi3bo5VYitQj57kvjV21zoM0RCeIKTpTUc= 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 1745581340738906.0960588423877; Fri, 25 Apr 2025 04:42:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HNI-0001Bc-7F; Fri, 25 Apr 2025 07:37:44 -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 1u8HND-00018E-5y for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:39 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8HN9-0006WY-Gc for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:38 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-22409077c06so32695955ad.1 for ; Fri, 25 Apr 2025 04:37:29 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([152.234.125.33]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db50e7a40sm29881055ad.147.2025.04.25.04.37.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 04:37:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1745581048; x=1746185848; 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=/qeMLbhxYt641Ue91qpH+f53Zg+Wm4yrzhBDmgbYMgo=; b=Mog8QZ+vsbHWKYgZBvFzPra2XQ2k0Tu0M5MLKUIYwnvlYFKuPj+w51/ukHIcq7dgKi x0cgcZBylaSDfzoCKw/MYF7aZI9yJMCAcFkbwGnmQ/d1rkt/r8J0JF5SaK2VgIqCpJ9w mOWeTZ9MJDk/wTckhzUqgolb6GdfiC0b4k3mTxybf9a/bOZqvZm4OoKalO16TFGHLskb h8U1NoV25cvjvZhBI9i1CChtbqr1b7y0eNZu6t2ajnIh3rOOZLhghO+8EQkDFi6+XfqJ VYrvbjRGuniJvdcfRRXsut3QBj1SG3PIAWdX+8/D6TW66qM+7XLAcsaWrTu8vAj2J/ww 382w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745581048; x=1746185848; 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=/qeMLbhxYt641Ue91qpH+f53Zg+Wm4yrzhBDmgbYMgo=; b=VQ5FuCVj2SZQpB2J+Iw5wParfwCH4+YiBd3zHPXn0/odYpL1s9oXHl1qXywNCoORLC Tag/bFFYj9uqdWuVE7QWN8gMbTkNinbB0nWHue2Zgf+u1gxM1Y7Gbful21IsBI+WjUeI ash8B7F9JeXCYaDTaRk31qmWYfMVx3r20IqtyD+Mo1C2IgwYEo/rUUqNa4n0VMbfLw7y wJDCxhM4SbeoiyefZFpevZ2HXumw5quI/cgfFDy1qW1i0fQUOspksCBRapUegxwBKIkO NkgnyZbd6qhE4fAOeKhODDMLVWNeQTls+rSGfXkW7Ch/4VsqRSR+IBe488NMUpo46Zcq MXSw== X-Gm-Message-State: AOJu0Yx/7QOHv0sLWKBnxTbG4qfsAOmb/o5SxAG3eqQXoL48o/1VIXFu Z7hLMdVRntxN0v7WtwKsJyTxMxRVcAIRmTQjbxqH5fXtGh0o0Zj31KPX5UCjxzGqkCoEJ2HR0Dz 9 X-Gm-Gg: ASbGncuBFLC4+KT+tXrtNTTOKDaeZQp90v1Of6twEAU2cHWcXZsuYr9p80oq9wud46k hF643Vd/MYTHfbmcEp0u0srYRSDD8HdzgJvRMta4rKVqviYlqiH+7CdNOMkivHz+r8ZanxxeQGj 4LbAZxP3TEY5Q5f/1zQ5cMKY/JtIxw8fFKRc4hj2LeyUkt/DX0SHGj4/e9ZrcOi6jUYUnBWzvX0 wBX2KUIKdvYV1H1DHf0aSeB+ocD3Thb8rkx59Cf3yGu8/bwIhNi9NJXZzSU0DWACvi8yoYYeUIs fcVOLeqkCqF5PmimxJgx47H6zVRGZFL1hgMPaG/pybQkBhAAdsbV7N2dkcCJW94fiqhN X-Google-Smtp-Source: AGHT+IE2QEVzPYdHLGNr9uDrLWj8d1yluulS13NTQ5sW4ZK8gq7V+1s5QNZ+FkSdxl9xK3oi2zix1Q== X-Received: by 2002:a17:902:d512:b0:224:584:6f05 with SMTP id d9443c01a7336-22dbf73b3aemr30802235ad.41.1745581048490; Fri, 25 Apr 2025 04:37:28 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH v2 3/9] target/riscv/kvm: turn u32/u64 reg functions in macros Date: Fri, 25 Apr 2025 08:36:59 -0300 Message-ID: <20250425113705.2741457-4-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425113705.2741457-1-dbarboza@ventanamicro.com> References: <20250425113705.2741457-1-dbarboza@ventanamicro.com> 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::629; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x629.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1745581342152019000 Content-Type: text/plain; charset="utf-8" This change is motivated by a future change w.r.t CSRs management. We want to handle them the same way as KVM extensions, i.e. a static array with KVMCPUConfig objs that will be read/write during init and so on. But to do that properly we must be able to declare a static array that hold KVM regs. C does not allow to init static arrays and use functions as initializers, e.g. we can't do: .kvm_reg_id =3D kvm_riscv_reg_id_ulong(...) When instantiating the array. We can do that with macros though, so our goal is turn kvm_riscv_reg_ulong() in a macro. It is cleaner to turn every other reg_id_*() function in macros, and ulong will end up using the macros for u32 and u64, so we'll start with them. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/kvm/kvm-cpu.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 6ba122f360..c91ecdfe59 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -58,6 +58,12 @@ void riscv_kvm_aplic_request(void *opaque, int irq, int = level) =20 static bool cap_has_mp_state; =20 +#define KVM_RISCV_REG_ID_U32(type, idx) (KVM_REG_RISCV | KVM_REG_SIZE_U32 = | \ + type | idx) + +#define KVM_RISCV_REG_ID_U64(type, idx) (KVM_REG_RISCV | KVM_REG_SIZE_U64 = | \ + type | idx) + static uint64_t kvm_riscv_reg_id_ulong(CPURISCVState *env, uint64_t type, uint64_t idx) { @@ -76,16 +82,6 @@ static uint64_t kvm_riscv_reg_id_ulong(CPURISCVState *en= v, uint64_t type, return id; } =20 -static uint64_t kvm_riscv_reg_id_u32(uint64_t type, uint64_t idx) -{ - return KVM_REG_RISCV | KVM_REG_SIZE_U32 | type | idx; -} - -static uint64_t kvm_riscv_reg_id_u64(uint64_t type, uint64_t idx) -{ - return KVM_REG_RISCV | KVM_REG_SIZE_U64 | type | idx; -} - static uint64_t kvm_encode_reg_size_id(uint64_t id, size_t size_b) { uint64_t size_ctz =3D __builtin_ctz(size_b); @@ -119,12 +115,12 @@ static uint64_t kvm_riscv_vector_reg_id(RISCVCPU *cpu, kvm_riscv_reg_id_ulong(env, KVM_REG_RISCV_CONFIG, \ KVM_REG_RISCV_CONFIG_REG(name)) =20 -#define RISCV_TIMER_REG(name) kvm_riscv_reg_id_u64(KVM_REG_RISCV_TIMER, \ +#define RISCV_TIMER_REG(name) KVM_RISCV_REG_ID_U64(KVM_REG_RISCV_TIMER, \ KVM_REG_RISCV_TIMER_REG(name)) =20 -#define RISCV_FP_F_REG(idx) kvm_riscv_reg_id_u32(KVM_REG_RISCV_FP_F, idx) +#define RISCV_FP_F_REG(idx) KVM_RISCV_REG_ID_U32(KVM_REG_RISCV_FP_F, idx) =20 -#define RISCV_FP_D_REG(idx) kvm_riscv_reg_id_u64(KVM_REG_RISCV_FP_D, idx) +#define RISCV_FP_D_REG(idx) KVM_RISCV_REG_ID_U64(KVM_REG_RISCV_FP_D, idx) =20 #define RISCV_VECTOR_CSR_REG(env, name) \ kvm_riscv_reg_id_ulong(env, KVM_REG_RISCV_VECTOR, \ --=20 2.49.0 From nobody Sat Nov 15 23:41:52 2025 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=1745581197; cv=none; d=zohomail.com; s=zohoarc; b=fsSOzP3PR3xWZu4do2EeHg+jkgfKp18mWd4fZDPkw4/lqV6S8sy1HJHaqCyEVpklsgbaPA4mwFAD2RDiTzHF9dCsqezT+0s963F0rj85IGpQ9AstPPQRvqje9FETVqa5cwgRrH0gDdDD2TduLlcmuPL4Um/vhShO/hjRNHXHYpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745581197; 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=5neQGzLPcsmIj+eh2EIpFmSDwCQhG6xSq9AiQ9ifoDM=; b=SSE2JGIFz56DRsSBRQF+qD05iRIPevOsGD08wpgP4a3LmwZiUpsKBKBkx40fu9LKD2qWwxpEiaKL8eta6BKXYUw+V1MnF+NpC2CMRE18ps++lYlH3fXTZQTY2/w6FZW3v6p8uWU3Ww2LOFs/yL5yQBeHD/rQ6oswNfIfZ3gD7NE= 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 1745581197216825.2286025319117; Fri, 25 Apr 2025 04:39:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HNL-0001Cw-BY; Fri, 25 Apr 2025 07:37:47 -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 1u8HNH-0001Bb-W3 for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:44 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8HNA-0006Wg-E9 for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:43 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-2264aefc45dso33989085ad.0 for ; Fri, 25 Apr 2025 04:37:33 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([152.234.125.33]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db50e7a40sm29881055ad.147.2025.04.25.04.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 04:37:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1745581051; x=1746185851; 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=5neQGzLPcsmIj+eh2EIpFmSDwCQhG6xSq9AiQ9ifoDM=; b=kYaacMHDvK0JfDSwft12zqklR43i1lbXTpEOTIE8Nhg/96FiJrnBEMJ44AQN2M1EXF ju56R3DuyOt24dZBXzHVBC5gzD9QkZNjnc/52m5cTRTH6HUXmL6cTLXy79CzwjwZRfSl mjhaKWEbfDHcm6vvclxHM4M0jrO9Fg5WDm0QBK2SaUco/GUTa/f1W4j3Cmzfm64PcZQT E+lrZ8rBT5NvlpZCi4R7HLnJ5WGZaRyqjTI0805MzIwF2mrvcMVgs9tKHQtGyi7hmE+x SN0aaLx4H9ZA49OVW6RDk72E5PUPs+1/2Pjfc6v+xJQNhHh1CFNZGHxdABrW1VYYSLAw m8Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745581051; x=1746185851; 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=5neQGzLPcsmIj+eh2EIpFmSDwCQhG6xSq9AiQ9ifoDM=; b=js89Zce51UkNmdZVhyDjUaNk6eHBiJEno9A6NMm+8GzqisxbIPDqQ6XOh9gAvTDnyY dPS+aqxcmoqaY3UN1FUI+nzl2SDFhDJP/vcgb+Dh/VLkMYvn0GdcH1diPZwXgx6GR0iw vv2+g2LMgHwuhFEcGpkH7SUUB5S+YjA1B4u7pTeujOKV5uweOauiAjP3gIeblVjG6GLu 6+F4EJkLgGEnyUAtyPgJ8n8IZbUDE+LSxNqRxisiqTke1i4xvGkYjq+zrkGhTA9yOpNz 7avtpcuSEVzb5rXpbf+HEUMuuJr8rqLf3XgfueDzKhUD/6UpTPI2DbkBwRhoST5X+lhV ezBg== X-Gm-Message-State: AOJu0YxO6rzkIWP+JbeWCqSJlniSAQM+9wnCjJgCXtNkYd+bjkZzlYRC S8TjfuY98ofRsRAkRaKQBWapN3JZi53+h2NksTTTr0htbj1zYHtgLAozZDJIl2Wn9gRPt5KMuxe + X-Gm-Gg: ASbGncsYK7UYF3nmZL0H3BP00HFdcXU6u8UjNTt3kvv/I7Xh8Sh3yVHCgk+AtdGetJm FjpRTS/v87iNEDowiqCA7ckOvQ/uEMLmNY/MjTd8GR58wWDqzspqq8tiYxL1r22hMNzp1mLaEIW uAjMEqhR4ZpYfU1kwHnQOtf9pliuVJWPe3FCaY4qsmI2z4PvuVduqbwggkArXgtSG7EAjmXAZgJ RXWGrWH7NnD3U/PJoW1JDq8xS2v7S0l5uCqP47CXS92Wqy7QUdrv4n0GDChraBdG4EBdK5meq9k C8Y85BtbZHZv1ctL4DHacSneYgjIEsHO459t61Z7WWEhF52rGUzxnS67N/6BjTcXlf5QdOQA/15 ufaE= X-Google-Smtp-Source: AGHT+IE09FD0cMsBA13zqSe/F/Y43aUMRL01g/uuovEtGNz0oaczZm+0oMmgf5I5WHhOjP9AdOPPXw== X-Received: by 2002:a17:903:1c6:b0:224:192a:9154 with SMTP id d9443c01a7336-22dbf5fa834mr28954235ad.26.1745581051402; Fri, 25 Apr 2025 04:37:31 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH v2 4/9] target/riscv/kvm: turn kvm_riscv_reg_id_ulong() in a macro Date: Fri, 25 Apr 2025 08:37:00 -0300 Message-ID: <20250425113705.2741457-5-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425113705.2741457-1-dbarboza@ventanamicro.com> References: <20250425113705.2741457-1-dbarboza@ventanamicro.com> 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::62c; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x62c.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1745581198535019100 Content-Type: text/plain; charset="utf-8" We need the reg_id_ulong() helper to be a macro to be able to create a static array of KVMCPUConfig that will hold CSR information. Despite the amount of changes all of them are tedious/trivial: - replace instances of "kvm_riscv_reg_id_ulong" with "KVM_RISCV_REG_ID_ULONG"; - RISCV_CORE_REG(), RISCV_CSR_REG(), RISCV_CONFIG_REG() and RISCV_VECTOR_CSR_REG() only receives one 'name' arg. Remove unneeded 'env' variables when applicable. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/kvm/kvm-cpu.c | 99 ++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 58 deletions(-) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index c91ecdfe59..fd66bc1759 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -64,23 +64,11 @@ static bool cap_has_mp_state; #define KVM_RISCV_REG_ID_U64(type, idx) (KVM_REG_RISCV | KVM_REG_SIZE_U64 = | \ type | idx) =20 -static uint64_t kvm_riscv_reg_id_ulong(CPURISCVState *env, uint64_t type, - uint64_t idx) -{ - uint64_t id =3D KVM_REG_RISCV | type | idx; - - switch (riscv_cpu_mxl(env)) { - case MXL_RV32: - id |=3D KVM_REG_SIZE_U32; - break; - case MXL_RV64: - id |=3D KVM_REG_SIZE_U64; - break; - default: - g_assert_not_reached(); - } - return id; -} +#if defined(TARGET_RISCV64) +#define KVM_RISCV_REG_ID_ULONG(type, idx) KVM_RISCV_REG_ID_U64(type, idx) +#else +#define KVM_RISCV_REG_ID_ULONG(type, idx) KVM_RISCV_REG_ID_U32(type, idx) +#endif =20 static uint64_t kvm_encode_reg_size_id(uint64_t id, size_t size_b) { @@ -103,16 +91,16 @@ static uint64_t kvm_riscv_vector_reg_id(RISCVCPU *cpu, return kvm_encode_reg_size_id(id, size_b); } =20 -#define RISCV_CORE_REG(env, name) \ - kvm_riscv_reg_id_ulong(env, KVM_REG_RISCV_CORE, \ +#define RISCV_CORE_REG(name) \ + KVM_RISCV_REG_ID_ULONG(KVM_REG_RISCV_CORE, \ KVM_REG_RISCV_CORE_REG(name)) =20 -#define RISCV_CSR_REG(env, name) \ - kvm_riscv_reg_id_ulong(env, KVM_REG_RISCV_CSR, \ +#define RISCV_CSR_REG(name) \ + KVM_RISCV_REG_ID_ULONG(KVM_REG_RISCV_CSR, \ KVM_REG_RISCV_CSR_REG(name)) =20 -#define RISCV_CONFIG_REG(env, name) \ - kvm_riscv_reg_id_ulong(env, KVM_REG_RISCV_CONFIG, \ +#define RISCV_CONFIG_REG(name) \ + KVM_RISCV_REG_ID_ULONG(KVM_REG_RISCV_CONFIG, \ KVM_REG_RISCV_CONFIG_REG(name)) =20 #define RISCV_TIMER_REG(name) KVM_RISCV_REG_ID_U64(KVM_REG_RISCV_TIMER, \ @@ -122,13 +110,13 @@ static uint64_t kvm_riscv_vector_reg_id(RISCVCPU *cpu, =20 #define RISCV_FP_D_REG(idx) KVM_RISCV_REG_ID_U64(KVM_REG_RISCV_FP_D, idx) =20 -#define RISCV_VECTOR_CSR_REG(env, name) \ - kvm_riscv_reg_id_ulong(env, KVM_REG_RISCV_VECTOR, \ +#define RISCV_VECTOR_CSR_REG(name) \ + KVM_RISCV_REG_ID_ULONG(KVM_REG_RISCV_VECTOR, \ KVM_REG_RISCV_VECTOR_CSR_REG(name)) =20 #define KVM_RISCV_GET_CSR(cs, env, csr, reg) \ do { \ - int _ret =3D kvm_get_one_reg(cs, RISCV_CSR_REG(env, csr), ®); \ + int _ret =3D kvm_get_one_reg(cs, RISCV_CSR_REG(csr), ®); \ if (_ret) { \ return _ret; \ } \ @@ -136,7 +124,7 @@ static uint64_t kvm_riscv_vector_reg_id(RISCVCPU *cpu, =20 #define KVM_RISCV_SET_CSR(cs, env, csr, reg) \ do { \ - int _ret =3D kvm_set_one_reg(cs, RISCV_CSR_REG(env, csr), ®); \ + int _ret =3D kvm_set_one_reg(cs, RISCV_CSR_REG(csr), ®); \ if (_ret) { \ return _ret; \ } \ @@ -244,7 +232,7 @@ static void kvm_riscv_update_cpu_misa_ext(RISCVCPU *cpu= , CPUState *cs) =20 /* If we're here we're going to disable the MISA bit */ reg =3D 0; - id =3D kvm_riscv_reg_id_ulong(env, KVM_REG_RISCV_ISA_EXT, + id =3D KVM_RISCV_REG_ID_ULONG(KVM_REG_RISCV_ISA_EXT, misa_cfg->kvm_reg_id); ret =3D kvm_set_one_reg(cs, id, ®); if (ret !=3D 0) { @@ -430,7 +418,6 @@ static KVMCPUConfig kvm_sbi_dbcn =3D { =20 static void kvm_riscv_update_cpu_cfg_isa_ext(RISCVCPU *cpu, CPUState *cs) { - CPURISCVState *env =3D &cpu->env; uint64_t id, reg; int i, ret; =20 @@ -441,7 +428,7 @@ static void kvm_riscv_update_cpu_cfg_isa_ext(RISCVCPU *= cpu, CPUState *cs) continue; } =20 - id =3D kvm_riscv_reg_id_ulong(env, KVM_REG_RISCV_ISA_EXT, + id =3D KVM_RISCV_REG_ID_ULONG(KVM_REG_RISCV_ISA_EXT, multi_ext_cfg->kvm_reg_id); reg =3D kvm_cpu_cfg_get(cpu, multi_ext_cfg); ret =3D kvm_set_one_reg(cs, id, ®); @@ -566,14 +553,14 @@ static int kvm_riscv_get_regs_core(CPUState *cs) target_ulong reg; CPURISCVState *env =3D &RISCV_CPU(cs)->env; =20 - ret =3D kvm_get_one_reg(cs, RISCV_CORE_REG(env, regs.pc), ®); + ret =3D kvm_get_one_reg(cs, RISCV_CORE_REG(regs.pc), ®); if (ret) { return ret; } env->pc =3D reg; =20 for (i =3D 1; i < 32; i++) { - uint64_t id =3D kvm_riscv_reg_id_ulong(env, KVM_REG_RISCV_CORE, i); + uint64_t id =3D KVM_RISCV_REG_ID_ULONG(KVM_REG_RISCV_CORE, i); ret =3D kvm_get_one_reg(cs, id, ®); if (ret) { return ret; @@ -592,13 +579,13 @@ static int kvm_riscv_put_regs_core(CPUState *cs) CPURISCVState *env =3D &RISCV_CPU(cs)->env; =20 reg =3D env->pc; - ret =3D kvm_set_one_reg(cs, RISCV_CORE_REG(env, regs.pc), ®); + ret =3D kvm_set_one_reg(cs, RISCV_CORE_REG(regs.pc), ®); if (ret) { return ret; } =20 for (i =3D 1; i < 32; i++) { - uint64_t id =3D kvm_riscv_reg_id_ulong(env, KVM_REG_RISCV_CORE, i); + uint64_t id =3D KVM_RISCV_REG_ID_ULONG(KVM_REG_RISCV_CORE, i); reg =3D env->gpr[i]; ret =3D kvm_set_one_reg(cs, id, ®); if (ret) { @@ -796,26 +783,26 @@ static int kvm_riscv_get_regs_vector(CPUState *cs) return 0; } =20 - ret =3D kvm_get_one_reg(cs, RISCV_VECTOR_CSR_REG(env, vstart), ®); + ret =3D kvm_get_one_reg(cs, RISCV_VECTOR_CSR_REG(vstart), ®); if (ret) { return ret; } env->vstart =3D reg; =20 - ret =3D kvm_get_one_reg(cs, RISCV_VECTOR_CSR_REG(env, vl), ®); + ret =3D kvm_get_one_reg(cs, RISCV_VECTOR_CSR_REG(vl), ®); if (ret) { return ret; } env->vl =3D reg; =20 - ret =3D kvm_get_one_reg(cs, RISCV_VECTOR_CSR_REG(env, vtype), ®); + ret =3D kvm_get_one_reg(cs, RISCV_VECTOR_CSR_REG(vtype), ®); if (ret) { return ret; } env->vtype =3D reg; =20 if (kvm_v_vlenb.supported) { - ret =3D kvm_get_one_reg(cs, RISCV_VECTOR_CSR_REG(env, vlenb), ®= ); + ret =3D kvm_get_one_reg(cs, RISCV_VECTOR_CSR_REG(vlenb), ®); if (ret) { return ret; } @@ -853,26 +840,26 @@ static int kvm_riscv_put_regs_vector(CPUState *cs) } =20 reg =3D env->vstart; - ret =3D kvm_set_one_reg(cs, RISCV_VECTOR_CSR_REG(env, vstart), ®); + ret =3D kvm_set_one_reg(cs, RISCV_VECTOR_CSR_REG(vstart), ®); if (ret) { return ret; } =20 reg =3D env->vl; - ret =3D kvm_set_one_reg(cs, RISCV_VECTOR_CSR_REG(env, vl), ®); + ret =3D kvm_set_one_reg(cs, RISCV_VECTOR_CSR_REG(vl), ®); if (ret) { return ret; } =20 reg =3D env->vtype; - ret =3D kvm_set_one_reg(cs, RISCV_VECTOR_CSR_REG(env, vtype), ®); + ret =3D kvm_set_one_reg(cs, RISCV_VECTOR_CSR_REG(vtype), ®); if (ret) { return ret; } =20 if (kvm_v_vlenb.supported) { reg =3D cpu->cfg.vlenb; - ret =3D kvm_set_one_reg(cs, RISCV_VECTOR_CSR_REG(env, vlenb), ®= ); + ret =3D kvm_set_one_reg(cs, RISCV_VECTOR_CSR_REG(vlenb), ®); =20 for (int i =3D 0; i < 32; i++) { /* @@ -951,25 +938,24 @@ static void kvm_riscv_destroy_scratch_vcpu(KVMScratch= CPU *scratch) =20 static void kvm_riscv_init_machine_ids(RISCVCPU *cpu, KVMScratchCPU *kvmcp= u) { - CPURISCVState *env =3D &cpu->env; struct kvm_one_reg reg; int ret; =20 - reg.id =3D RISCV_CONFIG_REG(env, mvendorid); + reg.id =3D RISCV_CONFIG_REG(mvendorid); reg.addr =3D (uint64_t)&cpu->cfg.mvendorid; ret =3D ioctl(kvmcpu->cpufd, KVM_GET_ONE_REG, ®); if (ret !=3D 0) { error_report("Unable to retrieve mvendorid from host, error %d", r= et); } =20 - reg.id =3D RISCV_CONFIG_REG(env, marchid); + reg.id =3D RISCV_CONFIG_REG(marchid); reg.addr =3D (uint64_t)&cpu->cfg.marchid; ret =3D ioctl(kvmcpu->cpufd, KVM_GET_ONE_REG, ®); if (ret !=3D 0) { error_report("Unable to retrieve marchid from host, error %d", ret= ); } =20 - reg.id =3D RISCV_CONFIG_REG(env, mimpid); + reg.id =3D RISCV_CONFIG_REG(mimpid); reg.addr =3D (uint64_t)&cpu->cfg.mimpid; ret =3D ioctl(kvmcpu->cpufd, KVM_GET_ONE_REG, ®); if (ret !=3D 0) { @@ -984,7 +970,7 @@ static void kvm_riscv_init_misa_ext_mask(RISCVCPU *cpu, struct kvm_one_reg reg; int ret; =20 - reg.id =3D RISCV_CONFIG_REG(env, isa); + reg.id =3D RISCV_CONFIG_REG(isa); reg.addr =3D (uint64_t)&env->misa_ext_mask; ret =3D ioctl(kvmcpu->cpufd, KVM_GET_ONE_REG, ®); =20 @@ -1001,11 +987,10 @@ static void kvm_riscv_init_misa_ext_mask(RISCVCPU *c= pu, static void kvm_riscv_read_cbomz_blksize(RISCVCPU *cpu, KVMScratchCPU *kvm= cpu, KVMCPUConfig *cbomz_cfg) { - CPURISCVState *env =3D &cpu->env; struct kvm_one_reg reg; int ret; =20 - reg.id =3D kvm_riscv_reg_id_ulong(env, KVM_REG_RISCV_CONFIG, + reg.id =3D KVM_RISCV_REG_ID_ULONG(KVM_REG_RISCV_CONFIG, cbomz_cfg->kvm_reg_id); reg.addr =3D (uint64_t)kvmconfig_get_cfg_addr(cpu, cbomz_cfg); ret =3D ioctl(kvmcpu->cpufd, KVM_GET_ONE_REG, ®); @@ -1019,7 +1004,6 @@ static void kvm_riscv_read_cbomz_blksize(RISCVCPU *cp= u, KVMScratchCPU *kvmcpu, static void kvm_riscv_read_multiext_legacy(RISCVCPU *cpu, KVMScratchCPU *kvmcpu) { - CPURISCVState *env =3D &cpu->env; uint64_t val; int i, ret; =20 @@ -1027,7 +1011,7 @@ static void kvm_riscv_read_multiext_legacy(RISCVCPU *= cpu, KVMCPUConfig *multi_ext_cfg =3D &kvm_multi_ext_cfgs[i]; struct kvm_one_reg reg; =20 - reg.id =3D kvm_riscv_reg_id_ulong(env, KVM_REG_RISCV_ISA_EXT, + reg.id =3D KVM_RISCV_REG_ID_ULONG(KVM_REG_RISCV_ISA_EXT, multi_ext_cfg->kvm_reg_id); reg.addr =3D (uint64_t)&val; ret =3D ioctl(kvmcpu->cpufd, KVM_GET_ONE_REG, ®); @@ -1159,7 +1143,7 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu= , KVMScratchCPU *kvmcpu) =20 for (i =3D 0; i < ARRAY_SIZE(kvm_multi_ext_cfgs); i++) { multi_ext_cfg =3D &kvm_multi_ext_cfgs[i]; - reg_id =3D kvm_riscv_reg_id_ulong(&cpu->env, KVM_REG_RISCV_ISA_EXT, + reg_id =3D KVM_RISCV_REG_ID_ULONG(KVM_REG_RISCV_ISA_EXT, multi_ext_cfg->kvm_reg_id); reg_search =3D bsearch(®_id, reglist->reg, reglist->n, sizeof(uint64_t), uint64_cmp); @@ -1338,12 +1322,11 @@ void kvm_arch_init_irq_routing(KVMState *s) =20 static int kvm_vcpu_set_machine_ids(RISCVCPU *cpu, CPUState *cs) { - CPURISCVState *env =3D &cpu->env; target_ulong reg; uint64_t id; int ret; =20 - id =3D RISCV_CONFIG_REG(env, mvendorid); + id =3D RISCV_CONFIG_REG(mvendorid); /* * cfg.mvendorid is an uint32 but a target_ulong will * be written. Assign it to a target_ulong var to avoid @@ -1355,13 +1338,13 @@ static int kvm_vcpu_set_machine_ids(RISCVCPU *cpu, = CPUState *cs) return ret; } =20 - id =3D RISCV_CONFIG_REG(env, marchid); + id =3D RISCV_CONFIG_REG(marchid); ret =3D kvm_set_one_reg(cs, id, &cpu->cfg.marchid); if (ret !=3D 0) { return ret; } =20 - id =3D RISCV_CONFIG_REG(env, mimpid); + id =3D RISCV_CONFIG_REG(mimpid); ret =3D kvm_set_one_reg(cs, id, &cpu->cfg.mimpid); =20 return ret; @@ -1911,7 +1894,7 @@ void riscv_kvm_cpu_finalize_features(RISCVCPU *cpu, E= rror **errp) if (cpu->cfg.ext_zicbom && riscv_cpu_option_set(kvm_cbom_blocksize.name)) { =20 - reg.id =3D kvm_riscv_reg_id_ulong(env, KVM_REG_RISCV_CONFIG, + reg.id =3D KVM_RISCV_REG_ID_ULONG(KVM_REG_RISCV_CONFIG, kvm_cbom_blocksize.kvm_reg_id); reg.addr =3D (uint64_t)&val; ret =3D ioctl(kvmcpu.cpufd, KVM_GET_ONE_REG, ®); @@ -1930,7 +1913,7 @@ void riscv_kvm_cpu_finalize_features(RISCVCPU *cpu, E= rror **errp) if (cpu->cfg.ext_zicboz && riscv_cpu_option_set(kvm_cboz_blocksize.name)) { =20 - reg.id =3D kvm_riscv_reg_id_ulong(env, KVM_REG_RISCV_CONFIG, + reg.id =3D KVM_RISCV_REG_ID_ULONG(KVM_REG_RISCV_CONFIG, kvm_cboz_blocksize.kvm_reg_id); reg.addr =3D (uint64_t)&val; ret =3D ioctl(kvmcpu.cpufd, KVM_GET_ONE_REG, ®); --=20 2.49.0 From nobody Sat Nov 15 23:41:52 2025 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=1745581278; cv=none; d=zohomail.com; s=zohoarc; b=V5jwADo5M7Bkt0MVf/azGHsKpjE8JLj94Urm1gLJo/jfars8mbpRflLVZ0rHgaq0oVpN7pmRJkvosUCrGaSYJzB7u+vFLrmGqDEG8/pZcPD5q2bksroHjHm6FenvZJhZpVPpUbdpLbs22KrFgSLo9ZY8OPy8DKbgJfT1y4DAt9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745581278; 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=x+z6XdUA6CWaSyeqlDqpxdNBJeRsM7KQpEgf6LmCeL4=; b=QDHeJ5QOahjAcJSdnqgKhVigUyEYrjMvuXgTK8Nr1O0HE8Vg4jOIZ6CCnl3Ctr6dz9yvTcIUd+ntv9Ib4RE9xNQwsnYD5HhELFDZwnqcu90t0ZYPgCCVepRt+ht35Qq5+cw43AuhLWs6eHd9KAlIKGop6sBOo7tA3YTCZgPXxxg= 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 1745581278866849.1516617307643; Fri, 25 Apr 2025 04:41:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HNI-0001Bm-OV; Fri, 25 Apr 2025 07:37: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 1u8HNF-00019i-Hg for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:41 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8HNA-0006X1-Um for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:41 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-224341bbc1dso25980395ad.3 for ; Fri, 25 Apr 2025 04:37:36 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([152.234.125.33]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db50e7a40sm29881055ad.147.2025.04.25.04.37.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 04:37:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1745581054; x=1746185854; 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=x+z6XdUA6CWaSyeqlDqpxdNBJeRsM7KQpEgf6LmCeL4=; b=ertYbVFJmRuesZv1gwnbg6SvUDtD4oAv58U7z6cgPOcc4LWTjjVxe8jiiRUveq3Tbj /YhM9jsMbhbE1pztVC02oaTLwZnjXrsU1D/HzcDF0G5XONY6GdA4nE5IW+ZVBOEFlXpy tGklfeBalCpOFw26AlBJ1F9jVNzqUBS/kIgGKpB4ayzlU/Ubb0/Kc7CjkFaC3mmhRLRR 5Fix1GjcBug7+96M6bq9nC/fZZxzCKnqzR7q50uEFHOApW5JT5UoChsWAM99fthM6iR2 2JLMkvgzzso4AFSezZ59mUYStapX0lSKModXUEDZ1JDPiuftgal+nDLcsD04OrMYkaxK Ig1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745581054; x=1746185854; 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=x+z6XdUA6CWaSyeqlDqpxdNBJeRsM7KQpEgf6LmCeL4=; b=TZHkVQ8vpl+feiS+SewZcPT4hlUAop7XlZ6Lm5iJnjCPLme1smqtdapPsRPuXA6Gt4 UCpRkoDDpF22T7xKJd0WQOfdw7Tpfc6ESHoQR15w+LmopbLwFvdLTw//tJ21J8ZAAl37 xrBTaZjs5f3TBX1plrvJhaLRTWmwlHbdQGKDVbBwQxWSVGK510w26us/6+bS3SyoToeJ 87J/qgvsFRAEXbtqSBZ3Swjqvq1eNYfIdeBDWWsFy8aOKOI7auYjdJ9ma96M+45ewtip sc3HDVfduNqp5009zG0TICQjeRqCmYYwm9gTs6wT/Ria17g2AMXK/XoQYSLTAKWhI4I5 C2NA== X-Gm-Message-State: AOJu0YzqipdhrS72Z7INXwUTL32JkssQmsVDaHYzCXLJbCT+ql+ltAsd JuzISVsfOzZFeHgAXvEASc29BESnREaogYBzFBpGrpFHg2f7LJMtrDpLG6jO6mik74Z2/nw13Pn c X-Gm-Gg: ASbGncui+OT+66mmXNB3h1FwHfM8AO0/0e/3ObDqW8zdZ+WFHlcnZRXA4P7TsNapIwl UTpNazSy3DcSpnwqs/hB+cduq7Ly8eO/VMuCkQEMRJrzuBjy/5Sh7PRDo9kuRfsB29q11qiggXg g/AkvjoQ06LhjPIb9C+V9UYGLQZOkuJGxIMfyUT3PBIi+VpaDgf34PjNo6Yy5k+OKPzspG5Cc0F GX7oS2yVZPdP6rMWJ3lf5nFuG2gSAucczWqUNN/w9Dh4OXnEv7LP9Kc2xu8Qa+FcexT9iFx/HhL iSjG54U7lREDQqLcX2iH7kB/fgFGWIXvcJLGqRrTQXm+7wnoUSW9lDfYl7I6v00HdLqT X-Google-Smtp-Source: AGHT+IGNRX4jyXrF4BWovtnVXr3TxkBzaKwHZZsEKSPNreJRfbBktfTDu8STRByDbREyTLIPks7ovw== X-Received: by 2002:a17:903:3042:b0:223:fb3a:8647 with SMTP id d9443c01a7336-22dbf6403b2mr25903585ad.41.1745581054275; Fri, 25 Apr 2025 04:37:34 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH v2 5/9] target/riscv/kvm: add kvm_csr_cfgs[] Date: Fri, 25 Apr 2025 08:37:01 -0300 Message-ID: <20250425113705.2741457-6-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425113705.2741457-1-dbarboza@ventanamicro.com> References: <20250425113705.2741457-1-dbarboza@ventanamicro.com> 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::62d; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x62d.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1745581280759019100 Content-Type: text/plain; charset="utf-8" At this moment we're not checking if the host has support for any specific CSR before doing get/put regs. This will cause problems if the host KVM doesn't support it (see [1] as an example). We'll use the same approach done with the CPU extensions: read all known KVM CSRs during init() to check for availability, then read/write them if they are present. This will be made by either using get-reglist or by directly reading the CSRs. For now we'll just convert the CSRs to use a kvm_csr_cfg[] array, reusing the same KVMCPUConfig abstraction we use for extensions, and use the array in (get|put)_csr_regs() instead of manually listing them. A lot of boilerplate will be added but at least we'll automate the get/put procedure for CSRs, i.e. adding a new CSR in the future will be a matter of adding it in kvm_csr_regs[] and everything else will be taken care of. Despite all the code changes no behavioral change is made. [1] https://lore.kernel.org/qemu-riscv/CABJz62OfUDHYkQ0T3rGHStQprf1c7_E0qBL= bLKhfv=3D+jb0SYAw@mail.gmail.com/ Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/cpu.h | 1 + target/riscv/kvm/kvm-cpu.c | 121 ++++++++++++++++++++++++++----------- 2 files changed, 86 insertions(+), 36 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 679f417336..f5a60d0c52 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -79,6 +79,7 @@ const char *riscv_get_misa_ext_name(uint32_t bit); const char *riscv_get_misa_ext_description(uint32_t bit); =20 #define CPU_CFG_OFFSET(_prop) offsetof(struct RISCVCPUConfig, _prop) +#define ENV_CSR_OFFSET(_csr) offsetof(CPURISCVState, _csr) =20 typedef struct riscv_cpu_profile { struct riscv_cpu_profile *u_parent; diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index fd66bc1759..7cbe566e5f 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -114,22 +114,6 @@ static uint64_t kvm_riscv_vector_reg_id(RISCVCPU *cpu, KVM_RISCV_REG_ID_ULONG(KVM_REG_RISCV_VECTOR, \ KVM_REG_RISCV_VECTOR_CSR_REG(name)) =20 -#define KVM_RISCV_GET_CSR(cs, env, csr, reg) \ - do { \ - int _ret =3D kvm_get_one_reg(cs, RISCV_CSR_REG(csr), ®); \ - if (_ret) { \ - return _ret; \ - } \ - } while (0) - -#define KVM_RISCV_SET_CSR(cs, env, csr, reg) \ - do { \ - int _ret =3D kvm_set_one_reg(cs, RISCV_CSR_REG(csr), ®); \ - if (_ret) { \ - return _ret; \ - } \ - } while (0) - #define KVM_RISCV_GET_TIMER(cs, name, reg) \ do { \ int ret =3D kvm_get_one_reg(cs, RISCV_TIMER_REG(name), ®); \ @@ -251,6 +235,53 @@ static void kvm_riscv_update_cpu_misa_ext(RISCVCPU *cp= u, CPUState *cs) } } =20 +#define KVM_CSR_CFG(_name, _env_prop, reg_id) \ + {.name =3D _name, .offset =3D ENV_CSR_OFFSET(_env_prop), \ + .kvm_reg_id =3D reg_id} + +static KVMCPUConfig kvm_csr_cfgs[] =3D { + KVM_CSR_CFG("sstatus", mstatus, RISCV_CSR_REG(sstatus)), + KVM_CSR_CFG("sie", mie, RISCV_CSR_REG(sie)), + KVM_CSR_CFG("stvec", stvec, RISCV_CSR_REG(stvec)), + KVM_CSR_CFG("sscratch", sscratch, RISCV_CSR_REG(sscratch)), + KVM_CSR_CFG("sepc", sepc, RISCV_CSR_REG(sepc)), + KVM_CSR_CFG("scause", scause, RISCV_CSR_REG(scause)), + KVM_CSR_CFG("stval", stval, RISCV_CSR_REG(stval)), + KVM_CSR_CFG("sip", mip, RISCV_CSR_REG(sip)), + KVM_CSR_CFG("satp", satp, RISCV_CSR_REG(satp)), +}; + +static void *kvmconfig_get_env_addr(RISCVCPU *cpu, KVMCPUConfig *csr_cfg) +{ + return (void *)&cpu->env + csr_cfg->offset; +} + +static uint64_t kvm_cpu_csr_get_u32(RISCVCPU *cpu, KVMCPUConfig *csr_cfg) +{ + uint32_t *val32 =3D kvmconfig_get_env_addr(cpu, csr_cfg); + return *val32; +} + +static uint64_t kvm_cpu_csr_get_u64(RISCVCPU *cpu, KVMCPUConfig *csr_cfg) +{ + uint64_t *val64 =3D kvmconfig_get_env_addr(cpu, csr_cfg); + return *val64; +} + +static void kvm_cpu_csr_set_u32(RISCVCPU *cpu, KVMCPUConfig *csr_cfg, + uint32_t val) +{ + uint32_t *val32 =3D kvmconfig_get_env_addr(cpu, csr_cfg); + *val32 =3D val; +} + +static void kvm_cpu_csr_set_u64(RISCVCPU *cpu, KVMCPUConfig *csr_cfg, + uint64_t val) +{ + uint64_t *val64 =3D kvmconfig_get_env_addr(cpu, csr_cfg); + *val64 =3D val; +} + #define KVM_EXT_CFG(_name, _prop, _reg_id) \ {.name =3D _name, .offset =3D CPU_CFG_OFFSET(_prop), \ .kvm_reg_id =3D _reg_id} @@ -598,34 +629,52 @@ static int kvm_riscv_put_regs_core(CPUState *cs) =20 static int kvm_riscv_get_regs_csr(CPUState *cs) { - CPURISCVState *env =3D &RISCV_CPU(cs)->env; + RISCVCPU *cpu =3D RISCV_CPU(cs); + uint64_t reg; + int i, ret; + + for (i =3D 0; i < ARRAY_SIZE(kvm_csr_cfgs); i++) { + KVMCPUConfig *csr_cfg =3D &kvm_csr_cfgs[i]; =20 - KVM_RISCV_GET_CSR(cs, env, sstatus, env->mstatus); - KVM_RISCV_GET_CSR(cs, env, sie, env->mie); - 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); - KVM_RISCV_GET_CSR(cs, env, scause, env->scause); - 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); + ret =3D kvm_get_one_reg(cs, csr_cfg->kvm_reg_id, ®); + if (ret) { + return ret; + } + + if (KVM_REG_SIZE(csr_cfg->kvm_reg_id) =3D=3D sizeof(uint32_t)) { + kvm_cpu_csr_set_u32(cpu, csr_cfg, reg); + } else if (KVM_REG_SIZE(csr_cfg->kvm_reg_id) =3D=3D sizeof(uint64_= t)) { + kvm_cpu_csr_set_u64(cpu, csr_cfg, reg); + } else { + g_assert_not_reached(); + } + } =20 return 0; } =20 static int kvm_riscv_put_regs_csr(CPUState *cs) { - CPURISCVState *env =3D &RISCV_CPU(cs)->env; + RISCVCPU *cpu =3D RISCV_CPU(cs); + uint64_t reg; + int i, ret; + + for (i =3D 0; i < ARRAY_SIZE(kvm_csr_cfgs); i++) { + KVMCPUConfig *csr_cfg =3D &kvm_csr_cfgs[i]; + + if (KVM_REG_SIZE(csr_cfg->kvm_reg_id) =3D=3D sizeof(uint32_t)) { + reg =3D kvm_cpu_csr_get_u32(cpu, csr_cfg); + } else if (KVM_REG_SIZE(csr_cfg->kvm_reg_id) =3D=3D sizeof(uint64_= t)) { + reg =3D kvm_cpu_csr_get_u64(cpu, csr_cfg); + } else { + g_assert_not_reached(); + } =20 - KVM_RISCV_SET_CSR(cs, env, sstatus, env->mstatus); - KVM_RISCV_SET_CSR(cs, env, sie, env->mie); - 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); - KVM_RISCV_SET_CSR(cs, env, scause, env->scause); - 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); + ret =3D kvm_set_one_reg(cs, csr_cfg->kvm_reg_id, ®); + if (ret) { + return ret; + } + } =20 return 0; } --=20 2.49.0 From nobody Sat Nov 15 23:41:52 2025 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=1745581126; cv=none; d=zohomail.com; s=zohoarc; b=SNBWAjJX04B0V7Io9J2wfsRacQ0Q/t8ZOvrAUgukKMVS6lS+yVHdaD9vlKy7cWrcd5yAlOmlkaVFgZocRSaPfrUP29ziX9PcJ0JvLg3YGuiTzRQs6DXYR7oxr5A3klWgaaNZJf5+7DvNQeBZr4BQ6XiWRXrgT/rRMGcaty9sYLc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745581126; 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=6DESaWPPknQe9P5h6ydvvKVurgvUyNfNQgQIjLDK2Kc=; b=fxNc0FO2wUtR8G31BtdKShRkow/xReef5nY4W76i7G5y0LqPKYKq09Jx+rybHbfmD5tC9v52hzxs+QlRnqq0tZ6/ijUbLbGgNTKZ5K4F94F+4WhPO69vhxqqfwgNtblzZ2aW4HoaT3R58Mj268DcjZxIsF7n0k1LzG+lTbQDX/A= 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 1745581126843877.0854218042267; Fri, 25 Apr 2025 04:38:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HNO-0001EU-Dm; Fri, 25 Apr 2025 07:37:50 -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 1u8HNJ-0001Cm-U2 for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:46 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8HNE-0006Xe-3F for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:45 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-224171d6826so33565085ad.3 for ; Fri, 25 Apr 2025 04:37:39 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([152.234.125.33]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db50e7a40sm29881055ad.147.2025.04.25.04.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 04:37:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1745581057; x=1746185857; 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=6DESaWPPknQe9P5h6ydvvKVurgvUyNfNQgQIjLDK2Kc=; b=IGpVTvG1ANwmX+LWJL24UICOLW5TMukGCBusGOES+y5wInsUd66lwYupoKSn/Z+G3b hcWe7xD/em18j/yWTWlyNXMHIiaF6lyppwTaZc3tKJKRzIF2HlnuxCkRd3ivBu8VzbGM tRearvC19NNPFu+okDagj7rratzyIgvoSjYtl1lw6XNKd2N14dsiVmNyMQkt+EP20zPQ VmMi5dnD/Rbna/wlf5DeVHWfEOS9yJwNyHshhftL9fVpkRIC8g7AiG9AcjsrBtSus+// iti9fRMSJ6/V0b99QcQxkMrfVFItbjmSMI9Z0JQWxhPLTXK5ZK3PYAK2/n2gpp3PKuwp BYew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745581057; x=1746185857; 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=6DESaWPPknQe9P5h6ydvvKVurgvUyNfNQgQIjLDK2Kc=; b=vYauTDtZnoi3p+kRwcqA3GRY6m+9GfiyoDYNc2omAezb7/krxqEqfChATi/GvDnvCq KsBpprqzvCE9+m1ioKEkLGTIARym2AMmy403irHpsp2s5mmJLA9yZT49mZLB0CL+wLC4 O/FgLTJ5m3kqlYxsMW+/Uv2az1Ej7Qxl4BnIjk1EXuE8EuRmILCJsJFybeipNjoJoVHD tBHiT8m45sUw6EoabTXtvmTp1UzuQmYaVJtWGlmE35ERVdVZeRZXFksdKZtWMb/tYV81 ympW7Q3lFVmE6DBrIkArZxhHyL9rGLNDIuFc4Q+yjbJMBNc1I+ECMYqQrVw53J/n++qG YYKQ== X-Gm-Message-State: AOJu0YzxhnHV7a8ArSS7CDiYyaPgemG2gmIfIvuoJEw8GrnAUouJgUKj HnayJnNKssQEMESv8Y+6Rt+8tBuyPmISEJX/yHehZy1qArVJSWEqsZtcgt5ZeqmgL5dti3c9nGc L X-Gm-Gg: ASbGncv679HvzAkGeXbmorRnMuMyKtNZeSBCWme0dxMf36eRYirHhydV4FljYY/Ftic 0F5DyzlfNZJ8tdf+P0WFrMPfTnCzR3t8xdeFi6sMZzWLleI4PkTsdyjhT/6kK560WW+4MkiCIKb MCiCpJ95nftiXkoajVpD5PrzkxQhWTGtYqBZa96lxtHxFwxBTnH/4wMwbIaftr/RnfRSuIcSsiv DYqo5tZa8HXcdpj2YWz6UzDdaKE39vgj2V+CNRqgBNiip3prZ3/8TaQ1VBzIGbnBaEihz7Tp1oe 4grziduHJQtXWmvRHWD/A0q/i9kW91uUVUhTuFIzDpt7sIbSdOYrlWkZG5RSYdoJ+VUr X-Google-Smtp-Source: AGHT+IE9Ystz7TUk/Wr753mz7Oso/QuG4940+i+MWeHlcIVtRwQXqJbLTmUR5M/Tq/c8NM8m2VNklA== X-Received: by 2002:a17:903:11cc:b0:220:efc8:60b1 with SMTP id d9443c01a7336-22dbf62d4b4mr30175755ad.39.1745581057541; Fri, 25 Apr 2025 04:37:37 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza , Andrea Bolognani Subject: [PATCH v2 6/9] target/riscv/kvm: do not read unavailable CSRs Date: Fri, 25 Apr 2025 08:37:02 -0300 Message-ID: <20250425113705.2741457-7-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425113705.2741457-1-dbarboza@ventanamicro.com> References: <20250425113705.2741457-1-dbarboza@ventanamicro.com> 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::633; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x633.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1745581128731019100 Content-Type: text/plain; charset="utf-8" [1] reports that commit 4db19d5b21 broke a KVM guest running kernel 6.6. This happens because the kernel does not know 'senvcfg', making it unable to boot because QEMU is reading/wriiting it without any checks. After converting the CSRs to do "automated" get/put reg procedures in the previous patch we can now scan for availability. Two functions are created: - kvm_riscv_read_csr_cfg_legacy() will check if the CSR exists by brute forcing KVM_GET_ONE_REG in each one of them, interpreting an EINVAL return as indication that the CSR isn't available. This will be use in absence of KVM_GET_REG_LIST; - kvm_riscv_read_csr_cfg() will use the existing result of get_reg_list to check if the CSRs ids are present. kvm_riscv_init_multiext_cfg() is now kvm_riscv_init_multiext_csr_cfg() to reflect that the function is also dealing with CSRs. [1] https://lore.kernel.org/qemu-riscv/CABJz62OfUDHYkQ0T3rGHStQprf1c7_E0qBL= bLKhfv=3D+jb0SYAw@mail.gmail.com/ Fixes: 4db19d5b21 ("target/riscv/kvm: add missing KVM CSRs") Reported-by: Andrea Bolognani Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/kvm/kvm-cpu.c | 62 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 3 deletions(-) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 7cbe566e5f..f341085ba1 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -636,6 +636,10 @@ static int kvm_riscv_get_regs_csr(CPUState *cs) for (i =3D 0; i < ARRAY_SIZE(kvm_csr_cfgs); i++) { KVMCPUConfig *csr_cfg =3D &kvm_csr_cfgs[i]; =20 + if (!csr_cfg->supported) { + continue; + } + ret =3D kvm_get_one_reg(cs, csr_cfg->kvm_reg_id, ®); if (ret) { return ret; @@ -662,6 +666,10 @@ static int kvm_riscv_put_regs_csr(CPUState *cs) for (i =3D 0; i < ARRAY_SIZE(kvm_csr_cfgs); i++) { KVMCPUConfig *csr_cfg =3D &kvm_csr_cfgs[i]; =20 + if (!csr_cfg->supported) { + continue; + } + if (KVM_REG_SIZE(csr_cfg->kvm_reg_id) =3D=3D sizeof(uint32_t)) { reg =3D kvm_cpu_csr_get_u32(cpu, csr_cfg); } else if (KVM_REG_SIZE(csr_cfg->kvm_reg_id) =3D=3D sizeof(uint64_= t)) { @@ -1090,6 +1098,32 @@ static void kvm_riscv_read_multiext_legacy(RISCVCPU = *cpu, } } =20 +static void kvm_riscv_read_csr_cfg_legacy(KVMScratchCPU *kvmcpu) +{ + uint64_t val; + int i, ret; + + for (i =3D 0; i < ARRAY_SIZE(kvm_csr_cfgs); i++) { + KVMCPUConfig *csr_cfg =3D &kvm_csr_cfgs[i]; + struct kvm_one_reg reg; + + reg.id =3D csr_cfg->kvm_reg_id; + reg.addr =3D (uint64_t)&val; + ret =3D ioctl(kvmcpu->cpufd, KVM_GET_ONE_REG, ®); + if (ret !=3D 0) { + if (errno =3D=3D EINVAL) { + csr_cfg->supported =3D false; + } else { + error_report("Unable to read KVM CSR %s: %s", + csr_cfg->name, strerror(errno)); + exit(EXIT_FAILURE); + } + } else { + csr_cfg->supported =3D true; + } + } +} + static int uint64_cmp(const void *a, const void *b) { uint64_t val1 =3D *(const uint64_t *)a; @@ -1146,7 +1180,26 @@ static void kvm_riscv_read_vlenb(RISCVCPU *cpu, KVMS= cratchCPU *kvmcpu, } } =20 -static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmc= pu) +static void kvm_riscv_read_csr_cfg(struct kvm_reg_list *reglist) +{ + struct kvm_reg_list *reg_search; + uint64_t reg_id; + + for (int i =3D 0; i < ARRAY_SIZE(kvm_csr_cfgs); i++) { + KVMCPUConfig *csr_cfg =3D &kvm_csr_cfgs[i]; + + reg_id =3D csr_cfg->kvm_reg_id; + reg_search =3D bsearch(®_id, reglist->reg, reglist->n, + sizeof(uint64_t), uint64_cmp); + if (!reg_search) { + continue; + } + + csr_cfg->supported =3D true; + } +} + +static void kvm_riscv_init_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu) { g_autofree struct kvm_reg_list *reglist =3D NULL; KVMCPUConfig *multi_ext_cfg; @@ -1163,7 +1216,9 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu= , KVMScratchCPU *kvmcpu) * (EINVAL). Use read_legacy() in this case. */ if (errno =3D=3D EINVAL) { - return kvm_riscv_read_multiext_legacy(cpu, kvmcpu); + kvm_riscv_read_multiext_legacy(cpu, kvmcpu); + kvm_riscv_read_csr_cfg_legacy(kvmcpu); + return; } else if (errno !=3D E2BIG) { /* * E2BIG is an expected error message for the API since we @@ -1226,6 +1281,7 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu= , KVMScratchCPU *kvmcpu) } =20 kvm_riscv_check_sbi_dbcn_support(cpu, reglist); + kvm_riscv_read_csr_cfg(reglist); } =20 static void riscv_init_kvm_registers(Object *cpu_obj) @@ -1239,7 +1295,7 @@ static void riscv_init_kvm_registers(Object *cpu_obj) =20 kvm_riscv_init_machine_ids(cpu, &kvmcpu); kvm_riscv_init_misa_ext_mask(cpu, &kvmcpu); - kvm_riscv_init_multiext_cfg(cpu, &kvmcpu); + kvm_riscv_init_cfg(cpu, &kvmcpu); =20 kvm_riscv_destroy_scratch_vcpu(&kvmcpu); } --=20 2.49.0 From nobody Sat Nov 15 23:41:52 2025 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=1745581165; cv=none; d=zohomail.com; s=zohoarc; b=oAHszzy0yV18Wh2CBABGEAsBm6TGtafI8RIX482Qp0/TOB2TDBbPVHC4Cj5KUN0jc64Tvp24oYaKdWjG+rj5GS6M9DfDV/kt5qyphKfFTAtosld1agGF1AQejqYVzCvaFlgAuqwZUxkMr3+XLHiirDlYw2Ww2ZZhxLyszdgQGkw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745581165; 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=3BrB04qgYNqKfjSryNKQ6LiS7/AW8R3CaBfrk1SZh+A=; b=UpytgwNcqSqewLUPmUYTwz4jXPyq/8cW4jt0+fGzMb8tgA8LS3jSY/OhGUuKbeTCNLqQ662sCeovdqmnMfau4T3QLH6B8W+t96sTITqQaJQU3uSH9N482Ltxzy58nF8SzE794jfytt92ieIqqsDgJla3WFhcsJMLvxN/Y1pB0IU= 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 1745581165341847.3306768504052; Fri, 25 Apr 2025 04:39:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HNP-0001FO-7V; Fri, 25 Apr 2025 07:37:51 -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 1u8HNL-0001D4-1W for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:47 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8HNH-0006YM-Ex for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:46 -0400 Received: by mail-pj1-x1029.google.com with SMTP id 98e67ed59e1d1-309fac646adso292936a91.1 for ; Fri, 25 Apr 2025 04:37:42 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([152.234.125.33]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db50e7a40sm29881055ad.147.2025.04.25.04.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 04:37:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1745581060; x=1746185860; 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=3BrB04qgYNqKfjSryNKQ6LiS7/AW8R3CaBfrk1SZh+A=; b=Lyt3KnoczpBDBQTZn+A6cOXWoyvugPPrEs9hGiNAUGCVATkqKDc6GjWJG43tSrHEPz fRl7BrybtBlWcHPu82SG6LKXRgG9eoccWMtdwS2EIikIxqYeEWsyRQ82QqIN9YZIACuH QPU2kGWmNw1mn6Fa8NNvfmBkcJbX0JnW9+oMJu3cQPvAo9rqbTwE6KBC4QWcfBOy/c8F DAsXwE15WHh+Kgmnp7EDXtsDV6H7FFI/T4jSRzqqnTj4afTHjeH6+zH4hS5PxbCUZGjm At855Rkelodh4JQsUyCr1Cn1M2gYjLRY32lbUp6eETlDYHEYq9AQzIH5LTRepX7IlLA+ YiYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745581060; x=1746185860; 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=3BrB04qgYNqKfjSryNKQ6LiS7/AW8R3CaBfrk1SZh+A=; b=K6JdVbfZcfBxZlS8v20k2dmflpWflzf8ttxjl7DxeINNkHveJ8vEPfg4uyTYKY9TM4 I1Tw6KKuV+4RszzKdT3qHy/Y718tvrIcyBfe9y06B5JN+eu6aVaC8/8mD8zTLAWM8CXW 1LP2AailypUWq8w7O6OkT2kjKsCbv8Tu8zUvQFHiDkUWEagLIfuDjqVvZqWnSY3OD4gU c0bYMxqUdsqIyT3+sA4Fu1Ol287t3ReXCqoaNivq8LwgYv/FAK8Q03sfcWdecE7jcTqw 3WPiFSxXeMQYrT0gWF0NmqhmRgrgx6sUNVoDltlfCIb8QDEQEnmVNcSQHENE22/25ftZ sqhw== X-Gm-Message-State: AOJu0YzVYTTsMoBYZ73aNw3zOjjinUMklQIvxKwW5bfMXCSZK4PikOJf 0v9zSq1u/Uns/3TBI3oygwjfoSOGlYLd7CGI9F131r9CK538kUzs9PIybaDQxS/gEHxfjQUjbIk s X-Gm-Gg: ASbGnctVGbcjB0BhcF34bMQSoPC7y/PTreJ98y99178m3avkabwxSrQeSXayceqxU7K QxplL/8kPptGPG3IbMbeBHl8YaCULv4J76ZJyFYyZJXazyhViFJJa/Q36e9jT29GCVIFCcNfx2f PDPf5+TkzPlJximlEM4VKGLYlnY+u79CZ/HmCyidwVlnEWFRYzDphomSDb56vj+kpvdaWHoiZml ZOMvs0vbzW7Z2X/T9tvMpvVGPBh/eXYqtxbohwGldOFSpC7Nc7YK+Z2t8Eb5YRUUnu79OU0gCHh loUDijVRZlJfkWVMeZtrVud8LnIw0+GQIwRHrGKY6PGg5A+0352zPIG7e1xiXCUlX5U/598Tta3 OvUQ= X-Google-Smtp-Source: AGHT+IHjcK8IhIJ7Lo8b4E1ujd1NxeRt7hzev3Jng7Nw3EMKfClhu0xFTXgargc8vR7xTS0uNn9M3w== X-Received: by 2002:a17:90b:2e42:b0:2ff:5267:e7da with SMTP id 98e67ed59e1d1-309f895d406mr2454031a91.3.1745581060411; Fri, 25 Apr 2025 04:37:40 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH v2 7/9] target/riscv/kvm: add senvcfg CSR Date: Fri, 25 Apr 2025 08:37:03 -0300 Message-ID: <20250425113705.2741457-8-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425113705.2741457-1-dbarboza@ventanamicro.com> References: <20250425113705.2741457-1-dbarboza@ventanamicro.com> 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::1029; envelope-from=dbarboza@ventanamicro.com; helo=mail-pj1-x1029.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1745581166651019000 Content-Type: text/plain; charset="utf-8" We're missing the senvcfg CSRs which is already present in the KVM UAPI. Reported-by: Andrew Jones Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/kvm/kvm-cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index f341085ba1..e37fa38c07 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -249,6 +249,7 @@ static KVMCPUConfig kvm_csr_cfgs[] =3D { KVM_CSR_CFG("stval", stval, RISCV_CSR_REG(stval)), KVM_CSR_CFG("sip", mip, RISCV_CSR_REG(sip)), KVM_CSR_CFG("satp", satp, RISCV_CSR_REG(satp)), + KVM_CSR_CFG("senvcfg", senvcfg, RISCV_CSR_REG(senvcfg)), }; =20 static void *kvmconfig_get_env_addr(RISCVCPU *cpu, KVMCPUConfig *csr_cfg) @@ -698,6 +699,7 @@ static void kvm_riscv_reset_regs_csr(CPURISCVState *env) env->stval =3D 0; env->mip =3D 0; env->satp =3D 0; + env->senvcfg =3D 0; } =20 static int kvm_riscv_get_regs_fp(CPUState *cs) --=20 2.49.0 From nobody Sat Nov 15 23:41:52 2025 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=1745581126; cv=none; d=zohomail.com; s=zohoarc; b=W/ORqWPHq5abm8ijQDcNcY2TV67ZwyHelr1oT1eOUv8uszX2F6b6cI9i+iwisGEa23KXqwqWboven1+J2Ny65KH0B/qgXossN43hOyolJHFR7Ota2WUio7bbWUTtwcx2aZDI9f5h903IoUlDHJSFB/12U3LpmB6Yv+5K6VUvQ+0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745581126; 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=WoRag7nHgN6HPhipqYLKSstdosBjYUjBOszLpVa5YAo=; b=a36q1h2xhCWVs/EzDvO3GM3R2+fx4D3DOxWNNEqtcLjaS0zAWMjIx5hvQuGOfkD1iV+s1qcvpMg/vBE41yjP0wwy35mMGpHDQ5oGPnBiPYCLr9B4Fdnlv49sXLRTdjwvaeLmSZi4P1Y4a6TxxZZzijZNPV1sEGsg3dq/n4PxDQc= 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 1745581126687432.7215273663197; Fri, 25 Apr 2025 04:38:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HNR-0001Gn-P5; Fri, 25 Apr 2025 07:37:53 -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 1u8HNM-0001E0-EW for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:48 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8HNJ-0006Yv-Vd for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:48 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-22c33e5013aso26317495ad.0 for ; Fri, 25 Apr 2025 04:37:45 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([152.234.125.33]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db50e7a40sm29881055ad.147.2025.04.25.04.37.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 04:37:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1745581063; x=1746185863; 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=WoRag7nHgN6HPhipqYLKSstdosBjYUjBOszLpVa5YAo=; b=frwCENk51s0nOwStwB9AH88MiaTIUjd7naY6ZpxaQvJg469inO/QiKUNdB2OxdEizf Vfiu8RRQU5lIaZaKGiMl4cEyjzqv4dWVo6KUhbLLJVnNj+Z4CazjjChXtAW3/dkdNFoK 0UuyNyJE2/AweNjlGNfFMnW5ZcfbItqlmYCSDO2Ux+WKfHOAKn50b3clA4mdD5uNm6yj Msh+1Pgx9GVve6CiUElut7QJM90euwZYhYhotFrvHRCZ+MUoeU163ZwSMrGASebVP5k5 XM3lrso0RXvDhhhSaRWvkUcn3Opiz45wVyCqQjI5n6+LMxjPn4elhOslqv1dnjacSkAS oSlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745581063; x=1746185863; 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=WoRag7nHgN6HPhipqYLKSstdosBjYUjBOszLpVa5YAo=; b=RgXsrZRwcc8Adtr69e82uOsKru/aCHfHgkZVnwAZGWpa4spAZU69+k6wd9r8u9N0Qk EggRDSki5pbUekR6yzMunQnV5f1/bBUBD2Nhw5WpiykfauP0pYe2YiTF0t5ABXOSs0f8 NiZiJYh4bFLvDGctP5Ij8GPukNOTkKVBDj4bnik8/NxqnjhnYdbevBlZatdb2GzoYhPY bjo3+RD3e6jTJGYRE+fXag5Ed//wH5l4L/Rg835I5nSieUlRhQVaAtpXBhaIOgLa4CuJ 2UC7jocxLVHUFMn0X/L3RRgVcur2DZDPB0yyZJDj8qa47Z70JiiPZlLKNsGuaSWq6Irf Uv4A== X-Gm-Message-State: AOJu0YzIt/R8qV52StvV0CVWK/enQdiQhtLp1M64b6hNAPUhdd8vFhKW RmureFYXS40F6DjLwgsT3/YGrRWMq8Xqq4OigC9tJT6FZSARR0D50SQ46QV2L1+tScDYbym0pBd m X-Gm-Gg: ASbGncsMvJdmaupdlRVpQ76GSZLI/UiShUyiqqQWeETYSQstn47oLuVCPV1yzV8OeQn brzZ26CETZdQFYZGZCianK+tiEXKtT5P2GcPAYuHA/cmPJJLieSAVb5LAHxSjYccFBKauluLc+l kRV2LGw4j7kZNbETySdVUlEryR0jvvQDEmnynXTglftPCY7phUmqPQ7IPxjhOA5ED38+Pee7oI5 u6VJ+VDSeLBf+Z1aUvlN3nk5jD6qFe1fyl1BlDGNbBGPxno4aRC78g9QNs0U3ILumpzfM1O0sLX vqka51uqe3Tx5rqOz7meQ5Eiaw1xx7QScdO7auVTL67P+ujuNVut+mu9IFpppKwEi4cK X-Google-Smtp-Source: AGHT+IEuuSoPuA9ZS0PqoVEM1Eey5FOz5LPQrkKDRsuJUQT+WWahTLJ3htSKSK3IUGJMdSeqYiSOXg== X-Received: by 2002:a17:903:1a23:b0:220:e924:99dd with SMTP id d9443c01a7336-22dbf6335a1mr33578015ad.34.1745581063237; Fri, 25 Apr 2025 04:37:43 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH v2 8/9] target/riscv: widen (m|s)counteren to target_ulong Date: Fri, 25 Apr 2025 08:37:04 -0300 Message-ID: <20250425113705.2741457-9-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425113705.2741457-1-dbarboza@ventanamicro.com> References: <20250425113705.2741457-1-dbarboza@ventanamicro.com> 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::635; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x635.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1745581128695019000 Content-Type: text/plain; charset="utf-8" We want to support scounteren as a KVM CSR. The KVM UAPI defines every CSR size as target_ulong, and our env->scounteren is fixed at 32 bits. The other existing cases where the property size does not match the KVM reg size happens with uint64_t properties, like 'mstatus'. When running a 32 bit CPU we'll write a 32 bit 'sstatus' KVM reg into the 64 bit 'mstatus' field. As long as we're consistent, i.e. we're always reading/writing the same words, this is ok. For scounteren, a KVM guest running in a 64 bit CPU will end up writing a 64 bit reg in a 32 bit field. This will have all sort of funny side effects in the KVM guest that we would rather avoid. Increase scounteren to target_ulong to allow KVM to read/write the scounteren CSR without any surprises. 'mcounteren' is being changed to target_ulong for consistency. Aside from bumping the version of the RISCVCPU vmstate no other behavioral changes are expected. Signed-off-by: Daniel Henrique Barboza --- target/riscv/cpu.h | 4 ++-- target/riscv/machine.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index f5a60d0c52..0623c3187b 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -400,8 +400,8 @@ struct CPUArchState { */ bool two_stage_indirect_lookup; =20 - uint32_t scounteren; - uint32_t mcounteren; + target_ulong scounteren; + target_ulong mcounteren; =20 uint32_t scountinhibit; uint32_t mcountinhibit; diff --git a/target/riscv/machine.c b/target/riscv/machine.c index df2d5bad8d..4b11b203fb 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -401,8 +401,8 @@ static const VMStateDescription vmstate_ssp =3D { =20 const VMStateDescription vmstate_riscv_cpu =3D { .name =3D "cpu", - .version_id =3D 10, - .minimum_version_id =3D 10, + .version_id =3D 11, + .minimum_version_id =3D 11, .post_load =3D riscv_cpu_post_load, .fields =3D (const VMStateField[]) { VMSTATE_UINTTL_ARRAY(env.gpr, RISCVCPU, 32), @@ -445,8 +445,8 @@ const VMStateDescription vmstate_riscv_cpu =3D { VMSTATE_UINTTL(env.mtval, RISCVCPU), VMSTATE_UINTTL(env.miselect, RISCVCPU), VMSTATE_UINTTL(env.siselect, RISCVCPU), - VMSTATE_UINT32(env.scounteren, RISCVCPU), - VMSTATE_UINT32(env.mcounteren, RISCVCPU), + VMSTATE_UINTTL(env.scounteren, RISCVCPU), + VMSTATE_UINTTL(env.mcounteren, RISCVCPU), VMSTATE_UINT32(env.scountinhibit, RISCVCPU), VMSTATE_UINT32(env.mcountinhibit, RISCVCPU), VMSTATE_STRUCT_ARRAY(env.pmu_ctrs, RISCVCPU, RV_MAX_MHPMCOUNTERS, = 0, --=20 2.49.0 From nobody Sat Nov 15 23:41:52 2025 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=1745581214; cv=none; d=zohomail.com; s=zohoarc; b=IjbeoR4fH1nt1829NQlUBupafXtAICyDOcwUhq1FC7EOrUw0zpkxvMydDWL7CVREmPH5zfw6sB48I8LK0aeLQTRPdq772w2naMyzz96+USVMpchl2OZFAW+OezWdwl2wM3DCq6RkuLHt7CgXkRE6K0hoB2eSHLiWsGJWkVNkhDs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745581214; 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=j1w8u6svcQru1pIlMWqNvHitq2SXpUDJnfU1RyWgJhw=; b=bJyeWH4eWa0UX0KmAZP80mhzoxNuERZMZdtalj/B9Tf+MJfWZ1+QvTKZU6NWzGWKULHjxXmzBHAtCcisSaMXOiGkB+JZ8jCpSPXbvMIs2lmRNaVij1xzQtT5WEFQ8CemwLmE4h9QU220ZvX9VKYPjjFpLNAAMmWS/dxVAtFfT2g= 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 1745581214115188.40730541181313; Fri, 25 Apr 2025 04:40:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HNS-0001Gs-6K; Fri, 25 Apr 2025 07:37:54 -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 1u8HNP-0001Fi-Uz for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:52 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8HNN-0006Za-6F for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:37:51 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-22c3407a87aso33110175ad.3 for ; Fri, 25 Apr 2025 04:37:48 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([152.234.125.33]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db50e7a40sm29881055ad.147.2025.04.25.04.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 04:37:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1745581066; x=1746185866; 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=j1w8u6svcQru1pIlMWqNvHitq2SXpUDJnfU1RyWgJhw=; b=U2HYJtHU/ka0omBsUHGNaiFYVtvYz0m5WsxG4HGi+tSX6AVUcYA+yjup5GwMW7N3RW 5mV+dxTzXijd0EwfV6GFMtqCFQ4pd3fsEW4i415XZy3pQkBw7TvgcODdGvtGJVkzD1LY ZHfCReqg/ZeRZqDN09ccmlEIEQ8Tah6umrkcGCORUYHfbUC2OaSRPPBJF7bo8n+TFILq dInq56n3PU2BVCdszyshQxCht80KPf6PQ1wE468PCJB3vDXgewCnGz9+bZm1mJkz0sew gIj2isPvLAhP+RFb4YWxBe2Slo0zt15yebs1y/lkaLRV1opNDJ8GHm7PgbbUaNJFZibK uHaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745581066; x=1746185866; 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=j1w8u6svcQru1pIlMWqNvHitq2SXpUDJnfU1RyWgJhw=; b=CawNB2S+eoFJe9wmGLydXaVAKButoywMhddyFMsj0qVsg+Hzw7rPrErXG9pX23VhkB hlgHhBnVxG8u1l7AC04VVZQIs1VroO53nfxZAvypWwZi+yPPUlaDnH6e3NLxlvWvTv2Q fGdXVZZSe83ue8yEZKCWfNyGEzs3oH2BxV4+0fE0EuPqDORlHG5rlNb5DHEaPU1LiZE6 J1zELl71CtQ1nQU6GxLRFupdpjA8heIgx2W4STyCqbjrOKP1q4OBlqVHHUH/R233r06E hywAuZORdI9qnoAemL3T1TxY3VoDASU6gwC9tMR43WRIg0zlsCSQCNOUH/IgCL0q+VQZ 17ag== X-Gm-Message-State: AOJu0Yzp9eb0XwOpqNyj/hXjmrTO5R2nYgcJAwYwsyoqhjjOMi8HQyrF Ke0HXVLrQUwsItsfJ13OCYKoHo7VUXqSWPxPDVUc/LWSL6RXKG6CjKPMy4fZ19ljl5EmAKzS96G 6 X-Gm-Gg: ASbGncsN3xaAZofHOd5ahZFVDwMsDG1JdA4X1HCH4FdPCoAv6TTER41TkOW/xSKgDpi 2jVUigrOnUg0GsB8m6NzEJYTaUi1CbmsnlgfHt5xcchUfPCP0/qVzhaVx8l/LFA7hZZMdxmhZwH bEIJlUcDRZuxkTfa1n5lsQg+3BTtYS4q8Zx7h9d7GEjTlwsZ23lrx+maMZunKNw94eqk6f9GTO8 tEpYzNfxHTL1DNZOEMANCHZcvtm1Cqofw2CwuTXjC+s2wATfwFIGU7Aj8sSyDfWJJZ21TBds3GT PIVOzLkdMw9ZwaQf6N9+H2GJBto9O0ilN6kCUu6ivnXFY8Ao9fwkk0V8q+q0b9HDZMh6 X-Google-Smtp-Source: AGHT+IFlce0m4rWNSwhxYRVKUUAk+vjcKfE4HvD8JjzcbX20Z1DOSsYj/BmE8Fo48wyLYORtxCJV2A== X-Received: by 2002:a17:903:32c8:b0:224:1c41:a4bc with SMTP id d9443c01a7336-22dbf5ee6bdmr32105685ad.12.1745581066044; Fri, 25 Apr 2025 04:37:46 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH v2 9/9] target/riscv/kvm: add scounteren CSR Date: Fri, 25 Apr 2025 08:37:05 -0300 Message-ID: <20250425113705.2741457-10-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425113705.2741457-1-dbarboza@ventanamicro.com> References: <20250425113705.2741457-1-dbarboza@ventanamicro.com> 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::632; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x632.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1745581217660019100 Content-Type: text/plain; charset="utf-8" Now that CPURISCVState::scounteren is a target_ulong, add support for the scounteren KVM CSR. Reported-by: Andrew Jones Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/kvm/kvm-cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index e37fa38c07..5db63e78e2 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -250,6 +250,7 @@ static KVMCPUConfig kvm_csr_cfgs[] =3D { KVM_CSR_CFG("sip", mip, RISCV_CSR_REG(sip)), KVM_CSR_CFG("satp", satp, RISCV_CSR_REG(satp)), KVM_CSR_CFG("senvcfg", senvcfg, RISCV_CSR_REG(senvcfg)), + KVM_CSR_CFG("scounteren", scounteren, RISCV_CSR_REG(scounteren)), }; =20 static void *kvmconfig_get_env_addr(RISCVCPU *cpu, KVMCPUConfig *csr_cfg) @@ -700,6 +701,7 @@ static void kvm_riscv_reset_regs_csr(CPURISCVState *env) env->mip =3D 0; env->satp =3D 0; env->senvcfg =3D 0; + env->scounteren =3D 0; } =20 static int kvm_riscv_get_regs_fp(CPUState *cs) --=20 2.49.0