From nobody Wed Apr 2 13:45:24 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=1743088914; cv=none; d=zohomail.com; s=zohoarc; b=FkFyDVM4EqDnGe3tge77aeGUfGQhd11OsxNpkEcG2U7KIzZbnbIRWwcYtx8BHUcrO+f06618fkBCU3lsFq9vG0ylqbfEOMd8ikxgR9JQ6G77J7dp509ivINf2ff0QA9CO/ptJrbITjJtaw/38/0bvNkp+DCjx3NPaoWBfyDypOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743088914; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=S0kCnpr/mGe18lJcmEZTqhGYZopT1rxvkn0QUVLj49Q=; b=WBl3jQcfP9Kbis2a8MI25NPayCxywH5emenpIeRfirmWL04oq1Sgljk1cBaZIIWAU+uuLzT1ekq9QUsC03lvNrjgjAw2xlKtEb2exONnx7+LDTMwc+PLiCC4VKNOeKBgrpn/3ZToIRdSFxCsJEBEQpusdZidZNwU+NY02JBGRdA= 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 1743088914309823.3040625133668; Thu, 27 Mar 2025 08:21:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txp2d-0008CS-HD; Thu, 27 Mar 2025 11:21:11 -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 1txp2Z-0008Bp-AT for qemu-devel@nongnu.org; Thu, 27 Mar 2025 11:21:08 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1txp2S-0004XA-HP for qemu-devel@nongnu.org; Thu, 27 Mar 2025 11:21:06 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-223fb0f619dso25138615ad.1 for ; Thu, 27 Mar 2025 08:21:00 -0700 (PDT) Received: from grind.dc1.ventanamicro.com (201-69-66-189.dial-up.telesp.net.br. [201.69.66.189]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2291eee210csm872995ad.70.2025.03.27.08.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Mar 2025 08:20:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1743088858; x=1743693658; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=S0kCnpr/mGe18lJcmEZTqhGYZopT1rxvkn0QUVLj49Q=; b=SSS0A0X+kPVmO3nfntthlaFkI6zN7RhNPZyWV1LuVg62iXkzjqknjj3Jyc06PUaXvO jIWlU6eyON5U6+DR5sNo85rEtfsMcNuAMcy1WxCY+bEHg2VcQhGdTzuDcmOE2mi3cffO 3END1oWgYYxugZyJehO3dHGsfWYcpZRGF2xfITJF6hCCHH8ULpXWqn/hLza2hnvWSoxi OBS82aMGZd6FT795qZBAm0c0N7LxQsfKfBrfv5XIDALlwC1rdnF8rhwQ3qmjmWg8MD++ rILOLRNrSCYrvh4CSFdAtjWfNrlfWPaOIsioSkN6+9NBGoGRFM0xHpbSfnkn1kgl6KI9 7DxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743088858; x=1743693658; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=S0kCnpr/mGe18lJcmEZTqhGYZopT1rxvkn0QUVLj49Q=; b=YyoJWHD1xQd61htrtI2tm654w1CJg3ddZ1s1lwKh1lrsb8M14JTRnQsV8tAGiksZSY 3/7RWUIuGQGOzpf2xCu5ohjbUpGMGkD1aKz3Z18G0Rydae7P1v81SncugPlIY2pXu26K vzCXVoZX/6M7sL0Sbmk1+0p0KVPWkouHrwIdKsBmHalJEI5sd+7xZoCze/5m40TUpjxa qYRVOLpF8relAvAvv+LRiCBJrkGVKz/jTzb9NvS1Dptjj6+nwA6mPeguX+6orrp09uxh Fw4uMzYuGOOsG9KNnEOdzzKyOfi2MbcQKFUj2uC6SnjfCYXDuENNH0Y4wOFcakchylx6 y2jQ== X-Gm-Message-State: AOJu0Yz3z8mj98sFLbTcf4U8MDxyCdV9cMCgHc8BTkafVlOUoJmIyD7x nUX8ZEj5XxjZEKJTL3a3B5F+kVgwxYtH24hxU54mayC+9+MZiULtTUn7sS7jx+TQSx9B+18/LyU Z X-Gm-Gg: ASbGncuWKNZcR0QQBwLF/Sf2UnoccE2F1FJb/1+qyBMEeu9DZYm5PUhDJfewNqQhjoA HkponM2/XAXaBtNdgNj5hJilRMWvEthArTzorf04AmIlfdFfOyCeuMY+KTh8tL3JQxFO1zS+rRR CxZ3VYAnghW36UPmARb3HKuYSwokGzanpiWgLLt5UqZ2p88mdeE3ekzfwWqT+UqyrYpUUXw32cx 1e6FsdQdA7VuKq4YQPnC0u/PrgXkxysjvlPwFUmzPOG9YOsNT+rU78LHv6NSX2BWPgNScFV7hpA ogemsiRQvXKJ3XhP0yp9qhnA2towrRRbGq5/BvZPAgBu6hr/IYW6kG0AqUCcnlClO5ho9umQ0/2 YXQvXREBS5OlwYyt/nrwh/YL4eiwo2mgvfA== X-Google-Smtp-Source: AGHT+IG2jzs1uEc1f70ShHngpDgNIk7fupEgz337SBCZi6Ldqf+9sCdyxuA4XhOvgZUvKzSDmkkQdg== X-Received: by 2002:a17:902:ecd0:b0:224:24d3:60f4 with SMTP id d9443c01a7336-228048521e8mr64150245ad.15.1743088858205; Thu, 27 Mar 2025 08:20:58 -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, Daniel Henrique Barboza , Andrea Bolognani Subject: [PATCH for-10.0] Revert "target/riscv/kvm: add missing KVM CSRs" Date: Thu, 27 Mar 2025 12:20:52 -0300 Message-ID: <20250327152052.707657-1-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.48.1 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::62a; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x62a.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: 1743088916779019100 Content-Type: text/plain; charset="utf-8" This commit breaks KVM boot on older kernels, like reported in [1], due to senvcfg not being available in them. There's also another problem related to scounteren. Using a recent enough guest buildroot, 'ping' will be build with rdtime support. In this case, doing a ping in a KVM guest while exposing scounteren will result in an error. The root cause relates to how KVM handles scounteren, but QEMU can work around it by initializing scounteren with the host value during init(). Fixing these issues in a non-rushed-bandaid manner results in an amount of design changes that I don't feel comfortable pushing during code freeze, so for 10.0 we'll remove the CSRs and re-introduce them in 10.1 with the adequate support. This reverts commit 4db19d5b21e058e6eb3474b6be470d1184afaa9e. [1] https://lore.kernel.org/qemu-riscv/CABJz62OfUDHYkQ0T3rGHStQprf1c7_E0qBL= bLKhfv=3D+jb0SYAw@mail.gmail.com/ Reported-by: Andrea Bolognani Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- target/riscv/kvm/kvm-cpu.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 4ffeeaa1c9..0f4997a918 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -624,8 +624,6 @@ static void kvm_riscv_reset_regs_csr(CPURISCVState *env) env->stval =3D 0; env->mip =3D 0; env->satp =3D 0; - env->scounteren =3D 0; - env->senvcfg =3D 0; } =20 static int kvm_riscv_get_regs_csr(CPUState *cs) @@ -641,8 +639,6 @@ 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); - KVM_RISCV_GET_CSR(cs, env, senvcfg, env->senvcfg); =20 return 0; } @@ -660,8 +656,6 @@ 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); - KVM_RISCV_SET_CSR(cs, env, senvcfg, env->senvcfg); =20 return 0; } --=20 2.48.1