From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681236; cv=none; d=zohomail.com; s=zohoarc; b=ZcluQrNrFDJRmV8CWRWSp3dj3/a6vNlUOlhjIpBVzIJihPrqNbGQXG7fa81+OADFQkEVYURx7VGnYGK6AzrT8O1FZZL6PiDPnQY59UU363Ol84dxSDjKqPteUfsofHAMStRlirCXU0bukhTfQ5GMmA24oAXYPBN57rmNoHFeMfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681236; h=Content-Type: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=tBZvBlUJJ4ZZzRhwp1RRYC3txHSba+iTcUIOSqbdq4E=; b=GlHN+4PAD1lY4Rk/ocd+fqR60RAIYVlpDrKz9/n/cp6b0Qu51cKBdKU44wduWkJ5ZxOeajFw00k1xWHqrPJJZS7ERG/LAaNQSxdZr+J1BJP8AdZ+rhoaVoLO/awfLYPUcX63vlDCONlgFVyuWCDtSkpgONWV3FkvY+VI21QZVsg= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681236897732.924481088293; Mon, 23 Jun 2025 05:20:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg8i-0001BQ-8A; Mon, 23 Jun 2025 08:19:08 -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 1uTg8d-0001AR-0I for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:04 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg8X-0000Q1-0L for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:02 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-450ce671a08so26533145e9.3 for ; Mon, 23 Jun 2025 05:18:55 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45377aebaddsm15398735e9.1.2025.06.23.05.18.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:18:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681133; x=1751285933; 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=tBZvBlUJJ4ZZzRhwp1RRYC3txHSba+iTcUIOSqbdq4E=; b=c/w4tztCELL4Lzva7Ti4ye02bUzEJ97YCVdXFQ7AeWaiSV+LLq3Gtgmc3DyBXEaRmy NwoPt5TkNaCmON5HVP82Ys//LY38/o4ainKZmN/DlfKil7AUdDGWhaiXAVk4RAyFwwHn 33VhbUvNAclne5IJroyVsW2IGVK7FQMUX+Bu/gyf95Z3c0lMR3w8NBDkYXOxhRFjcVT2 XjQUupwp80cCzpuLIfXmZmfYtymU9jQaK4GrNieOiuUFc4uzDOLZja7nXH0i3hrrG+lJ wnKOusZ+T+6fTyGH+jLZVrV+8hycKu8K3Zf5fzMcUgFTycSy1ak5MuTzbPsVu/0r6x+Z lCDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681133; x=1751285933; 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=tBZvBlUJJ4ZZzRhwp1RRYC3txHSba+iTcUIOSqbdq4E=; b=Et/EHcYGDRK9FhdhHo1SLmg6AW5Agf4zpGB+ibsZwZ8LJvNDjtL+ZGr4ZI5EOJRMTf qxO+PUmcjEvr8VE4QCua5cZV6o2wAlgUfjpgKoYiHMJbJf4OsBmEd4ek1k01xF1gPN3z HDVtluPBwjYtcLM475oFIvwVS1kAPsHOIQYwPrLnqPrYqrYhyCgv7qbWya6KExvYgH4i EFwjSJgB6PjGUI5ifGvOZmi8cRmbJPp32/YpTWsrsl6AtHGmcerI7M61NgRyZd6p5vJn tle+maw97u/lIXzwTIoE803Iv10L5VdXpSgWkrmniFOriN6HwS2uPw5iG2PuIPaAOGij m3tw== X-Gm-Message-State: AOJu0Yx7Lho+AzHDN8UgH2+JcTJ1aC9JfoCsMiASxDGQHMOatx3Blkzn fexLHo6OIYlqx24paGe4wEXgW4DQmzo2HgHL9/nyxTJfsAzhBBImOsW3TIzPh8MzsXUknwxAKGx Uqv++ X-Gm-Gg: ASbGncuQ1nxWBOmjMmHQ6IefYw3fMw8ty3tu4AZYp+hfEHzimGZlXIj2/RxpPG7bT47 RS8z1kW3+igfZX5hRwETx+6hkHNV8mfkQy8N1kFCQGyVA1URlq2eJA7X2iZD6EbyFH0l8vtzLHo 8/RSXY0qKObY7MBWLjz539yvsPyd6M7n4Q8Q4vtcwW6T/pqtbtWR7BcZ0hr1O7FYn9uz+siXiLu BiZCDvLf9extnOnFhM8y8vyUp3TY+7LettuFf/kADuzeO9pwouVSj901e3yjonht1fLsRzosJYt 3TnxzJoS+xbwZd6b7an9nBwZ88nZ521qusZFnElibeGKMDt1YmAFS09ChCUqu7vwO3v46MSRoNR +Y8dubTyi+loJsQILMFYgu4Cz4P5q8HgKhzHU X-Google-Smtp-Source: AGHT+IFC7OEULrZU5qbGkE5mHTI4DDkyLTxB305hu8Ey7qsg+WC3Ig6FIv2n+cvmO2DD/y8MEEbwgA== X-Received: by 2002:a05:600c:458b:b0:43d:db5:7af8 with SMTP id 5b1f17b1804b1-453655c6142mr118583055e9.21.1750681133114; Mon, 23 Jun 2025 05:18:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 01/26] target/arm: Remove arm_handle_psci_call() stub Date: Mon, 23 Jun 2025 14:18:20 +0200 Message-ID: <20250623121845.7214-2-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1750681238006116600 Since commit 0c1aaa66c24 ("target/arm: wrap psci call with tcg_enabled") the arm_handle_psci_call() call is elided when TCG is disabled. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/internals.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 3360de9150f..5ed25d33208 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -650,16 +650,12 @@ static inline bool arm_is_psci_call(ARMCPU *cpu, int = excp_type) { return false; } -static inline void arm_handle_psci_call(ARMCPU *cpu) -{ - g_assert_not_reached(); -} #else /* Return true if the r0/x0 value indicates that this SMC/HVC is a PSCI ca= ll. */ bool arm_is_psci_call(ARMCPU *cpu, int excp_type); +#endif /* Actually handle a PSCI call */ void arm_handle_psci_call(ARMCPU *cpu); -#endif =20 /** * arm_clear_exclusive: clear the exclusive monitor --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681255; cv=none; d=zohomail.com; s=zohoarc; b=QwsPykBFSLsoSky6n/gTMAhFuVdD1Gg6qwuRyeE+PCRGwdT4vabuSb4ewYf+/qy66q7/FnhdmVgU2qdypY3/IChdkq3QQj21dM9ML0faOMd5sKRujn2PajuXYe6vNKAcxgt8rhmvxpZawrsAuj1r8Pv28oHXWVUF4vqyksbgMG0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681255; h=Content-Type: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=33tTruwtHJUDsLE1NQEO6k6TPJwHdavbHWnexaTt8VY=; b=AKhyiDwWOdm9vNk7nsS1qJ7Kfp0ygWQ1PVNFHbjcpQxnFaI9/IBcwh7vFgU8Fzgbuav+J3GWJe2CETFSp0OX2E9Dfb8Rz9bNNijYKDuCAXdlChH7/LmZNxSbC8+/VAKcPeRmvCZzob5qK/6hPFgYhQgHfBO1+VMYW4ISDINndgI= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681255099591.3292932496753; Mon, 23 Jun 2025 05:20:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg8k-0001CH-6W; Mon, 23 Jun 2025 08:19:10 -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 1uTg8e-0001B0-Lq for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:04 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg8c-0000Qp-Qi for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:04 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3a531fcaa05so1700116f8f.3 for ; Mon, 23 Jun 2025 05:19:00 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d118a1f2sm9166243f8f.83.2025.06.23.05.18.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:18:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681138; x=1751285938; 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=33tTruwtHJUDsLE1NQEO6k6TPJwHdavbHWnexaTt8VY=; b=Ev26ZtJKAnfkdhhRupkf9cmjH5yX27jKjx5+6zAcw06BZG8aqAPUcuapGZTCydGd7/ J+BkDBFDqq/3fzA9ZZsZfAnCtpil/CGgZgHNCSmEUL0czXq+XBW4tKf4YCGwvWlX7pLe tHDnP/BQ6iqyqx9RzuAO/xTd9a3m4CKNw5oWsFc3Zq6bQifnmMnXGZSwjEfsLZVk1gOW ZB/kGx5u5x/Rih0p+mkGm0ycZ5xSWAMqPRUlcGgcNk9xuS0QGfseQSAHlNycaS8ex8f9 3QJcdVWq/2b8zxQjBTNAcVZ2HrpnmtCZg1vMUaPObepmKtTsUAMJwHDMuWg5AiNprfH0 HTLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681138; x=1751285938; 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=33tTruwtHJUDsLE1NQEO6k6TPJwHdavbHWnexaTt8VY=; b=eOPjyQPGjkEf++MeY+abJqcCAIhDWHK2ol4VMlKJei9AKI7PEP4D+cqr9aNRXUBlrO pgQAt2CYZQS/6bQtjYbexuNGZmx2q0v2scEloY88MCt0/cuI2k/QmWV2vS1dGaPsEalY zLuFe3yWvZ3VBGq8pxiV0a9dnDkSGR2eLMNW4IoXvm/ectkRWyyrZ0giR9c+AFc9cUvQ NEDH/rgSt/dDuaLWkszbb9mv9RA0BGvrqZ8qVY41T7TmDBEC3qcvYRINLnu7XQSN7qbm KXsEBV2iUSMMOsCV8YGs0xWA+ERvxkxybiDp9mmrxHnj6PS/LzSQBHaNy62a2j9TbdMX m2jw== X-Gm-Message-State: AOJu0YzoW9RgT7IyRSsrSyQGC0muJUqwjFXy516aCQJQAElsu5QqfMOJ Umjbu6DtjiESKLzj1i2nKRud+6Dx8DZbHI/H8uR6vgMDzLzTSOQsVtwy+xMQ1jTyYGXJ90C0ppM rgHGC X-Gm-Gg: ASbGncsFagQ7Ovfk5x+TDpSD+5Fc+jZW7o87jfBXxeyEZjoRPgHYAo5NtsML2E0LwLH LM5s/ULFR2IrWdnmvDrkhaqcYEho5+IGkvpvNge46zRgKUqdJwKi+Mb+umQQpVExxPEGA9VCoyR rh/7q4S8KQ1i/HU8Dt8+DCFhHHmu+PLjLt2/ZdSWklvEnWPnUH/PpCjm07TQJEhqGu2tOmUZZkc q2NpUD/fhwhql9AenWNJnoILqpUIIo14mIkX3vqQXBf+ydOuiYJ7OclJSb2WLKDEi3e0j53944r zDUbGjxiVmaOGYyZQQ3qbg6FU9NLBW0QLxivzD7gKdXC0y7L+OpnCHb1mHeNttQijZrfaZ9TtBX fNkJoJCav4pmg8y/zwXUJm2JH0Jo5oOb8UBoit58nfdEIaeQ= X-Google-Smtp-Source: AGHT+IEjVwbsAMNAS5by9E9W3i2mS1agngW0TG97TbFd4Y+XoqUdKx/v5toxL2DXWSaOw2EUWfZl2A== X-Received: by 2002:a05:6000:471e:b0:3a4:dfc2:bb60 with SMTP id ffacd0b85a97d-3a6d12a9a5amr7627210f8f.26.1750681138080; Mon, 23 Jun 2025 05:18:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 02/26] target/arm: Reduce arm_cpu_post_init() declaration scope Date: Mon, 23 Jun 2025 14:18:21 +0200 Message-ID: <20250623121845.7214-3-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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 @linaro.org) X-ZM-MESSAGEID: 1750681256432116600 arm_cpu_post_init() is only used within the same file unit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/cpu.h | 2 -- target/arm/cpu.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 302c24e2324..c31f69912b8 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1150,8 +1150,6 @@ void arm_gt_sel2vtimer_cb(void *opaque); unsigned int gt_cntfrq_period_ns(ARMCPU *cpu); void gt_rme_post_el_change(ARMCPU *cpu, void *opaque); =20 -void arm_cpu_post_init(Object *obj); - #define ARM_AFF0_SHIFT 0 #define ARM_AFF0_MASK (0xFFULL << ARM_AFF0_SHIFT) #define ARM_AFF1_SHIFT 8 diff --git a/target/arm/cpu.c b/target/arm/cpu.c index e025e241eda..eb0639de719 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1713,7 +1713,7 @@ static void arm_cpu_propagate_feature_implications(AR= MCPU *cpu) } } =20 -void arm_cpu_post_init(Object *obj) +static void arm_cpu_post_init(Object *obj) { ARMCPU *cpu =3D ARM_CPU(obj); =20 --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681216; cv=none; d=zohomail.com; s=zohoarc; b=dBFmNqS4xrdWnBeW4GPshOvq6ReGXPJunXHVQvQ3dUzHiP8efeBBd0zUJPAIUBI7vgf232nttD2fIsXXkmTQ7c8+CKEG6+fLLhd3oDOH8mPt4PY8wBpEk/iKt29n3/+qoY1ijuYp6NXMzYfrOvLxjGIJ0BSb2KbcfqKg5Xbqobg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681216; h=Content-Type: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=g4jpPoIjWAnN20gltB2a/vOsrmaIk3+mmplMj5/YsrY=; b=JFizDuR01KEinUbcltMENh/VEcyUlAl1WHaaz9Vo931/PoIrp87AOuYMLe4zWWGnoJiz2REFEFiKQvJNkQ3OZSv0UJmCQRP0+lM6miqbbbK6X/+gDdC6xjsTHCJddK7+ZoEwxaM2Daf6PfP8KWrAvIuUmfkKcrNVZkP8FyZqGAc= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681216304791.5101090060391; Mon, 23 Jun 2025 05:20:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg8v-0001KL-NJ; Mon, 23 Jun 2025 08:19:21 -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 1uTg8o-0001JO-Bf for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:14 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg8h-0000Rd-Em for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:14 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-450dd065828so29515055e9.2 for ; Mon, 23 Jun 2025 05:19:04 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d0f189cdsm9443362f8f.35.2025.06.23.05.19.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:19:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681143; x=1751285943; 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=g4jpPoIjWAnN20gltB2a/vOsrmaIk3+mmplMj5/YsrY=; b=yy93QNq4f+Oejjx68IoiEyOi3BqS4na1cZuzt3g1EOhgE82x/1QYEy4B15U1Y5EHzA dn5Ni2fVzhAtjTDVfXxD9xjQumlzZfCqF3Ev1xQ3XVMNR6Pwh2ePEAIxIn7/EO4bzREU dnnmfekN9qXnbKUdOJlNKRjD+hGjzMFbQSAtb4vd1EVW40kHNCPShG7sv1cBU4dxHHG6 bQuVd58pKAiBeFVVCxmrGajXngjgmE8xo691dz9PkP1oDlaXFUOeqXlg4x9Ulo+h+zLy y50L0ZnlF7F8PVXkMPu5s8HPpLo4F9174F9el4eRvfBe0o1ZDv43DFMd/tyczDzHgBf3 SgMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681143; x=1751285943; 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=g4jpPoIjWAnN20gltB2a/vOsrmaIk3+mmplMj5/YsrY=; b=xLAMgS2lgqGmoqSu7q8WGHY7E4l0zkyRSwcifwjw2jHl7KNoD+c8Zxve9xEUxZUodP BbgEiuI1gSTxrArMO0jdvwcFWnrRIf6/+PN1lYMqwm30g3BzLLzFKcYk0yJJZECxqQgh INXPHPE4viDpQnbxYZWvYWAMEbPl3tWC+Wrbr1AWHYNmhM2fgpT+lCM7VsNK0SWiH+Gi hYCx9oHD8rN9d2o/oEwi7ipqI7rpBxrhA6Q1HAfocpLWcQK0MaKnOY2Fk0dX2L8GFe0C yvgJOdZOcbGGAxrmWebFNHECELdYyauS6Gcmh5eZMhjsejpom2cqrW4iZ6J0DGxuyvfE v7rQ== X-Gm-Message-State: AOJu0YzaymN4PJ5ECGVFqfZFhg70d46+nIwg/Vtj9g6g52fgp51i+eQe xbnQDaHdB/lJL8juZjrby8sFHwhjdel3D6RZnLETsjESr9CUwA3moSBplAozcnZnS8iCa74BWpZ wIuOH X-Gm-Gg: ASbGncuFB4HVJ94QEZ4wLfYwwOoDg1F373BUlF7ADt1silyIPIuyO60yIlH1J+3HaVV qCrQrn0nWHmEQ2zh88sw6Bjw//WO2Olv2qy1luKUyEml1FMAcRuWhFWCGInn8hJ2PfixwzNCa2o 48t8ZbKNNt4D4UOF6x1d0kbQEUUcmPJLxzOQrFIK9ON1jAIBP0HGzYduhqEMWEZRqoSIzkm4yJR fdIPZSJoweAoBUQLHGay9ItQd33j8YDBTPvcMYz8p32v0v5mM8cj7SQ6Mlfvigee+Gmmb3rhk76 XjlMjkSss4BHm1qWzQ1Sunna1wxAL/OMwY+M6vY2RTZzFIQAlDVV9stud1nDg6HgfPKlM3frVyZ SMh7XYuntRC1W2oi0A+6k+8EJwc7Gdxo1kHYZTnmXHcY/z/8= X-Google-Smtp-Source: AGHT+IErlri5hkyOBSvRe8fCS9DDCc0yz8mXpTeS1g951cmKKKfzy6/tEWFiO/Q3SrTle+JMSQITVA== X-Received: by 2002:a05:600c:3ac7:b0:450:d019:263 with SMTP id 5b1f17b1804b1-453659aef70mr119085105e9.18.1750681143141; Mon, 23 Jun 2025 05:19:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 03/26] target/arm: Unify gen_exception_internal() Date: Mon, 23 Jun 2025 14:18:22 +0200 Message-ID: <20250623121845.7214-4-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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 @linaro.org) X-ZM-MESSAGEID: 1750681217874116600 Same code, use the generic variant. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/tcg/translate.h | 1 + target/arm/tcg/translate-a64.c | 6 ------ target/arm/tcg/translate.c | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index 1bfdb0fb9bb..0004a97219b 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -347,6 +347,7 @@ void arm_jump_cc(DisasCompare *cmp, TCGLabel *label); void arm_gen_test_cc(int cc, TCGLabel *label); MemOp pow2_align(unsigned i); void unallocated_encoding(DisasContext *s); +void gen_exception_internal(int excp); void gen_exception_insn_el(DisasContext *s, target_long pc_diff, int excp, uint32_t syn, uint32_t target_el); void gen_exception_insn(DisasContext *s, target_long pc_diff, diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index ac80f572a2d..7c79b8c4401 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -433,12 +433,6 @@ static void gen_rebuild_hflags(DisasContext *s) gen_helper_rebuild_hflags_a64(tcg_env, tcg_constant_i32(s->current_el)= ); } =20 -static void gen_exception_internal(int excp) -{ - assert(excp_is_internal(excp)); - gen_helper_exception_internal(tcg_env, tcg_constant_i32(excp)); -} - static void gen_exception_internal_insn(DisasContext *s, int excp) { gen_a64_update_pc(s, 0); diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index 9962f43b1d0..f7d6d8ce196 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -372,7 +372,7 @@ static void gen_rebuild_hflags(DisasContext *s, bool ne= w_el) } } =20 -static void gen_exception_internal(int excp) +void gen_exception_internal(int excp) { assert(excp_is_internal(excp)); gen_helper_exception_internal(tcg_env, tcg_constant_i32(excp)); --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681427; cv=none; d=zohomail.com; s=zohoarc; b=nrfR/TQf93MkOk24BkGTZPzVEhx+Fz/TDDYXLkHPJKT1wkcSnI3OdM8e2FyS8OUgR0OWuK0oywr37I3FyoMiEg72+ecYnN2FYG40kNDXKeOLBniYub/iHlw97vGoQKCPDUuISQUfGIMmSmpiBQO3NhesSa8IyQDaGxnokfbN0N4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681427; h=Content-Type: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=LDQM9sk8xLoIDxyTCgc//1G3alM8o04T+fdq/t3mMdE=; b=UHbIXqZnZkF6lFzgVboIqZe3r4ZSCnsV0UPvcI4uoI4ljjbef36JnveCnxRJYU7d3bjeKtDSYvrp+JTUPIjcVQWsdczl1UKH8rnkFwT+mXyuNOS5gPQWByv8uNAiHJGtL1eAdt/d3qEuKnCttySl+LFQO2HJIjCZmsXKLhbHkt0= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681427487688.4302242687612; Mon, 23 Jun 2025 05:23:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg8q-0001Jp-6M; Mon, 23 Jun 2025 08:19:16 -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 1uTg8n-0001Iv-9T for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:13 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg8l-0000ST-5P for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:12 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-451dbe494d6so47691665e9.1 for ; Mon, 23 Jun 2025 05:19:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-453646fd7aasm108543505e9.20.2025.06.23.05.19.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:19:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681148; x=1751285948; 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=LDQM9sk8xLoIDxyTCgc//1G3alM8o04T+fdq/t3mMdE=; b=R+2WfNtRk1CAxJ7DwUKLdNlJVU9K9STWmmg+bZ10jVMxfsXz3Ezk86d8MwVRSke/ix cdG5Eg4AcFP8IOeau3IGuuiVxy/QiF1C0byp4aFchexTt7sve8rengM9mGwkUgYZCGJc VhxCmWuZfwdXzorkOB0jNBHulEqMs5m7Dk4AqBAw0RTaOvdVryl2CUyDFwZqS65ssZ+s HrY9vjnt0IcwlKyVFV04V2NNnGjVADlGxuW/JBRydBNH5/ubwzpqIxlZ0cUMIpx9+XU1 NhDbTde+232NYMe3yzl/H0d7KbAM+Aodb+byYsfYb+O5xP9DyBwwicvIBR9YrFa5f0RC Oh9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681148; x=1751285948; 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=LDQM9sk8xLoIDxyTCgc//1G3alM8o04T+fdq/t3mMdE=; b=hvXw1GYd6azonYlxmq38rVYh2s3wvm0Bwvaq6HEs4xg3iHa139xGRS1hEPRZ//kOfi 3NJaLLHHAni/PQI+o5f1E1y7dTDrv/NkaIUsNUj/temSHIARm1LJbYNyHNKPvhyt/dEs CXblb/zJpQP16N1J+Y4M/rGl/w5wDa7jA4SEmlqvwPU5X5tuyk6L+nYMgg76eZv7CSGk 7TGuMrPvkm3ZS6AAEqlS7Z5jc0JwEZa7u/DxTI7nAxB+x9nK0fNMmUYTwI5EUXudyRUg /ufz0kbLyvvCBh7u0UGbcARMCkGzwkxo6EnGdMynv8E1TtcWXC0B/gBZ1IUNV8F+z8br s52g== X-Gm-Message-State: AOJu0YwebJCVxr0p3C7dhJ42jnpL/sBdz6I9vxtum+UBTY2T9rcWoQx0 nd1bWxPhnIY+1xCSnWLmITo5XKQrq96nNdu2RToV7fArre3uyh2J74R3DAt901q2nh4Phs+cAJW iKG4c X-Gm-Gg: ASbGncsbLQgzDB3YlN8ZT5TXLvmgQ5J3niR0JYmkbideYpzcmFuthr6L/P3CBhiLSSF 09eJB72ATpz0CgwIVi6bMDBqNWFC6gwN37nQz3G4gWmlQZuP1FwcZsWt4znZqASrEyuafshgleU 3B8Y8/vBg11yQODFwUa03hIPpR499Jl3cP/vWr+tBlACwifDekTBwC1Cg0KmFTIZO5lvYXPH2lt PBosoM0nEh4tXwckXuIzj4bkMsexPY9Z7+Z8JGIpcUKRK1lfWHriOUB0L23vwUDT7okpOsH6wUF 1mIWW204XZA5iSeB1PI8cTLh5RJTWW2EyfqB1SNDAnqjK22sPPzcWcINkJUMfYiaIgMtxMuIuui 4w2cc2bKjN8biv080R1XzOzKEc9F1QRQRSjY0 X-Google-Smtp-Source: AGHT+IEEGQ2yizNQOBV9T6BfrGjeWcpsEH+4yJg0Dp41EHihRocLWjYUthkP7XbX59/zuaabZ4ahQw== X-Received: by 2002:a05:600c:c172:b0:442:f4d4:522 with SMTP id 5b1f17b1804b1-453660d7e3fmr109375695e9.5.1750681148220; Mon, 23 Jun 2025 05:19:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 04/26] target/arm/hvf: Simplify GIC hvf_arch_init_vcpu() Date: Mon, 23 Jun 2025 14:18:23 +0200 Message-ID: <20250623121845.7214-5-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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 @linaro.org) X-ZM-MESSAGEID: 1750681428284116600 Only update the ID_AA64PFR0_EL1 register when a GIC is provided. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/hvf/hvf.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 42258cc2d88..c1ed8b510db 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1057,11 +1057,15 @@ int hvf_arch_init_vcpu(CPUState *cpu) arm_cpu->mp_affinity); assert_hvf_ok(ret); =20 - ret =3D hv_vcpu_get_sys_reg(cpu->accel->fd, HV_SYS_REG_ID_AA64PFR0_EL1= , &pfr); - assert_hvf_ok(ret); - pfr |=3D env->gicv3state ? (1 << 24) : 0; - ret =3D hv_vcpu_set_sys_reg(cpu->accel->fd, HV_SYS_REG_ID_AA64PFR0_EL1= , pfr); - assert_hvf_ok(ret); + if (env->gicv3state) { + ret =3D hv_vcpu_get_sys_reg(cpu->accel->fd, + HV_SYS_REG_ID_AA64PFR0_EL1, &pfr); + assert_hvf_ok(ret); + pfr =3D FIELD_DP64(pfr, ID_AA64PFR0, GIC, 1); + ret =3D hv_vcpu_set_sys_reg(cpu->accel->fd, + HV_SYS_REG_ID_AA64PFR0_EL1, pfr); + assert_hvf_ok(ret); + } =20 /* We're limited to underlying hardware caps, override internal versio= ns */ ret =3D hv_vcpu_get_sys_reg(cpu->accel->fd, HV_SYS_REG_ID_AA64MMFR0_EL= 1, --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681593; cv=none; d=zohomail.com; s=zohoarc; b=FfqaNpOYju96TPqgUQMHCMoib7HEPgR2nxBqODaGqI1lIkO2PKp+N6cAHqCARN9YBEQLjmMviMqO6ecqKpxeVyPqAfrFUCGb4rag1wdB65+YFAZa7ojiz5LUk9PY58JGWTxHIEJoslV2Zc/E3dy9xn1wSMbxjtZWzK3MDgO2VqA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681593; h=Content-Type: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=iPGemtR2ZdzEfUCvxZ4Y78uZrjiue5vwaeOrBHsS2Jw=; b=PYNdvWrnget/s1ckDqh0HZS3OXzos7FA44tc9mnLujO1KHfmMxvXm0Hr6LwSLhgj1c2CS4h9dsadnwHG45EJsL41ZcHaMZM54Sb7lY6ZoXesHk8ssTDZhw4d+YkEBSiHGpbqzTF1UIV7xoVM4TuZFb2w8zh1hnNoBbxTMah7oEA= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681593352875.2490607874652; Mon, 23 Jun 2025 05:26:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg94-0001OC-8h; Mon, 23 Jun 2025 08:19:30 -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 1uTg8v-0001Kk-E7 for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:21 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg8s-0000Tk-At for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:20 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-45348bff79fso45773995e9.2 for ; Mon, 23 Jun 2025 05:19:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d0f1d87fsm9323283f8f.45.2025.06.23.05.19.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:19:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681153; x=1751285953; 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=iPGemtR2ZdzEfUCvxZ4Y78uZrjiue5vwaeOrBHsS2Jw=; b=O8XxNpvtb0g2J494y1JuG1+NTzOAOdi7dHX2nzQ1VpMZlpvODCWDyDSwCJWiQYgX9J HCwjhIP0xU2dECKIYV8nO1i9virxgRE0b0x1U/SFzQCnLN/2otDCY5iA7y3ue2M7RCBL K+WvOtjThmgfYsywS/4xFzAb3H6r59T4UEPRVLyzhpPS/awRQ1RE8OMnax0LGa6wi3CZ aDilqNzQpX3WI1xeAbUXrJqpoFxXgE6oeNAx1GUyhxezsf8LMcaqaF/vt+YIB5Fa5U0x zKw03Pvh928LfBrZbH3QV+3ktqdFg3mW3I802OpYGW9BcXMAaEDzVjIwYUoA4wYeuddj T93Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681153; x=1751285953; 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=iPGemtR2ZdzEfUCvxZ4Y78uZrjiue5vwaeOrBHsS2Jw=; b=H/z98dWoVDH9RzWGBN2DrePR8YRyrbKtMFymVK9QxhDSjRQSWGibJ9STSt5AEHWfg3 lGkF7fqRsjwLc6bybpO08V04hdj6mSlT3RrCE1B8xJXJsW9ZbFDa+QgsWNmRfOXzMiu8 xZo6bDmYhcaMt824Wy4BaZoA7vtSk/Mv4x/zXtn6noV0StE+MtP499ec/FbVMU2+R/rh 0VJC87hmRwGZyfGQkd+8CkliAyiZzIWLlZFmHNEwecP6LTY4ZcteiUfwNf5bTJhUMGPi hrwQhwVw2BbBagvqsoUjY89swymAHh/3XsmEga/585Xfa/rKpk0byNNF+vYz8pjGLVdQ V41Q== X-Gm-Message-State: AOJu0YzJUy45ZiXgykRO4vHYwTNlaIxEWqX43pXpR//zdrykHlPuPZnE xgG3ALbmaXqicgYKQm/K7Bz7CEQJvdiWSk4SFPgXyHltHxGkUni3ukR47ybOkR3v3Y7wiMfpsCq ltmE/ X-Gm-Gg: ASbGncsylUKKw3+cBAIfrteAoKWTAzA3zZ8Cq3sAf7rJp23/qe/VEwp8bMUJI0Gkm5u 44tDp/eFdF8GUdXogpIft8fy4rquVafs1L+/gzHEFC6Uw7aHHqrgP0GABgmwnk2/viOA/XEGyIf KVf9LINkneA7AxMgQFIu93x8ru9czCet39E98cu1LOGUF4PPR7pj2T3sqkY5RCXrwjcCtpFeFMP igFEjNSgMKdh4ISHLEzzaeYot30GAeh6BGiM7ZVDxttqytDsZC3rLWRYPWxCUwfsMFSYKN3eWyM MIMH81mrEJ1viX4lh41LLXIjFbZ+KGYEBbZyZERfkwUjbgRAN+QMWLbi5CANWhXq5QJgxm7ogVL heacDCSpjgwAIM/Ov6gJwwAt4Re7wiuyumpnS X-Google-Smtp-Source: AGHT+IFc5MQF2NU8xSghyO4Yhud3yuPLg4Ae8wD9rvl4pDNx1QI2WiEDWAGMHEB+0CpNqwj6XAaSXQ== X-Received: by 2002:a05:600c:34c4:b0:450:30e4:bdf6 with SMTP id 5b1f17b1804b1-453659dccb8mr105349215e9.19.1750681153473; Mon, 23 Jun 2025 05:19:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 05/26] target/arm/hvf: Directly re-lock BQL after hv_vcpu_run() Date: Mon, 23 Jun 2025 14:18:24 +0200 Message-ID: <20250623121845.7214-6-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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 @linaro.org) X-ZM-MESSAGEID: 1750681594373116600 Keep bql_unlock() / bql_lock() close. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- target/arm/hvf/hvf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index c1ed8b510db..ef76dcd28de 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1914,7 +1914,9 @@ int hvf_vcpu_exec(CPUState *cpu) flush_cpu_state(cpu); =20 bql_unlock(); - assert_hvf_ok(hv_vcpu_run(cpu->accel->fd)); + r =3D hv_vcpu_run(cpu->accel->fd); + bql_lock(); + assert_hvf_ok(r); =20 /* handle VMEXIT */ uint64_t exit_reason =3D hvf_exit->reason; @@ -1922,7 +1924,6 @@ int hvf_vcpu_exec(CPUState *cpu) uint32_t ec =3D syn_get_ec(syndrome); =20 ret =3D 0; - bql_lock(); switch (exit_reason) { case HV_EXIT_REASON_EXCEPTION: /* This is the main one, handle below. */ --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681581; cv=none; d=zohomail.com; s=zohoarc; b=Xpxn6g8eC5DychvvKNl2BEBgNdbB0FQtMHtfBp7bX4VUnSGjkju+5pDdU4MctZwcPDWEIiXhN9LUP/y4vE/4zQg4rKfD5/+JJyW3AszPeM0rRYjT++oDnzRs2MBEgjzPqabVj5A4pldLOKwUxsgBVA2yaQGgx5ArEIZYPzIQEEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681581; h=Content-Type: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=FtS7m+vqlh7Qr+Y7luF/PvAhAhpP9RBj3It7GX3FL/4=; b=LE7dTHDWP9ExCPBCBGqRNSIPremqmXF4l8jHtJNHBpM9p8csy2bmKKimpVAr6Bf8qy0wmRoMjlTauFQ9d5JoFckdV09Zt5oO6OMlectC4y+Fc2Jd3ClOk7o/s/yx85Qy+QOM+U2R1ZdoXXAn9i4G5jwzwliENM4IwXQ2+IgoW/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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681581078550.1930824038767; Mon, 23 Jun 2025 05:26:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg98-0001Qm-E5; Mon, 23 Jun 2025 08:19:35 -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 1uTg90-0001M9-2i for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:28 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg8w-0000Ub-Kr for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:25 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-451ebd3d149so21441515e9.2 for ; Mon, 23 Jun 2025 05:19:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4536fefd2b4sm51673585e9.36.2025.06.23.05.19.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681159; x=1751285959; 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=FtS7m+vqlh7Qr+Y7luF/PvAhAhpP9RBj3It7GX3FL/4=; b=CaAcsmHArnAVywA+7kTSniaUsUF/qc7GdNCRYPPfVvF0n3u0dNdKYrzRHFrrJuXz5V Zf9wGCUqZywwdQUT3eVGkcFbpT6tgGk435cxzeQ19/ABVFtaAcElVkcX9F1o1cRkfnTq EnFjaPdSq3kcFRtB4vzJaUglAPrdpfyX0ag1qoJfVLAwgyxAQotIPwqLYBUIOVqb1KUH Tcu9sVz1Z2PrpQy4XplldQ+fGBHc74R9m0s+wEaEDswP0BzpwrPJarV0cbbYKGBJkFxf j0+2OTJMRdSEKq3F/2ttCzhbrQrjjTk9UGIzpYb8vsmk4F3H0byIepYyojbNHFCg5NPz 6u1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681159; x=1751285959; 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=FtS7m+vqlh7Qr+Y7luF/PvAhAhpP9RBj3It7GX3FL/4=; b=g6ZM+e3WDkVYZqwp7J/Rg8Clv6RXP6SsUmb5Re9RNPl6bC8kRGadnWhycfpFf+6UyM 5KBMWCS0T+ckloa70RN+9DkP4HeKEkxjmZ/zRcYzoA4QQAuACS1XtBtkr4RbWN/PJ2rL xgSkaq5x4AOk81Rz+gykxKFcsNv9K5rw/ZuqLmOVZDRJHlcxJQRJ3GfAMcIu4KKlwuPl GsP9UJ4CfgfMh5055D5qpTfmGMVaa4Bk/eDT3751O7vYHEoQIsbZOEBKFR/yG4UnM5wW TUgZIR0srZMSs4I4QJ3shEf5q9ATFlk6NY6ZRk4voHu0crWKrQmiFmthFX7pg45v+rGR KIZw== X-Gm-Message-State: AOJu0YyFii7nGdjW4+PhDGpgEtorzolqCIwxrxedBxQoPMGSM7bPdJiC SwoaWkmJkNHWfuwoGOS3P6tc0RBEVirWfIyrOKE+8PKIVbj17ihb3ZyjKX6xWrqtgIq5azOe051 pYplP X-Gm-Gg: ASbGnct5Wa4tIbX/Pwj8AZ/5KVYlXcDUBERjZK23WklAbGcU8VCLnfUxVTUobonH6zq p3Dug2/vDyO0wgyO6aQ3KNdq9oo4EGeRbewk6rYm2HLny8dPXYF3xtxnzLNgjOaWOOMSqVwIAxL 8XiVcZwtlItsuN/BNViFveDlyPNXQqViBVPh5OUDleuZ++PbZFi/Y6iNbW0w1hHnVOXT3Ruq5c5 ZSudCw1l96PT3xCowmJKKDKRReU1Q3DQ3cqrW/yiJnhC6kGar+8iMGLjbHPN9i3qGeu28LDpBYK izH3Ohfg4NzGEJ5yUy4g8JyauIslSMfYTrsl9Nf/eVzHKeI26cbOzxV33ymd1+VrZKbUILrlZhF cPnEls+L7CoBZ9F8CUQY65eDZN0XjDrR2tpFM X-Google-Smtp-Source: AGHT+IFl2eAC2wXLNGcTcgz9pBye6T6IVeM4BN03TDgb6Vv2/UKfmtbrc+hijHKDuuTiPnREIJvcsA== X-Received: by 2002:a05:600c:314f:b0:43d:8ea:8d7a with SMTP id 5b1f17b1804b1-453656c313fmr101273355e9.28.1750681158702; Mon, 23 Jun 2025 05:19:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 06/26] target/arm/hvf: Trace hv_vcpu_run() failures Date: Mon, 23 Jun 2025 14:18:25 +0200 Message-ID: <20250623121845.7214-7-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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 @linaro.org) X-ZM-MESSAGEID: 1750681582508116600 Allow distinguishing HV_ILLEGAL_GUEST_STATE in trace events. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/hvf/hvf.c | 10 +++++++++- target/arm/hvf/trace-events | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index ef76dcd28de..cc5bbc155d2 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1916,7 +1916,15 @@ int hvf_vcpu_exec(CPUState *cpu) bql_unlock(); r =3D hv_vcpu_run(cpu->accel->fd); bql_lock(); - assert_hvf_ok(r); + switch (r) { + case HV_SUCCESS: + break; + case HV_ILLEGAL_GUEST_STATE: + trace_hvf_illegal_guest_state(); + /* fall through */ + default: + g_assert_not_reached(); + } =20 /* handle VMEXIT */ uint64_t exit_reason =3D hvf_exit->reason; diff --git a/target/arm/hvf/trace-events b/target/arm/hvf/trace-events index 4fbbe4b45ec..a4870e0a5c4 100644 --- a/target/arm/hvf/trace-events +++ b/target/arm/hvf/trace-events @@ -11,3 +11,4 @@ hvf_exit(uint64_t syndrome, uint32_t ec, uint64_t pc) "ex= it: 0x%"PRIx64" [ec=3D0x% hvf_psci_call(uint64_t x0, uint64_t x1, uint64_t x2, uint64_t x3, uint32_t= cpuid) "PSCI Call x0=3D0x%016"PRIx64" x1=3D0x%016"PRIx64" x2=3D0x%016"PRIx= 64" x3=3D0x%016"PRIx64" cpu=3D0x%x" hvf_vgic_write(const char *name, uint64_t val) "vgic write to %s [val=3D0x= %016"PRIx64"]" hvf_vgic_read(const char *name, uint64_t val) "vgic read from %s [val=3D0x= %016"PRIx64"]" +hvf_illegal_guest_state(void) "HV_ILLEGAL_GUEST_STATE" --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681230; cv=none; d=zohomail.com; s=zohoarc; b=gPa+NA547jXS/1D9NMs0yP6nLf3Z4NpJlLR1+V4oKdGH1uXJgo1F68MltXcNP2v0za0UdbsLZn+vT0+vbS4pVOcBGOGKElss1coIKOuzh8sSt1KocOs4E4WIbyJtWk5uiEI9Xmm9oC2byTJeMB5Ftq9KVjFp69QcIt6Yuf1hSHo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681230; h=Content-Type: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=GyiBFk3PHsFTGgxQWIJAhORaZcy53iNw0vUcB4RUUDE=; b=B/Cnsb7D5VTh/4ga3UHct3G8g/x0OlfNK+jN3JIyB4SnybAhkBHMZWUIN72//Rt+51khJE6xQJzNZCVxXIdGh7QXxhpy8vB3xYW7T2cXPE+YEEz9XgUdFdL6/cPFVtJ2YNt6/lX51mN9IAUtNsyya2VRmDCmdfB4UE76e6FIhqM= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681230140616.7809493416854; Mon, 23 Jun 2025 05:20:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg99-0001R0-80; Mon, 23 Jun 2025 08:19:35 -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 1uTg95-0001PZ-D5 for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:31 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg93-0000Vx-3l for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:30 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3a536ecbf6fso2281125f8f.2 for ; Mon, 23 Jun 2025 05:19:25 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535eada7adsm144615895e9.35.2025.06.23.05.19.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:19:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681164; x=1751285964; 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=GyiBFk3PHsFTGgxQWIJAhORaZcy53iNw0vUcB4RUUDE=; b=LPB75QosysKBIu72/h9rHK7gFs5UE7R9g+Pgymju0JxaxaQYQGnVxuMnRMoXq4s6jg iJRW2k5lCYu2qKIdBn5nbs+d9BRk2p5JmM2+IC4uV0v+i3nZgD0liwpfZO6nPU/y03T+ 1WE0+jY6VbNO224f2EUI+afrpEr9ibtmgYj6ICqmnNVQeYJdxsqdB8jq3bmYG/mpZNVa LbOpaBpWYTM7QEPf62EHh/70zjEu5qndxXFGGkMGf773ZvxXSUaFcf5JVGRUYI2hPWhv V3EQIixTiX42iYX8Y1L37c1toPkTRErl0GZ381ffr+mZf1mbId4fBtzK6eZUkNJh/3X9 HbfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681164; x=1751285964; 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=GyiBFk3PHsFTGgxQWIJAhORaZcy53iNw0vUcB4RUUDE=; b=i0/WGlVbgwfwVf99zvz3WwRrRgrld8GM9VTgyyu/xQ8We3BxT71G6iG8LY5Qy+jmao Jqyua6Z3L31h8vz528k0jDhZ1yUOOLTqcP8foPd6DzTtVmr3Yb5IUv67BEDKnFfXq3I3 rVDS6PxIC+qY2loK9/xHVvtd2BJ0TcyP5nZXIxcQ60jB2il+wpSzEKD9bbocb4rQcq1D zHMlqRu0S9U7NYBy/6uxKvP0+MC4ZbCkmF36TsfX7SOWRb/uQ1QyL7krp0oxRi7Thjvp c+plRKG6u02E3FEH2B4IeaPkFjdpD8EUMWReoFDSvW2sGjdyXW5SMWY8aaP27UC3xOlB vihQ== X-Gm-Message-State: AOJu0YwJZjgR/ub9WeVtNRtnUwpVL9+GPtQ5uS7edpIFS0fS2KnPBnAU WvEf/gMcRGpo7IQpoegLJ4bO7EAb33VugXflyj35Rcrcp+X168qVeIXo2u3svYWi/yeq8GMMfX8 fOWY1 X-Gm-Gg: ASbGnctG/+mko2GebkeGFMbaBdebMABC/a5UMrTHqyJOGd3VPXT2cFoHbrAC3Cg+ajG 8P7Jf5/1BJNv2rNwjuTQQNDuHnnp2IQFbkB2FYkI+rGOTM9kKQBuoSieFO4NvlY17THz5i4BqFV 4hbm8hPzBbbQeUD41xe3zGYQGlIEfp/YceSLl/OqgxLxOj+CO+xkGS98Ge1iBjnAEAUwWNobt3U IINJLqevXx9p26kTWKXEQ6ZYOp0siVIaA5eaYG9h///eVVND94NAVjmCpo7zNwYorORg5KnPV6u 8GTHXcTkf8nWiSyZXty3MgtDkocntwTuFMlUaAm/x8pvlNI/Yd0zYrnqn9Xo7O3wf9w+npsVdd0 XhHevkoi/J+/gETQZshC/sabv2F2lCPohMPOG X-Google-Smtp-Source: AGHT+IE/ShLC0BNfarjCGNMSpPGAS0rfS+vL7cCj12GXMkaCbIYQsstL056tugsSAblfUqd+SodRWA== X-Received: by 2002:a05:6000:38e:b0:3a4:fc37:70e4 with SMTP id ffacd0b85a97d-3a6d1331ec7mr9866453f8f.58.1750681163851; Mon, 23 Jun 2025 05:19:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 07/26] accel/hvf: Trace VM memory mapping Date: Mon, 23 Jun 2025 14:18:26 +0200 Message-ID: <20250623121845.7214-8-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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 @linaro.org) X-ZM-MESSAGEID: 1750681234089116600 Trace memory mapped / unmapped in the guest. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- meson.build | 1 + accel/hvf/trace.h | 2 ++ accel/hvf/hvf-accel-ops.c | 6 ++++++ accel/hvf/trace-events | 7 +++++++ 4 files changed, 16 insertions(+) create mode 100644 accel/hvf/trace.h create mode 100644 accel/hvf/trace-events diff --git a/meson.build b/meson.build index 34729c2a3dd..5004678a26b 100644 --- a/meson.build +++ b/meson.build @@ -3633,6 +3633,7 @@ if have_block endif if have_system trace_events_subdirs +=3D [ + 'accel/hvf', 'accel/kvm', 'audio', 'backends', diff --git a/accel/hvf/trace.h b/accel/hvf/trace.h new file mode 100644 index 00000000000..83a1883343a --- /dev/null +++ b/accel/hvf/trace.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#include "trace/trace-accel_hvf.h" diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index d60446b85b8..b38977207d2 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -59,6 +59,7 @@ #include "system/hvf_int.h" #include "system/runstate.h" #include "qemu/guest-random.h" +#include "trace.h" =20 HVFState *hvf_state; =20 @@ -97,6 +98,7 @@ static int do_hvf_set_memory(hvf_slot *slot, hv_memory_fl= ags_t flags) if (macslot->present) { if (macslot->size !=3D slot->size) { macslot->present =3D 0; + trace_hvf_vm_unmap(macslot->gpa_start, macslot->size); ret =3D hv_vm_unmap(macslot->gpa_start, macslot->size); assert_hvf_ok(ret); } @@ -109,6 +111,10 @@ static int do_hvf_set_memory(hvf_slot *slot, hv_memory= _flags_t flags) macslot->present =3D 1; macslot->gpa_start =3D slot->start; macslot->size =3D slot->size; + trace_hvf_vm_map(slot->start, slot->size, slot->mem, flags, + flags & HV_MEMORY_READ ? 'R' : '-', + flags & HV_MEMORY_WRITE ? 'W' : '-', + flags & HV_MEMORY_EXEC ? 'E' : '-'); ret =3D hv_vm_map(slot->mem, slot->start, slot->size, flags); assert_hvf_ok(ret); return 0; diff --git a/accel/hvf/trace-events b/accel/hvf/trace-events new file mode 100644 index 00000000000..2fd3e127c74 --- /dev/null +++ b/accel/hvf/trace-events @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# +# See docs/devel/tracing.rst for syntax documentation. + +# hvf-accel-ops.c +hvf_vm_map(uint64_t paddr, uint64_t size, void *vaddr, uint8_t flags, cons= t char r, const char w, const char e) "paddr:0x%016"PRIx64" size:0x%08"PRIx= 64" vaddr:%p flags:0x%02x/%c%c%c" +hvf_vm_unmap(uint64_t paddr, uint64_t size) "paddr:0x%016"PRIx64" size:0x%= 08"PRIx64 --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681416; cv=none; d=zohomail.com; s=zohoarc; b=GLXs1etWpXQQKUlA+yyTe81BYiQcjl3LCED/Z4ocMV4RX+hy4osL1+RiFmbuLwy4NQYHacFg1GPnObq7yHasNBbCcCkRH2D3bIROgkubuhB1fSNTh1QDJ9/b0eBmONHhphxBKqN7c4VHlgxLM5h8OwlUuR4fw29bsMIkzN0VGRY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681416; h=Content-Type: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=qyHQEfn6inWyZRMUVI/8b1HegzN318xDx/IKxFDD3c0=; b=ZUDrLfZAaEjvZ0TOc3LIYmaefEgCKjR3eOKzkQ7uPGGt0A9tJHLY9PGX7O3bwThIEUE3E8pSXV5CZp7T527faRwDhhWi51gcjM/ZEw4lxNY9kwnhkfpbhnQ+Cgu8gg3cG/8r7q1C/3cyQ6vU/LqlENn9PgeWCXOgUCKQzwYDfnw= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681416168243.89226587231667; Mon, 23 Jun 2025 05:23:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg9B-0001SR-Jx; Mon, 23 Jun 2025 08:19:37 -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 1uTg99-0001Rq-U9 for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:35 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg96-0000XB-33 for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:35 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43edecbfb46so27903435e9.0 for ; Mon, 23 Jun 2025 05:19:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-453646fd7aasm108552565e9.20.2025.06.23.05.19.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681169; x=1751285969; 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=qyHQEfn6inWyZRMUVI/8b1HegzN318xDx/IKxFDD3c0=; b=w+7lIDEXJJ9rJK521KDHTfNfEQCRfzYIOg0mPz4rY2TY18C/BFb7DfVyy66J0wWIAk slg3m0mzrjyC3ehYq9COjUU+GhkH3/ohsHjj16twbAVqQvwjLHTpJ9GgbszNvtRd5T4x 4Nm2C0qd8Be3E2lDqt6lL696sxAwQlckjnw2aTAP8IgNiPZFBVKovtHZDP9Y+UaWLMTh iHKUht+I/WVX1IzPqCaP1lR7bG7WwpZ8Pgkuhj+WQglGBHxOOnh4K3Lj96kItKBXbTXy XI9xdpmacdfpuEb4/tfC+VZ9zj6kVqSOFtv4CFhGLnkMWiJuRN+zRt3FD9u50Hb7wjUS VTCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681169; x=1751285969; 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=qyHQEfn6inWyZRMUVI/8b1HegzN318xDx/IKxFDD3c0=; b=JqHdQCURgkUjeVr2HI38LjZ7gqw3yDSMkCEMECFhGv0a6EfMGEc5fxmSUzyfAAGZpq ctHxY65Rqe06Ua4YoArMcKTRmm2n/cOAEkVI+lCsk8feTih6nGoOD6zgn61Kuoq+dOkU ce3uGOzH9pzcGM2/RZ7w5/XyqcoDKw69TxkCsxKG0kip8Xi1rjVRlS+iJD+dPA1TIXV6 Bkr4qkSKJIdVnnAGwzuEVvUFMHFOTmSOmT9d3GpMojEUJsOEm5L0AQYK46cs1Qxds6iF Y/udQ+a3ZAamNKJ70gKt0N1Xk7AVDvQfSYGIYMcGoYgkuuzACOylZqcSsn8pCd/125mZ cMWQ== X-Gm-Message-State: AOJu0Yzi5Pdqvr5WhJzVoEZd0w1pM15dLbTYgO4pe5nrCep1XZdzblBn /2RoB500JRp+uU2JdkKiUyzclvj2YVsu61mW26VH7kfPaExG+b6SzPWXIfeCApr7ITc4hxZvrK3 iL84Y X-Gm-Gg: ASbGncvnjSeWTaNowqatd4xGbrriW7a/J9g2yQknfXfZ5Moug79mjs/1q/Q5hk4nXxL suQdnKW5LFMJ8xzeZfm3T7zt/VG1p3fPWNfGfRXzIz9y8Y/jwxllCs51/UUjbBATCW2o8px1Ma+ 8x0Ug95J07X2e/DVrip4r7aRzKpOFOS/hqGLqTnFSSzVNpcOrGPUSH75e2R4weKjM0vBo8fg3q7 W2AYuvPeVWOzYj8YGwNc5WjipVkzaexrcCdG2qgBPhJFNwlxk5KaP2y8zdndoy3xb2CVgePV8eL G0KjCZ+2GiS/Psxi9RY+9xZlFAu3TE/sY1sGdVeeJ6tL1WhtRwlmp5c1gFm/39l3pzi//RhRfju VJgiEeihgrZKh7I32LcBI8i0u06uLKVuOIrx9 X-Google-Smtp-Source: AGHT+IG0jiUUTmeqAWUri6/ZJ6x4DVSBOfaEpfSa25gPf14UgQYKRFy2gTrbK23eOovRBdpzASNZQQ== X-Received: by 2002:a05:6000:1a8f:b0:3a5:2d42:aa17 with SMTP id ffacd0b85a97d-3a6d12d53e2mr9880614f8f.31.1750681168848; Mon, 23 Jun 2025 05:19:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 08/26] target/arm/hvf: Log $pc in hvf_unknown_hvc() trace event Date: Mon, 23 Jun 2025 14:18:27 +0200 Message-ID: <20250623121845.7214-9-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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 @linaro.org) X-ZM-MESSAGEID: 1750681418349116600 Tracing $PC for unknown HVC instructions to not have to look at the disassembled flow of instructions. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/hvf/hvf.c | 4 ++-- target/arm/hvf/trace-events | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index cc5bbc155d2..d4c58516e8b 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -2071,12 +2071,12 @@ int hvf_vcpu_exec(CPUState *cpu) cpu_synchronize_state(cpu); if (arm_cpu->psci_conduit =3D=3D QEMU_PSCI_CONDUIT_HVC) { if (!hvf_handle_psci_call(cpu)) { - trace_hvf_unknown_hvc(env->xregs[0]); + trace_hvf_unknown_hvc(env->pc, env->xregs[0]); /* SMCCC 1.3 section 5.2 says every unknown SMCCC call ret= urns -1 */ env->xregs[0] =3D -1; } } else { - trace_hvf_unknown_hvc(env->xregs[0]); + trace_hvf_unknown_hvc(env->pc, env->xregs[0]); hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized()); } break; diff --git a/target/arm/hvf/trace-events b/target/arm/hvf/trace-events index a4870e0a5c4..b49746f28d1 100644 --- a/target/arm/hvf/trace-events +++ b/target/arm/hvf/trace-events @@ -5,10 +5,10 @@ hvf_inject_irq(void) "injecting IRQ" hvf_data_abort(uint64_t pc, uint64_t va, uint64_t pa, bool isv, bool iswri= te, bool s1ptw, uint32_t len, uint32_t srt) "data abort: [pc=3D0x%"PRIx64" = va=3D0x%016"PRIx64" pa=3D0x%016"PRIx64" isv=3D%d iswrite=3D%d s1ptw=3D%d le= n=3D%d srt=3D%d]" hvf_sysreg_read(uint32_t reg, uint32_t op0, uint32_t op1, uint32_t crn, ui= nt32_t crm, uint32_t op2, uint64_t val) "sysreg read 0x%08x (op0=3D%d op1= =3D%d crn=3D%d crm=3D%d op2=3D%d) =3D 0x%016"PRIx64 hvf_sysreg_write(uint32_t reg, uint32_t op0, uint32_t op1, uint32_t crn, u= int32_t crm, uint32_t op2, uint64_t val) "sysreg write 0x%08x (op0=3D%d op1= =3D%d crn=3D%d crm=3D%d op2=3D%d, val=3D0x%016"PRIx64")" -hvf_unknown_hvc(uint64_t x0) "unknown HVC! 0x%016"PRIx64 +hvf_unknown_hvc(uint64_t pc, uint64_t x0) "pc=3D0x%"PRIx64" unknown HVC! 0= x%016"PRIx64 hvf_unknown_smc(uint64_t x0) "unknown SMC! 0x%016"PRIx64 hvf_exit(uint64_t syndrome, uint32_t ec, uint64_t pc) "exit: 0x%"PRIx64" [= ec=3D0x%x pc=3D0x%"PRIx64"]" -hvf_psci_call(uint64_t x0, uint64_t x1, uint64_t x2, uint64_t x3, uint32_t= cpuid) "PSCI Call x0=3D0x%016"PRIx64" x1=3D0x%016"PRIx64" x2=3D0x%016"PRIx= 64" x3=3D0x%016"PRIx64" cpu=3D0x%x" +hvf_psci_call(uint64_t x0, uint64_t x1, uint64_t x2, uint64_t x3, uint32_t= cpuid) "PSCI Call x0=3D0x%016"PRIx64" x1=3D0x%016"PRIx64" x2=3D0x%016"PRIx= 64" x3=3D0x%016"PRIx64" cpuid=3D0x%x" hvf_vgic_write(const char *name, uint64_t val) "vgic write to %s [val=3D0x= %016"PRIx64"]" hvf_vgic_read(const char *name, uint64_t val) "vgic read from %s [val=3D0x= %016"PRIx64"]" hvf_illegal_guest_state(void) "HV_ILLEGAL_GUEST_STATE" --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681249; cv=none; d=zohomail.com; s=zohoarc; b=Quc6mQX6AgYOA5nfpyvBzl+O4uPJa2DemagqEkOe066Fyflw6m+37JDqATVPM7WzOd9a3YFdBQXVnQYCG66OOCgT19rBKTTEr0K/kr38EP0Y42P+psCrjwIXgEAABbiXdToSBVgnUZ8zVq9qe3UceJtEov0rW3ywoLJdBWke5A0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681249; h=Content-Type: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=MgoMlu6luU8uPkDpvUPvEjZTODhHkmT/W4wpYdZo59E=; b=PfmRXQODuIhydmdHuUaHQX3extGYGe++alTR59HqAGLZWxvgHAIv/XTlzfj64cx8k5D7QKJZasL/Ycck8rlKMAksGTaNgF89QK3rYIKqvrnbtncylUDxribBnB5kU3rG3rZyu30iYPfyw74PQgfFm1n2EDVmaDKDVVcAhRTgPn8= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681248941418.5403310670581; Mon, 23 Jun 2025 05:20:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg9H-0001UE-Bh; Mon, 23 Jun 2025 08:19: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 1uTg9E-0001Ti-QO for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:40 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg9B-0000Yn-6H for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:40 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3a522224582so1926345f8f.3 for ; Mon, 23 Jun 2025 05:19:35 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d0f1054bsm9217868f8f.9.2025.06.23.05.19.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681174; x=1751285974; 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=MgoMlu6luU8uPkDpvUPvEjZTODhHkmT/W4wpYdZo59E=; b=CVzpMz23T4COrgXR/FdUdeKQ7hB4B/qjzXRMc+ISoeE3M7QadJWaF1CiWM3U2xXtIm FygfI1UKpaITWHHPN+ubloPdrTzFEEvSwSU7QmX85Nh7MDWeEqsP4wURUAMYRcwevGwu BN4xeoOXMLhfyPoBzdkkipmqpQDG/VEB7F09g+QyjKmITcGeFlcgmYUUtJEKDsrfVStM BiiAiR9A7kqEbXDY3zws6VBmaZQNmyagHSUBUu8NHlh+UpFx0ebWUWIZ26IRmrMJ7Uv0 QqrzNTuo/AWMxm1D93sCEGJ64aoSwMhLQAH2GU3LV1k4tPViCzHpiFfciz5+Q9itTmz+ taZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681174; x=1751285974; 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=MgoMlu6luU8uPkDpvUPvEjZTODhHkmT/W4wpYdZo59E=; b=QOsqDOoI5TwvR7J+9T7TSr8cYpLmIPNQA6ngueWcijvJvRDj9a6UKvByJddoM0+Nq2 qr6lgp7jqRqC+zKyqDflqaernRzrao5BL2rchLBVT1pksYRabkcylbIW+Dq4qX7BBdzc 0bcsW7bLiq6AXQHuONvkGx8dGP/uCICUqoj8tKgctfXXHniLFaBYKdPMN57UX/5wNHDW BjNBhF5ABs+w8NzN86pq8f+gsDL2jJbecuxpyHscHonrN/0D/TpQo0G04atEQ66GM1fW QM7NpGcVeMLiWpUjbBj65EEYYqTs4Gcn6oI1iweoQvLG+FdcrYQFZNUV+lxWcRUJUKmx mdOQ== X-Gm-Message-State: AOJu0Yw1yhlmoVWgmB6LK2VfLlI98/1aryBx67VEbxh+Fjg6yfC+Orh3 YRPKNw56SpicoFMZ4UhYxKnhvYBzeQ0MlH4GAprg/rEipRQ1qwPK9FXcAuYaasAfrga8zez9tJU 6LH37 X-Gm-Gg: ASbGncs2CT9rZTora7rdQCJIe5IgdRQf0nQSdBuDSn7Y/aRACVYbKhr3Tcd/v/D208O THIM5Zti6RqZvvr6DRsN0Tpa5du5JFOqnbkMehcGsCtspwDnqZgHbHjczqsd3HUH8cwcJ2H8vqH wWSPku13kO45tIUcGrVzmF5eRcSXUW/qOX6SDrkpHiA4Q2HjBnOg86Bf/KqXkQLLDu8UzQjfJ5F QCbBt+6efOoDizArjD9vlzSy2klWE0/pvZJzSYAluB2HFmWE9+HcN+M/gz+p0s/WMtjKOPfoKSY QNPugvzQgWp8vbfq8WPdqziD9S2PolYbfpwQq1hNpSv4fJxB6KCABMvpas9gRAnBOxfjXBujyRI HZJcKQXGA6xnMDWooprrfV0h/A2PuNPLk8ZOi X-Google-Smtp-Source: AGHT+IH5nN0Buqju33OA312k0qD0vKiMOH8kEulBGzTvtfmPtg2jIEiKfCSnA60Z3UW/VHNqpVWLLw== X-Received: by 2002:a5d:584c:0:b0:3a4:e6bb:2d32 with SMTP id ffacd0b85a97d-3a6d12a2416mr9606493f8f.22.1750681173855; Mon, 23 Jun 2025 05:19:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-stable@nongnu.org Subject: [PATCH v3 09/26] target/arm: Correct KVM & HVF dtb_compatible value Date: Mon, 23 Jun 2025 14:18:28 +0200 Message-ID: <20250623121845.7214-10-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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 @linaro.org) X-ZM-MESSAGEID: 1750681250489116600 Linux kernel knows how to parse "arm,armv8", not "arm,arm-v8". See arch/arm64/boot/dts/foundation-v8.dts: https://github.com/torvalds/linux/commit/90556ca1ebdd Cc: qemu-stable@nongnu.org Fixes: 26861c7ce06 ("target-arm: Add minimal KVM AArch64 support") Fixes: 585df85efea ("hvf: arm: Implement -cpu host") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/hvf/hvf.c | 2 +- target/arm/kvm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index d4c58516e8b..bf59b17dcb9 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -879,7 +879,7 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPUFea= tures *ahcf) hv_vcpu_exit_t *exit; int i; =20 - ahcf->dtb_compatible =3D "arm,arm-v8"; + ahcf->dtb_compatible =3D "arm,armv8"; ahcf->features =3D (1ULL << ARM_FEATURE_V8) | (1ULL << ARM_FEATURE_NEON) | (1ULL << ARM_FEATURE_AARCH64) | diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 74fda8b8090..9a1b031556a 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -266,7 +266,7 @@ static bool kvm_arm_get_host_cpu_features(ARMHostCPUFea= tures *ahcf) } =20 ahcf->target =3D init.target; - ahcf->dtb_compatible =3D "arm,arm-v8"; + ahcf->dtb_compatible =3D "arm,armv8"; =20 err =3D read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64pfr0, ARM64_SYS_REG(3, 0, 0, 4, 0)); --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681406; cv=none; d=zohomail.com; s=zohoarc; b=WNcMVLfzCL/aakQIK/OtJHOP7vMr5McudhOXbp377CO9jv9nq7e2JNLJwqa9Id4P0kxCex45vNWlvrEhCZjrewUF/rowcMym0v6HCqNyryKVzky+6JN6/IcRSeAtQRftp4BTbV1dSZlKH0DsX5z+4f1zJMEL5XMy1LprFlPP0S0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681406; h=Content-Type: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=48R2YiPamWEGXpLD/SMOVBFSdD9dMYPDAhGM9B3qv/Y=; b=DLMkrIyE4uNMYJaxlVkJ+gm549n5TmJB/4/Y6QnN1MLb+DjRDO0GBoaFC2ya4ZBUca+qiDeW3ien6V/RCEEuR3l5DFagy3jn366DvxrZzDua/LdjQKmoghgoDHP7nJpXYUSMSco6LnsHfHz3PNFRUuEIKDw+wxvAofdkExsL9SQ= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681406583482.04093634561093; Mon, 23 Jun 2025 05:23:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg9W-0001cf-DJ; Mon, 23 Jun 2025 08:19:58 -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 1uTg9I-0001WW-1w for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:47 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg9G-0000aB-1A for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:43 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-450cf214200so37508935e9.1 for ; Mon, 23 Jun 2025 05:19:41 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6e2036094sm2260909f8f.99.2025.06.23.05.19.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681179; x=1751285979; 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=48R2YiPamWEGXpLD/SMOVBFSdD9dMYPDAhGM9B3qv/Y=; b=mXcOS97vqVAa1ZsWfnUWfAX4RvbSgyDCh2HLu+9znNTtBjghTC1vhq3jFfFSca0aWm 92kYwRdp7E0xTonUSds+DomOrFRUMKwKUQny625KKk4C6ixkDZXBd0wANQErgf3CeWjY r0qx7QQb+Zltj6QVcrxWEBn+LAw0ILkqaUBTI1T4PISndDNoFICfw8Orss6yfBAuar/u Xt7MzHcqnsyePniYfnAyPR4JCGxeC21GGk7aoFxulf2HEVmjPLOn3hdTWxHMegsx6ECA Q0A0mYtTbUJIc/nPCZhg563kLof+hvLrrQqawB0PbOt8LIPl26GISsRm6HQNxWEadCwf Nlgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681179; x=1751285979; 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=48R2YiPamWEGXpLD/SMOVBFSdD9dMYPDAhGM9B3qv/Y=; b=bPCpRid7eFkBD3rx3o2tGUrQmcnrMhatbobv51zm0mw+Zlk72wLmL6ycr5r7ZZAm8m BNf+TEMMkDzxokAcvEo7DVFUyVkpJ9RswGgIiAz3OLuCo3wqs+t8X7lRvVcyAqAvdjcT TWnATf9s44ucd+ttX7F0bsaII0Efkfqi8ktLuk687tQSoODa7ZuNI6DrxJzZxWQ4ZSsM r4jQxa+qJx0Hj1giIG+j7U0NFkcvZC91ldGgZRXhMqo1dyUi+W2y0udoF/qITp7GbftY rAlbKPf4Ger89cHqqzX/T0oGzAWzsGbZccOYG3nDN5k0U7QlNJbj6vpkEoVgIQpBhqF4 8P1Q== X-Gm-Message-State: AOJu0YzQWBrxO+mKKbrIDKoykFv0+enGBimSAe51OSS7Axntp99V5nt9 BQkasrFSe/y6AQwyIxutnxMhKnJdy+YM0MdRTTpC43i4DqBYdodix5K4Q4R/0JHxQh4g0wJwoKr 6kJCi X-Gm-Gg: ASbGncuvkAt+rJi3aSC8oFs4njYT/ruh8baMRKq/+TPUlaa+J5o3QicHXd/sTf39GpQ KwzqReIss4uwQOfXI5JBc9Jcu22EwWwkNk2HOvie2lJQIvPg6Qtuyc61vrRDYyaVrgN3ZEjr03Q HUi9wYR/fnZ1LvJt8O7AhfwYVzOUG8ZXbBp7l6texty780W1BIktAgPy0F5aVgDseee9gxF8kSz m0oezwmCBnPmxdZtA0Qg+FDrnvk+JDxS+FdaO6UyZOwYa6whDjwGgIfAhDtL2qav4U572bmHQJK eO9ODvTc6E9MsdPQez8T+m37Q4xGDf/396mRPMRsltuomxNWmtENk9B9+D6dRxE6F4lVCuJWn+J jfFKdhJ6TlylVkDPuH1XOWESE3PXhgKuMa03Mb1x//x0AXF8= X-Google-Smtp-Source: AGHT+IEXe4I5B9Ke/lPmm6yKL911KIFc6TFDbUCkl0BXXwXmGDLjh6AfC57olDM6XbzOca+1lNc8Xg== X-Received: by 2002:a05:6000:41c5:b0:3a0:a0d1:1131 with SMTP id ffacd0b85a97d-3a6d12c4483mr9863735f8f.7.1750681178908; Mon, 23 Jun 2025 05:19:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 10/26] accel/hvf: Model PhysTimer register Date: Mon, 23 Jun 2025 14:18:29 +0200 Message-ID: <20250623121845.7214-11-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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 @linaro.org) X-ZM-MESSAGEID: 1750681407982116600 Emulate PhysTimer dispatching to TCG, like we do with GIC registers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/hvf/hvf.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index bf59b17dcb9..5169bf6e23c 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -187,6 +187,7 @@ void hvf_arm_init_debug(void) #define SYSREG_OSDLR_EL1 SYSREG(2, 0, 1, 3, 4) #define SYSREG_CNTPCT_EL0 SYSREG(3, 3, 14, 0, 1) #define SYSREG_CNTP_CTL_EL0 SYSREG(3, 3, 14, 2, 1) +#define SYSREG_CNTP_CVAL_EL0 SYSREG(3, 3, 14, 2, 2) #define SYSREG_PMCR_EL0 SYSREG(3, 3, 9, 12, 0) #define SYSREG_PMUSERENR_EL0 SYSREG(3, 3, 9, 14, 0) #define SYSREG_PMCNTENSET_EL0 SYSREG(3, 3, 9, 12, 1) @@ -198,6 +199,7 @@ void hvf_arm_init_debug(void) #define SYSREG_PMCEID0_EL0 SYSREG(3, 3, 9, 12, 6) #define SYSREG_PMCEID1_EL0 SYSREG(3, 3, 9, 12, 7) #define SYSREG_PMCCNTR_EL0 SYSREG(3, 3, 9, 13, 0) +#define SYSREG_CNTP_TVAL_EL0 SYSREG(3, 3, 14, 2, 0) #define SYSREG_PMCCFILTR_EL0 SYSREG(3, 3, 14, 15, 7) =20 #define SYSREG_ICC_AP0R0_EL1 SYSREG(3, 0, 12, 8, 4) @@ -1326,16 +1328,15 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t = reg, uint64_t *val) } =20 switch (reg) { - case SYSREG_CNTPCT_EL0: - *val =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) / - gt_cntfrq_period_ns(arm_cpu); - return 0; case SYSREG_OSLSR_EL1: *val =3D env->cp15.oslsr_el1; return 0; case SYSREG_OSDLR_EL1: /* Dummy register */ return 0; + case SYSREG_CNTP_CTL_EL0: + case SYSREG_CNTP_TVAL_EL0: + case SYSREG_CNTPCT_EL0: case SYSREG_ICC_AP0R0_EL1: case SYSREG_ICC_AP0R1_EL1: case SYSREG_ICC_AP0R2_EL1: @@ -1639,16 +1640,12 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t= reg, uint64_t val) case SYSREG_OSLAR_EL1: env->cp15.oslsr_el1 =3D val & 1; return 0; - case SYSREG_CNTP_CTL_EL0: - /* - * Guests should not rely on the physical counter, but macOS emits - * disable writes to it. Let it do so, but ignore the requests. - */ - qemu_log_mask(LOG_UNIMP, "Unsupported write to CNTP_CTL_EL0\n"); - return 0; case SYSREG_OSDLR_EL1: /* Dummy register */ return 0; + case SYSREG_CNTP_CTL_EL0: + case SYSREG_CNTP_CVAL_EL0: + case SYSREG_CNTP_TVAL_EL0: case SYSREG_ICC_AP0R0_EL1: case SYSREG_ICC_AP0R1_EL1: case SYSREG_ICC_AP0R2_EL1: --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681425; cv=none; d=zohomail.com; s=zohoarc; b=lyDPZ5thWMbxeWlJIBtacMuUnGe4STu+B2VjeBx2Hk3l45m4nN/+4OYRLWRMi7UjC4LGJ2h84qWDY0qPIXH+R+yrI2FgD6QxPh+6HUJFaza5EVhtowgSn7SImRf77stLa6bPwirOp96ykhlakPlgcLxnQmx3/gzSemo6rimqspQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681425; h=Content-Type: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=YG0rGkpeQcTfIwjCevzyaz+W/QtJY+1YJlHHFNrDtaE=; b=d2bN7l4ohzNSMkzl/N0VNBQ6ZAAooZoPV9X1TwYMdC1XeHtV3uiQvOeU2tRmvjC+JckOvDbDc59pLnXkTOQaG/Dq/8mqak812e1K6EUQMs/OG10qAaxETn1LiCK3XGBhkvu0qFIuOSFEnYUrnXD3Jb9HaN/Nw1hqFWBOd60lSSA= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681425130335.1878028595986; Mon, 23 Jun 2025 05:23:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg9c-0001nj-KQ; Mon, 23 Jun 2025 08:20:04 -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 1uTg9R-0001Zt-MS for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:57 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg9K-0000ap-9M for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:52 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3a50956e5d3so3235203f8f.1 for ; Mon, 23 Jun 2025 05:19:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-453646d14f3sm108727095e9.13.2025.06.23.05.19.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681184; x=1751285984; 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=YG0rGkpeQcTfIwjCevzyaz+W/QtJY+1YJlHHFNrDtaE=; b=PujxoB1yYXuFkDNbAS01UCCuAdTHJgIjRx/zU7zQAqtDykGf9oO3ekLeEVfOdHFKeg ClNh78UCW3PhS3C8vWdupnFctW5SGMw4t/xJKQysLRWg33lL3IQ0qbVjwZ1Jlnh9+zca EU8kVny9efKRv3VZ6OkH6U+II/u0fhDRr8U7SfA77O0/pV4Go8bySFcuQ+YLnO9dUjvB mAvhRquv80UFqzGSXY3tHv/NBJH+CVAJlWQTCzrFtSnTWCrAZjP9RBHpKcbwMeKGUot4 x7Hgkyc9EbgokMT09mVLzP1U8S+CBG/4RRsRAX6MRERDGp3DMUbOQWIgoj5mJi+1YcO1 srGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681184; x=1751285984; 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=YG0rGkpeQcTfIwjCevzyaz+W/QtJY+1YJlHHFNrDtaE=; b=eF7c7rBN/ZBk+E9iadteShShdHWxGylDFSKoYWRHVXr8zZGrC7OryhZoJ+5pMNDB9d QIsYcGx2sLa4CFa+Z4efW7zcYDDR3r6QP2p2d7coPwr/CcESc6NM38c5ZKaQc6M5iGS0 MSbd2i+LuORSApcscxq1JNblXwHkA41fsf/QWhbQWU8kEHcoHXyFgBlUZRgGv5aDLmt/ HaYgGinIf+JM/u/gzoWjDldVTkGnKIwL7OInwTwwjvJhX6bzvgmI+1+rnQhdM83eK8G0 ImK7Dp/UFBs1EQZz6Ma4G5IDXXyaqEWrRpNZ1xpeh7sqY5EOsp6K/Egt1wVlavjyMUEm Wn9w== X-Gm-Message-State: AOJu0Ywq3cgZ4d9Y1crnYDTP7/aFwlsvSnqR1zY9KzV07698hw6KcQt1 zCt4w3D4CRATtwkySdSlSbRwVdDyqWNtVcvC42njw94NBFEU34s1J75WzDWL2CCIAE8MdYCUsv6 1jX/t X-Gm-Gg: ASbGncu1aEBAUJCYH6u5MwO2gfz+BULkzjhQ6CBznFBsI8aUenaO2Ud8VlV1qmCa4h4 gYbfXVYYO0h4IkaByMJ+1nuXuRnyfjKKTsEG2qoH+XRZoAghlK2pjCoeHNQvl2/xzKSQWysDbWW kot27uAJJPkBXp6mTS3g7mn36U7VLFruzjrbkSiIyyiY8pU7svx+Ryu43JnR48M/eDM94+mFga6 nOeYkqXvFEaqgd8HlUTz3k6aICF1rdlrUFkP357N7IdBphzqdAlueBqScXWSCh2JlZDEHwBGhcT EadNoZNsxxBXBejney4wtfx9Mm6jKNIGJy9sSFYmC/0Dcre1LLbKjgwAhH6q1MlhzBOnwJfKe2w nnAqpczMGP0/KcKXOdJwprj3a0X6bMh1yznFz X-Google-Smtp-Source: AGHT+IHTcK8NRdR7PNArgyYQkG0nUCVoom+k7oQ1rJFLDhrBWTeykxYJUpFWrxkFgsUFr33IXybNlg== X-Received: by 2002:a5d:64ce:0:b0:3a4:f513:7f03 with SMTP id ffacd0b85a97d-3a6d1303b0fmr9477486f8f.44.1750681183940; Mon, 23 Jun 2025 05:19:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 11/26] target/arm/hvf: Pass @target_el argument to hvf_raise_exception() Date: Mon, 23 Jun 2025 14:18:30 +0200 Message-ID: <20250623121845.7214-12-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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 @linaro.org) X-ZM-MESSAGEID: 1750681426291116600 In preparation of raising exceptions at EL2, add the 'target_el' argument to hvf_raise_exception(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/hvf/hvf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 5169bf6e23c..b932134a833 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1089,13 +1089,13 @@ void hvf_kick_vcpu_thread(CPUState *cpu) } =20 static void hvf_raise_exception(CPUState *cpu, uint32_t excp, - uint32_t syndrome) + uint32_t syndrome, int target_el) { ARMCPU *arm_cpu =3D ARM_CPU(cpu); CPUARMState *env =3D &arm_cpu->env; =20 cpu->exception_index =3D excp; - env->exception.target_el =3D 1; + env->exception.target_el =3D target_el; env->exception.syndrome =3D syndrome; =20 arm_cpu_do_interrupt(cpu); @@ -1454,7 +1454,7 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t re= g, uint64_t *val) SYSREG_CRN(reg), SYSREG_CRM(reg), SYSREG_OP2(reg)); - hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized()); + hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized(), 1); return 1; } =20 @@ -1760,7 +1760,7 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t r= eg, uint64_t val) SYSREG_CRN(reg), SYSREG_CRM(reg), SYSREG_OP2(reg)); - hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized()); + hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized(), 1); return 1; } =20 @@ -1963,7 +1963,7 @@ int hvf_vcpu_exec(CPUState *cpu) if (!hvf_find_sw_breakpoint(cpu, env->pc)) { /* Re-inject into the guest */ ret =3D 0; - hvf_raise_exception(cpu, EXCP_BKPT, syn_aa64_bkpt(0)); + hvf_raise_exception(cpu, EXCP_BKPT, syn_aa64_bkpt(0), 1); } break; } @@ -2074,7 +2074,7 @@ int hvf_vcpu_exec(CPUState *cpu) } } else { trace_hvf_unknown_hvc(env->pc, env->xregs[0]); - hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized()); + hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized(), 1); } break; case EC_AA64_SMC: @@ -2089,7 +2089,7 @@ int hvf_vcpu_exec(CPUState *cpu) } } else { trace_hvf_unknown_smc(env->xregs[0]); - hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized()); + hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized(), 1); } break; default: --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681726; cv=none; d=zohomail.com; s=zohoarc; b=da6KJEaDHm2qdujdNL/Ze15Uya1y1y6kTFdkAA8qDR3uj7QI/B9uHeqqCYfsIJZGVkvusoRbgKaGjt1IzsM/MPNdmIgNDd4O5BN5AN5VHqvK+n5qV8C66850kbt8S9qx+7wd2Cdkaxfj4eWWbaXOmJSevTtYMCWsnkYARbo5Ci4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681726; h=Content-Type: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=MZYDDWvDMspPzhkKxydUFPlizzWHJdNmtQlGNWnBP18=; b=NkoqwyXJZ2C7RQpxXoBvOvBT9n4lp88zbTNMNB7bjoK/qgO0VPggwls9zXe+x5IMBl6HX2u5/r0k1cFvSR7JCqWJrwe4ZRLIcs11WrLQQqpYwmla1/irP5F2DpbA/gWRvXmyVvASQU+jBB3uxZhITYfUd7KRrjn8vCFWqEh/KDE= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175068172639540.419300841634254; Mon, 23 Jun 2025 05:28:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg9Z-0001hM-Fj; Mon, 23 Jun 2025 08:20:01 -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 1uTg9V-0001b7-F9 for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:57 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg9Q-0000bi-C7 for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:57 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-451d54214adso27146515e9.3 for ; Mon, 23 Jun 2025 05:19:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-453646cb57fsm110694655e9.1.2025.06.23.05.19.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681189; x=1751285989; 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=MZYDDWvDMspPzhkKxydUFPlizzWHJdNmtQlGNWnBP18=; b=iWRCF/b4+BQ24h2Uym/MHFwa8Um1pzsEFVvv0rjtFvWA0JV9q8yk/efMuHdm8UxFqH J57Bnyq2J8DtkonoRX5AP/B0zC564EbVN4wzAJEbnVOdTGc+cc/hRKRv4pX9GiEi/thQ wYys/oktfvIy0DBIFktCTKvNDAlzaC8PVL6NROLAXEBf+4AM4mgtaOlKciZYe32zIzf6 FFzJOox6BMAWF0ZX4CKhby6g4FRzEHfQlNAF25g/AD1UEQ0X/udgozL3fZTz8X/RafE6 pgnFdcDfBp78LSb/vBwPyC/cidQJxzMz1RUCsEMHiIEh+Gdk7EBAW4l1UjUxO3LxhJ2M XNqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681189; x=1751285989; 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=MZYDDWvDMspPzhkKxydUFPlizzWHJdNmtQlGNWnBP18=; b=uBNPygar0ixw2lVXt+94S8HKDWQSNwinyApUi8r5DxrKXw24AHIdfMKDPNp3pZocR+ JcqkyjQEy3rCIMfIJZxPnPonwMd+ZEXrQm/BrAN2C2Uxte56+xHWcHfWgntpsWCJBgU1 R/DFtcDz9kFhvMkJnMq7HGx5JC99iYGivSzBezFtUi69cJ1e+0QmS2ZyQZ8qt934a0Ae c2lgP0CfgsqS16DRPPNCOBcKtE4dDmU5ltrSNxsYGQu4OB5BdKSknRBS08lVsnfNNWTb upWvlAhvoDgYRxUZVRtO4W6kod1ZodO48k4WqZLKvxhzajpQFYzm8xfV4IuiEXzLO+Wc OW/A== X-Gm-Message-State: AOJu0YxWqEZ5BUW1n30Vb1uWpuEktm5ZRFDucN0ULuI1Hugyiyz2zwLR +B/gntGMIFwX7z/VNRDbSfQhpvrzAaqzO3J5K0XP4uxpoLI9FNe5GLhBBZjmOOjWACqTw/S34Nb PZxmc X-Gm-Gg: ASbGnctiUxlOJdLzJKpUVGSRhmAs3eSX4sndKlPMq6WQW8kgCqQk8wRfZbss9BPEqBp Tvx96kJNmi0fw/owbpFUY2HB53DyVcZNxXvEj58O8JdioczofNN//gfqyLWlcB1XWESQ6Tw+8Js MdDDgokWCZWejxpbgZThSVBhBcfKN83OVMpmHhm+U9a7dFQ44OFC/iMdfpxhu+fP5fR9ctBEGIY x420J/bXnBL+ewugu/xh8mgJzum/Qc+TF5XuwsPH3LQ2KN8lYM1+7zNCZiHBqj4GDu38c8t2zIt K6vz3eBX1qmiM1JFKJrWKzZTiBQqsE1/ySFcmfG4qgyPNVfL2IJ4giXlc7ZC+EGkaoexVAX6wF5 agvE3u3ZAm9Iwifycv/Dk7cAucwswxQ7uTlLM X-Google-Smtp-Source: AGHT+IGt+hN6QhdH8hKFCVkO4jTWulC9IJ1I0tIA0BlYCZoOOrf5ORdSOfgPjNgKAX8CHSeqYE/nlA== X-Received: by 2002:a05:600c:1d14:b0:43c:e7ae:4bcf with SMTP id 5b1f17b1804b1-4536b4be314mr77860915e9.0.1750681189099; Mon, 23 Jun 2025 05:19:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 12/26] target/arm: Restrict system register properties to system binary Date: Mon, 23 Jun 2025 14:18:31 +0200 Message-ID: <20250623121845.7214-13-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1750681727926116600 Do not expose the following system-specific properties on user-mode binaries: - psci-conduit - cntfrq (ARM_FEATURE_GENERIC_TIMER) - rvbar (ARM_FEATURE_V8) - has-mpu (ARM_FEATURE_PMSA) - pmsav7-dregion (ARM_FEATURE_PMSA) - reset-cbar (ARM_FEATURE_CBAR) - reset-hivecs (ARM_FEATURE_M) - init-nsvtor (ARM_FEATURE_M) - init-svtor (ARM_FEATURE_M_SECURITY) - idau (ARM_FEATURE_M_SECURITY) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/cpu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index eb0639de719..e5b70f5de81 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1500,6 +1500,7 @@ static void arm_cpu_initfn(Object *obj) * 0 means "unset, use the default value". That default might vary dependi= ng * on the CPU type, and is set in the realize fn. */ +#ifndef CONFIG_USER_ONLY static const Property arm_cpu_gt_cntfrq_property =3D DEFINE_PROP_UINT64("cntfrq", ARMCPU, gt_cntfrq_hz, 0); =20 @@ -1509,7 +1510,6 @@ static const Property arm_cpu_reset_cbar_property =3D static const Property arm_cpu_reset_hivecs_property =3D DEFINE_PROP_BOOL("reset-hivecs", ARMCPU, reset_hivecs, false); =20 -#ifndef CONFIG_USER_ONLY static const Property arm_cpu_has_el2_property =3D DEFINE_PROP_BOOL("has_el2", ARMCPU, has_el2, true); =20 @@ -1532,6 +1532,7 @@ static const Property arm_cpu_has_neon_property =3D static const Property arm_cpu_has_dsp_property =3D DEFINE_PROP_BOOL("dsp", ARMCPU, has_dsp, true); =20 +#ifndef CONFIG_USER_ONLY static const Property arm_cpu_has_mpu_property =3D DEFINE_PROP_BOOL("has-mpu", ARMCPU, has_mpu, true); =20 @@ -1544,6 +1545,7 @@ static const Property arm_cpu_pmsav7_dregion_property= =3D DEFINE_PROP_UNSIGNED_NODEFAULT("pmsav7-dregion", ARMCPU, pmsav7_dregion, qdev_prop_uint32, uint32_t); +#endif =20 static bool arm_get_pmu(Object *obj, Error **errp) { @@ -1731,6 +1733,7 @@ static void arm_cpu_post_init(Object *obj) "Set on/off to enable/disable aarc= h64 " "execution state "); } +#ifndef CONFIG_USER_ONLY if (arm_feature(&cpu->env, ARM_FEATURE_CBAR) || arm_feature(&cpu->env, ARM_FEATURE_CBAR_RO)) { qdev_property_add_static(DEVICE(obj), &arm_cpu_reset_cbar_property= ); @@ -1746,7 +1749,6 @@ static void arm_cpu_post_init(Object *obj) OBJ_PROP_FLAG_READWRITE); } =20 -#ifndef CONFIG_USER_ONLY if (arm_feature(&cpu->env, ARM_FEATURE_EL3)) { /* Add the has_el3 state CPU property only if EL3 is allowed. Thi= s will * prevent "has_el3" from existing on CPUs which cannot support EL= 3. @@ -1818,6 +1820,7 @@ static void arm_cpu_post_init(Object *obj) qdev_property_add_static(DEVICE(obj), &arm_cpu_has_dsp_property); } =20 +#ifndef CONFIG_USER_ONLY if (arm_feature(&cpu->env, ARM_FEATURE_PMSA)) { qdev_property_add_static(DEVICE(obj), &arm_cpu_has_mpu_property); if (arm_feature(&cpu->env, ARM_FEATURE_V7)) { @@ -1854,8 +1857,6 @@ static void arm_cpu_post_init(Object *obj) &cpu->psci_conduit, OBJ_PROP_FLAG_READWRITE); =20 - qdev_property_add_static(DEVICE(obj), &arm_cpu_cfgend_property); - if (arm_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER)) { qdev_property_add_static(DEVICE(cpu), &arm_cpu_gt_cntfrq_property); } @@ -1864,7 +1865,6 @@ static void arm_cpu_post_init(Object *obj) kvm_arm_add_vcpu_properties(cpu); } =20 -#ifndef CONFIG_USER_ONLY if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64) && cpu_isar_feature(aa64_mte, cpu)) { object_property_add_link(obj, "tag-memory", @@ -1882,6 +1882,7 @@ static void arm_cpu_post_init(Object *obj) } } #endif + qdev_property_add_static(DEVICE(obj), &arm_cpu_cfgend_property); } =20 static void arm_cpu_finalizefn(Object *obj) --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681409; cv=none; d=zohomail.com; s=zohoarc; b=Q6nWTOV4iSBzgMzS2ClI+MkE7WwHskOfZi5PNEHsXLXZnQ6SNMdethdbJ1GIaxEQrY6xu5RcWhur/cqIx05jDNlCiH3h7xXXILQc0drSL4K9IgeH4+Uh1Nfj7T0CcW4y9gms9XJFqoWSoNXwL6LjMLPsuhmZCC7p3/GhBknu/nQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681409; h=Content-Type: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=n9TcP7uZ8sj3k25ApWupc8E4+ydRbD8zQYT0ugNh7kc=; b=U+w4ryuVVxmHMRpe59HYRbiU01Hz4TIXzFSK7IeU/F6hOouhfM0JkeDdOEJE+00Axh7UK9TqVhOcvNrAd+C0igOJDWYtNAmFUovg+w89zQV5SvNS6Xf9BhU/Okb0mutAIKIx7OHoPq28VOH1UiUETu1xNZ/LN6eGkFsZj2irV4M= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681409667405.0475543709009; Mon, 23 Jun 2025 05:23:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg9c-0001nM-DC; Mon, 23 Jun 2025 08:20:04 -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 1uTg9Y-0001ga-H5 for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:00 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg9W-0000dG-DO for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:00 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3a5123c1533so2047569f8f.2 for ; Mon, 23 Jun 2025 05:19:55 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d0f10385sm9537215f8f.17.2025.06.23.05.19.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681194; x=1751285994; 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=n9TcP7uZ8sj3k25ApWupc8E4+ydRbD8zQYT0ugNh7kc=; b=x0a+n3xsCkbXf+3bMpES750By6XlLaP2v+7WFgtu95XgvW8nEk0A47TaHGkTbmZ7w8 rMpOt9jt3N/JbPrPLByBUZuMdOnXbjLzrF3z5kfoNvTzS8NYdyMfYyjBbVccsI7sWSHD YKwUrl9nYRBDaQY1TJUN7nNS/7R5j0kaJ220SJEQHQBuxs/ANgyfXmw8a/HIxfzRAQJU 8wSmUP46V6maUxp4tqf64+XpFTa4DFZhFKf9XGmqD+hWhYPskYP9ubfQlpMhTnWaH4AH B/rGWZJHqKjqxAtRH+h3KRPmD2NTMZukqbVX4NX2YuHIrp2CEsni5fbAF22NP9yUZMfV 8PRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681194; x=1751285994; 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=n9TcP7uZ8sj3k25ApWupc8E4+ydRbD8zQYT0ugNh7kc=; b=vGuoiIPFB/lnGfWGQkUGlMW5o1vvD1n2SLvBxMMD5iRafUaAanuWQ1G4KOBsODbeR3 JQS4GbdKjsYynGF5LWflaTW4RjEATCo0SCskVGgagoywBoPXJwTJCh10nZL6v8VU9v75 gXpkEHXEwQ/yJ6yKbwZFTSFszu0lCzSVBOZGmZ1fmM0aaGWO0LSK5InlQAr3ug4Zry7F E7iULL2PNQngih+T3Weh93TUeK48GaLvQAaIbLxrXlg0sE/VH1cEAl8uQ5tPLTdl90RU l+SPyBEPvdJgYdCRUrNWfTFAYiatlaMTXglbgR7T7e4xBliIxYlZllPdNu9rPS6wMF71 /tCw== X-Gm-Message-State: AOJu0YyoWbXzGhJaQYYLZX++Wgnb/L1Vw1CZoi5OfT7grnK6NcM/Q/5t cG8RXW0As77z8wi3GdXPNjQimVtUHtndhMS9V7Ku+JnoH7kdeZlyWrtnrxdkpe7WZQBopP4tjZw cdu7M X-Gm-Gg: ASbGnctDhrHIrCw6RdG25virl1XlPxWfhlHzFSXH8FVYGMoGNNDbZTY06/r2kYaHtPj TmObWO3rsb+Ec22K/JvWgUWjdSUm7ykJJhLE8MSvS7cPqYxrCWOGQ+Xc47p6LT7bK5N1MpBV9VQ wfVqSIYT83ORGha/Gydf88jQyBxXGvahAgOJEnOJXl1adNPjIaRos329vqXX8RWkMyGY4nphmom zKvES7JQRpbEALbVDVJshUrldFr/f4VQ6pBKeXKrkKLfH5DWcydpUWvVRNONQ3doysCRk+Soadw e79GydfDPph5u6LPQhAe8WiOzxmzuFBgTj7j1dhN25yaO7hmvSaj32pbWqoHgkPoMsgzwOQQAPM ykX/zpf61ubsWSKkemgLH57PhqStmMdEUPUX4 X-Google-Smtp-Source: AGHT+IEHiq/SjlZG6KJQYhM0dN6HzIW1qJU45zGcdqrFfg265NhL0FAhAnfqOQcq/6jydwJBpJn65g== X-Received: by 2002:adf:e187:0:b0:3a4:f723:3e73 with SMTP id ffacd0b85a97d-3a6d129ccdbmr8492187f8f.16.1750681194323; Mon, 23 Jun 2025 05:19:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 13/26] target/arm: Create GTimers *after* features finalized / accel realized Date: Mon, 23 Jun 2025 14:18:32 +0200 Message-ID: <20250623121845.7214-14-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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 @linaro.org) X-ZM-MESSAGEID: 1750681410079116600 Call generic (including accelerator) cpu_realize() handlers *before* setting @gt_cntfrq_hz default Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/cpu.c | 65 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index e5b70f5de81..ab5fbd9b40b 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1985,26 +1985,6 @@ static void arm_cpu_realizefn(DeviceState *dev, Erro= r **errp) return; } =20 - if (!cpu->gt_cntfrq_hz) { - /* - * 0 means "the board didn't set a value, use the default". (We al= so - * get here for the CONFIG_USER_ONLY case.) - * ARMv8.6 and later CPUs architecturally must use a 1GHz timer; b= efore - * that it was an IMPDEF choice, and QEMU initially picked 62.5MHz, - * which gives a 16ns tick period. - * - * We will use the back-compat value: - * - for QEMU CPU types added before we standardized on 1GHz - * - for versioned machine types with a version of 9.0 or earlier - */ - if (arm_feature(env, ARM_FEATURE_BACKCOMPAT_CNTFRQ) || - cpu->backcompat_cntfrq) { - cpu->gt_cntfrq_hz =3D GTIMER_BACKCOMPAT_HZ; - } else { - cpu->gt_cntfrq_hz =3D GTIMER_DEFAULT_HZ; - } - } - #ifndef CONFIG_USER_ONLY /* The NVIC and M-profile CPU are two halves of a single piece of * hardware; trying to use one without the other is a command line @@ -2051,7 +2031,40 @@ static void arm_cpu_realizefn(DeviceState *dev, Erro= r **errp) return; } } +#endif =20 + cpu_exec_realizefn(cs, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); + return; + } + + arm_cpu_finalize_features(cpu, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); + return; + } + +#ifndef CONFIG_USER_ONLY + if (!cpu->gt_cntfrq_hz) { + /* + * 0 means "the board didn't set a value, use the default". (We al= so + * get here for the CONFIG_USER_ONLY case.) + * ARMv8.6 and later CPUs architecturally must use a 1GHz timer; b= efore + * that it was an IMPDEF choice, and QEMU initially picked 62.5MHz, + * which gives a 16ns tick period. + * + * We will use the back-compat value: + * - for QEMU CPU types added before we standardized on 1GHz + * - for versioned machine types with a version of 9.0 or earlier + */ + if (arm_feature(env, ARM_FEATURE_BACKCOMPAT_CNTFRQ) || + cpu->backcompat_cntfrq) { + cpu->gt_cntfrq_hz =3D GTIMER_BACKCOMPAT_HZ; + } else { + cpu->gt_cntfrq_hz =3D GTIMER_DEFAULT_HZ; + } + } { uint64_t scale =3D gt_cntfrq_period_ns(cpu); =20 @@ -2072,18 +2085,6 @@ static void arm_cpu_realizefn(DeviceState *dev, Erro= r **errp) } #endif =20 - cpu_exec_realizefn(cs, &local_err); - if (local_err !=3D NULL) { - error_propagate(errp, local_err); - return; - } - - arm_cpu_finalize_features(cpu, &local_err); - if (local_err !=3D NULL) { - error_propagate(errp, local_err); - return; - } - #ifdef CONFIG_USER_ONLY /* * User mode relies on IC IVAU instructions to catch modification of --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681349; cv=none; d=zohomail.com; s=zohoarc; b=SdKoiYq5ZBL7aK9E7q+8tnsxDNrxXRbo9xME5r6o1510LUx8Td2iJlyZeTpWgCgG+sv+ogdeXsl4wlQV8K0e+h1MncWfQflcfxE2f+n2bLNg3yb09qmWTlj+8ZFjoQRhLQ7NeB94Si/0OcZsn3szzDDhoYZozkErvV46d4wM5gs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681349; h=Content-Type: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=FOQFF5IHVggEpZxvhH4Dg2y5NDppFE2+idPk4kXeUTw=; b=nXspc0jo4gJdyDCMUpQfzOh8FjUxidkPWUwRN45p/An2o2rxUvboVPru9VV48I9jlt/sIIFsLZ0sSm2xl5hevdbi+YHGvM3CfeOJuSAncXkcBQegl8Gyl7OR783iUR9M6wy+wThLBYhuiJKMu7ffMV1wYDBCaug4LeH1FABNZzM= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681349403506.6563730416451; Mon, 23 Jun 2025 05:22:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg9v-0001tC-UR; Mon, 23 Jun 2025 08:20:25 -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 1uTg9b-0001nK-SD for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:04 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg9Z-0000eP-Et for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:03 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-450ce3a2dd5so39605965e9.3 for ; Mon, 23 Jun 2025 05:20:00 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535e983a4bsm143750295e9.13.2025.06.23.05.19.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681199; x=1751285999; 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=FOQFF5IHVggEpZxvhH4Dg2y5NDppFE2+idPk4kXeUTw=; b=Lg93oGuIPq0JN46UiRmfrBt6QAv3GHEnlERsl4GztJMG0oxnIYxt1cn71Q//y69X8d 3+Ds9QPyt3nRcmgjRdKNBXLJ34ou2/onU+3t4dq8XobTh/GmNbkzer6IUsYIfZmTWGvv f9tQ/USw+bg1z0cuxbOoPiwi0Cx7HOXWhnCN7Jq2m6EgUakE3gaVVxry4vrNFUCutMYZ 818vdcbKlPErsyhVpFWR5oULt1RJkoIQ+bFNxLM9D3jV85TFXnNb4OB14/K8cH3lIrhF DS2Lb5R550PRUthJIghrHVt5qVJ/o095lVGcUaSqO/rWyjCcnoKIekgnVyQROJl7EpPs 1wyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681199; x=1751285999; 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=FOQFF5IHVggEpZxvhH4Dg2y5NDppFE2+idPk4kXeUTw=; b=XLEgrwYqK0tnnARd9qCy2U+4Mh1cIuBm2TSyOeE4S7vmpKqjZgdtnmkGz00K+ItBx1 PQfEgAC9wWt0edkcvBIQmAm2qpuRGgfTL5tVLj3ngwO7HV99efHBKOJJ0aMWXDFhCJLA obWQjBdgjhjF9jJ72YGqQ2aiwS4NCYnJyCqE+7GG3JFXa024k7Y6GlqF/qe+zZNN3+O+ JEoql4dHvZGnq7BETsg+6y9nN2yqhDjBOn2v5lJNaa45RVsPDG5ZQGVGY8/kzfsPv3i9 /4qLvi++gBVitvj3+tRzuKW5rDNMvnqJy7sIrClFrVnbOtu9dse+t27XWbOkiZzGxaTi xqXA== X-Gm-Message-State: AOJu0YzsAXD/Djml0o7n2iJRHxkCsPdVpzRm5K4XSranCSLMwt6jY+Pw 6KJFRQXnnYh6fKQMtlCGihrYr0drFP95ZwXkwWg1esF0R3Yl++XfmaeID/aAui38fFZ7fqwLH8c pluTu X-Gm-Gg: ASbGncsw7C4QaDzwmab2iUCALxnQJkdtsIvFFEvTsK+EsoFdr5A8dF/I2bNB4Oe3tQq TYmHsGj8SydvHVypHMOgY4793BCuXbI0u4VqOqZeFXebKjStH3G2Vl09CbYBap7GXxcKo/gsRp+ 8cZzUb9MKGECbKwt1fgctYKmfizWg3XEfwehCtoxYpsL+zHZbvDfto0tjjYNjV8CMdjDShFHeTX DxhaHN5qllREsrVo1KyUydgLgBMJj9nY+Xj5EeDgc2+gN5oHFYZj/91qLduvuDk6Dz8sUEisv1z ullNRUmycuvQEm/AZ7fUxQXLAihv9SPd0UYi3YkTJGm+1CjoCnQwF5ZFW5jf168ILQj1SbN9uHI /CsASLNO3RZPmbXQZxrFWTNyKEpNJxowCaxXk X-Google-Smtp-Source: AGHT+IFwQfth961QDPwmcQSOPunexZxZtRH6B1UX0+3skNQVMIAOIVx+CTDwFZCmfuogwrFQqEjVTQ== X-Received: by 2002:a05:600c:1c28:b0:442:ccf0:41e6 with SMTP id 5b1f17b1804b1-453656c2172mr118658905e9.3.1750681199364; Mon, 23 Jun 2025 05:19:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 14/26] accel: Keep reference to AccelOpsClass in AccelClass Date: Mon, 23 Jun 2025 14:18:33 +0200 Message-ID: <20250623121845.7214-15-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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 @linaro.org) X-ZM-MESSAGEID: 1750681351222116600 Allow dereferencing AccelOpsClass outside of accel/accel-system.c. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- include/qemu/accel.h | 3 +++ include/system/accel-ops.h | 3 ++- accel/accel-common.c | 1 + accel/accel-system.c | 3 ++- accel/tcg/tcg-accel-ops.c | 4 +++- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/qemu/accel.h b/include/qemu/accel.h index fbd3d897fef..9dea3145429 100644 --- a/include/qemu/accel.h +++ b/include/qemu/accel.h @@ -37,6 +37,9 @@ typedef struct AccelClass { /*< public >*/ =20 const char *name; + /* Cached by accel_init_ops_interfaces() when created */ + AccelOpsClass *ops; + int (*init_machine)(MachineState *ms); bool (*cpu_common_realize)(CPUState *cpu, Error **errp); void (*cpu_common_unrealize)(CPUState *cpu); diff --git a/include/system/accel-ops.h b/include/system/accel-ops.h index 4c99d25aeff..44b37592d02 100644 --- a/include/system/accel-ops.h +++ b/include/system/accel-ops.h @@ -10,6 +10,7 @@ #ifndef ACCEL_OPS_H #define ACCEL_OPS_H =20 +#include "qemu/accel.h" #include "exec/vaddr.h" #include "qom/object.h" =20 @@ -31,7 +32,7 @@ struct AccelOpsClass { /*< public >*/ =20 /* initialization function called when accel is chosen */ - void (*ops_init)(AccelOpsClass *ops); + void (*ops_init)(AccelClass *ac); =20 bool (*cpus_are_resettable)(void); void (*cpu_reset_hold)(CPUState *cpu); diff --git a/accel/accel-common.c b/accel/accel-common.c index 4894b98d64a..56d88940f92 100644 --- a/accel/accel-common.c +++ b/accel/accel-common.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "qemu/accel.h" #include "qemu/target-info.h" +#include "system/accel-ops.h" #include "accel/accel-cpu.h" #include "accel-internal.h" =20 diff --git a/accel/accel-system.c b/accel/accel-system.c index a0f562ae9ff..64bc991b1ce 100644 --- a/accel/accel-system.c +++ b/accel/accel-system.c @@ -85,8 +85,9 @@ void accel_init_ops_interfaces(AccelClass *ac) * non-NULL create_vcpu_thread operation. */ ops =3D ACCEL_OPS_CLASS(oc); + ac->ops =3D ops; if (ops->ops_init) { - ops->ops_init(ops); + ops->ops_init(ac); } cpus_register_accel(ops); } diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index b24d6a75625..da2e22a7dff 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -198,8 +198,10 @@ static inline void tcg_remove_all_breakpoints(CPUState= *cpu) cpu_watchpoint_remove_all(cpu, BP_GDB); } =20 -static void tcg_accel_ops_init(AccelOpsClass *ops) +static void tcg_accel_ops_init(AccelClass *ac) { + AccelOpsClass *ops =3D ac->ops; + if (qemu_tcg_mttcg_enabled()) { ops->create_vcpu_thread =3D mttcg_start_vcpu_thread; ops->kick_vcpu_thread =3D mttcg_kick_vcpu_thread; --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681405; cv=none; d=zohomail.com; s=zohoarc; b=FVQncYx8D9/VL4c5geTIVrP517sSCdQdht+UxxSWEYEOTXJ7hkJWGP/gxuYoEO8dwEhZHL7u0F6z8RpAInqByMiIPOIaVCf7ujh/3wUGG+0q9t2ZvoxlYnwcs7aYnIc0VcIcdIfY/9OwIQLJpNNtirrGcXWT3COIjG0qy2HHf28= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681405; h=Content-Type: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=Y/J3/dM6yL9EpwD8nNu/ZbysHMLeoDjMiAJQk/DeNw0=; b=Y9wVIX2FDl58IK+l/8Y12nFRqyLafzZ0W5dyN3oekaxtKRHYIpgko/YDHq7FDqtQIKnO7XfZ+PGetFZKe0aI3pMUHEr5IMxXSSq2fMXuORNRpP2M2NYNiDCh4tS7CNR62IN800uW187JnWxdVWmGq5wkUCy9n89ji7TUcU5MXj8= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681405560456.5714666578082; Mon, 23 Jun 2025 05:23:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTgA3-0002dq-Vk; Mon, 23 Jun 2025 08:20:32 -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 1uTg9k-0001x9-KS for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:23 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg9g-0000qS-Mb for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:11 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-451e2f0d9c2so26777995e9.1 for ; Mon, 23 Jun 2025 05:20:06 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-453646cb5a8sm111194065e9.7.2025.06.23.05.20.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:20:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681204; x=1751286004; 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=Y/J3/dM6yL9EpwD8nNu/ZbysHMLeoDjMiAJQk/DeNw0=; b=KgaASy3nVLvcI2me5+vujIHmE7E2WozMXAiBpCEtezJAuVbbqIi2AOlqZ3V3Z/yzmF KDoGDwCcyNTrHycC64vykuezXGrthIKd/77oG0zb8YwgyOpBV6+JLKbFI42+BVXaPUaJ ySwsyHQWz0IsC/wW3APZQnBZKnfwPr5BENbZGQKzkT0XpMG9K2zKIjm5MB7dovfQ+xLI E6+QvskUS0I5bQKa0SyQ6Jqdb6w5qG6dmXN9NGtLFL2gZ4nsvsW3EY0VrYVx0OUmgloD jlQb6WGeq1BlWH42Sq8X4/vJw6wqrT5O+ImYT8ZII2NNXSvtmNOkEzsU5iZC7l3bws3U uV/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681204; x=1751286004; 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=Y/J3/dM6yL9EpwD8nNu/ZbysHMLeoDjMiAJQk/DeNw0=; b=fQaOnnh/hq67aSkix1XQtakqO17mAIhu08uBSpZ0j3YQ90aYcy8NzbWpYMUyGNljxU O09jEYk7AX0evFjpZ1uWEH92i/BGNgtFUDWuhwjfFhPGuxNTgNeNtDQ2JoSRepsKVp2f UUQLRCHEU3+IFRalGPTUGjPo4KZMT4DZQZrIRM/tS3HC7lS9TcHJ/+KlBxaVPcWHa0FW MAWPXwpElYN1A6dGXwEjO5gAxTLweQ6CAax+B+JrRhEds3yz1bX9NJvbI99u29Zq3/6T F1OpuQLqtciWJt+aFwvSRqGCh+qyLzBAmzS0C9w7UmDSlOf2+YlicxGzZ6tHP67Teruz uaoQ== X-Gm-Message-State: AOJu0Yx0K9WYw5UtJr4W45oExPXiA1BnIlsbGWFtkXPw/IJCHZ8MoL5l CVR0TNZ1wySH6EKBeKDnIFU2qEvL4Fy2pmtQul0Sogy50wcelOlGRP2Bo8a7OdjAhNx6q6lsO3S uCX19 X-Gm-Gg: ASbGncvX7Hmna5ng60RQcJF1kbjhTjvg6X02W4r/fs5jgaqxaObrCG9NZYdsnvu2tpI W0l9Oan/uY/d1dg8DlM1baqql+bI+UKJ2vwIj9qu/4pURxo2V63j4OjCUa0oWBSb9Akf8HL/EF0 f8ZGmFP8HPBbfemRDZ80cWhG1kLB579nh2MSfGtxwF1LptTvurFmWBWASICyTqIUdlYAyD6o2gI vhGVfBjz0pJKvj2OIna2Kn7jhalTUtom0EP23EH0BYlhKoFfGiWB7b8bt1VBwOW+7ppmKK8atn0 bRYo3tRchoNjIrXK0qk6uPdajJ5QVliDNOkLUtfuaZqG1+ig6im6plet+JOknl+rT0X5uqCERxy MpD4mpfKMqQZt/YAuogASG4qjsQ6hv/GE9qKo X-Google-Smtp-Source: AGHT+IEDBLzyvotQDHdgeUadRfrLThtjSEX8cwJuz2mnLVjDK+hMLUAuzhTdSt0x3jQyPiQhQl7KNg== X-Received: by 2002:a05:600c:1d27:b0:453:10c1:cb21 with SMTP id 5b1f17b1804b1-45365e3dffamr107598715e9.8.1750681204506; Mon, 23 Jun 2025 05:20:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 15/26] accel: Introduce AccelOpsClass::cpu_target_realize() hook Date: Mon, 23 Jun 2025 14:18:34 +0200 Message-ID: <20250623121845.7214-16-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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 @linaro.org) X-ZM-MESSAGEID: 1750681405928116600 Allow accelerators to set vCPU properties before its realization. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/system/accel-ops.h | 1 + accel/accel-common.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/include/system/accel-ops.h b/include/system/accel-ops.h index 44b37592d02..a863fe59388 100644 --- a/include/system/accel-ops.h +++ b/include/system/accel-ops.h @@ -35,6 +35,7 @@ struct AccelOpsClass { void (*ops_init)(AccelClass *ac); =20 bool (*cpus_are_resettable)(void); + bool (*cpu_target_realize)(CPUState *cpu, Error **errp); void (*cpu_reset_hold)(CPUState *cpu); =20 void (*create_vcpu_thread)(CPUState *cpu); /* MANDATORY NON-NULL */ diff --git a/accel/accel-common.c b/accel/accel-common.c index 56d88940f92..55d21b63a48 100644 --- a/accel/accel-common.c +++ b/accel/accel-common.c @@ -105,6 +105,9 @@ bool accel_cpu_common_realize(CPUState *cpu, Error **er= rp) if (acc->cpu_common_realize && !acc->cpu_common_realize(cpu, errp)) { return false; } + if (acc->ops->cpu_target_realize && !acc->ops->cpu_target_realize(cpu,= errp)) { + return false; + } =20 return true; } --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681421; cv=none; d=zohomail.com; s=zohoarc; b=CqgXcMdQi0soXFMdbEXSIl75+JWLAiI6XjS9PgF2O42nU5tYuh4CoNFPfS5s5V3vApNN7sErXbDTSYKsbOG5KW4RvL4Q+kNgbo6Mvb2BccVXlIc9sA3iPKgmZh3yDI4t+qSV3T9+x8bPR8H8/MQzsY12N5GjVfYSfqU9PJ4Tz2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681421; h=Content-Type: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=+zn98SRXtaFwoihOhnAeEFS9N5zUhWDF7TNyGo/TLss=; b=a3OX3VQYloNjCVMZMkA8L/twAUooBlv7Svo+copxYNa9C503CVU9flty5yRg9aq9+pz0Bmz0hMg8xL9A4qc1SIu5+v6CcZp7S3WmcbhK6357gwt5ltYhcN8uSc075ncvZaquANxoXts9C1tEA2SJ56/n9J0ML637yNvFfviYIEE= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681421745156.78334708575846; Mon, 23 Jun 2025 05:23:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg9z-0002Li-GS; Mon, 23 Jun 2025 08:20:27 -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 1uTg9n-00022D-Ku for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:23 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg9k-0000t6-DS for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:14 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4536b8c183cso10208715e9.0 for ; Mon, 23 Jun 2025 05:20:11 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d0f1d168sm9202901f8f.40.2025.06.23.05.20.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:20:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681210; x=1751286010; 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=+zn98SRXtaFwoihOhnAeEFS9N5zUhWDF7TNyGo/TLss=; b=kSJ0gjZnx0yOTCKTTQOLPN/Gd2ncbknKSir+rJgpmyGzmvzVPpWAIQ0zE6Vl+CpWnc OpF3jKw59AjYvrUN6ODLwNNMjHSlhjPNV57gGLvHmxuz6qn3DZ3OsLjb0C3ybLoDmOiU adFJknYEUBlSUhAO12XtexnOTwGJzOGLvNp2r1cBTPqw2yEo5ozGlZLkCd7I86lRfPsk eOsXAeY1anWA2hNYe2AsxuJor/97WGSKVamUe73ikHtES1HGm/1NX2ODA8SO9YuIDWgc NeCC07cSfpWsAOg0VWlw9lV548psaBl2CNwgKbW3BzCoo76/iKo9LcAx0D0SweaN7Pjd uPbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681210; x=1751286010; 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=+zn98SRXtaFwoihOhnAeEFS9N5zUhWDF7TNyGo/TLss=; b=dsJ5PxTmmbuHKU0aDXkgmKHZD6bovBKu6M/ZF3woZFqpS4rhGDbaVOAf+ZgQNIJ4J3 FgDIKVH1PhPHcZnHHRjXvscsIOS6zsu5vTrvZh6Qcnq5hJucDA/TJJJb+A0PBchrXDm4 /68jW6XC1jXRZmfiJJcjLX49FyuvqPud/Mydqq5ctjULqYbAggWROJHplI5JSm0VqmnO cQF93VAoD5NN3qEhLFJqgD70d29NxjJ2wFqQJ3vfrmw351D46wg0XvCBZfKhXnymkcDX HVr3DxmOl6g5UhoXirvZno/TdPw5tbc6FncIba7WHCZJy1I48UcxaACqfpP66tJHactE YrqQ== X-Gm-Message-State: AOJu0YzD/xFBMHpcwHiAsDjybHY/lvidcDYnafthBZdSvGPNvKHQktcQ qb9HiP42XcZDNfzSQ27zh3DuHIMP5fjPmOja3Dp4CSKuwCnI6l22vERc7e7VuL8msLHzDM20iIb Mtgyg X-Gm-Gg: ASbGncs2GiU1e7oIJdjTXI1W0tc46xaJesJjxjghDqbRsM+Mek1S8GxI25nA0HvbjHq vAQUafZyhr1L10M15QS/zYRmGjlaEFovD4s+81EhPuJcK20x0J5VoSPy60s98IumX5mf8JcdwUC h37WYyY8ltvCNHzsTNj9lkOdHu3ozpgqAOKOo7NjJlA0FYrpIhNcrDIIhWz4hIYpLsILzoK81jn HHyhXwBMb+i9HcL6IdKKaLhG5rRJF+LdpZXF8/9FlUAL3HQnUTDjae2Wv37s0jVa26+Jk2LJN6+ yzbdeNEZ0KQjCLuOLrzhBYYzTG1bsFs5o3UBf0CU7IVTtXeUPok9/mYPp+gB4qDkKARm2SZvOoq 8QZRp+HP/meM10HckSogmc9UlBoAgOjD77vMX X-Google-Smtp-Source: AGHT+IFhxvf0pVdM4spy0FqKxphN+wj0nPLNYA/H7sLORxDSPVaYXm5uBRM12Jr6vzicVX+Kk0gVwg== X-Received: by 2002:a05:600c:3b19:b0:442:d9fb:d9a5 with SMTP id 5b1f17b1804b1-45365e5e41dmr102028495e9.9.1750681209616; Mon, 23 Jun 2025 05:20:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 16/26] accel/hvf: Add hvf_arch_cpu_realize() stubs Date: Mon, 23 Jun 2025 14:18:35 +0200 Message-ID: <20250623121845.7214-17-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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 @linaro.org) X-ZM-MESSAGEID: 1750681428402116600 Implement HVF AccelOpsClass::cpu_target_realize() hook as empty stubs. Target implementations will come separately. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/system/hvf.h | 3 +++ accel/hvf/hvf-accel-ops.c | 2 ++ target/arm/hvf/hvf.c | 5 +++++ target/i386/hvf/hvf.c | 5 +++++ 4 files changed, 15 insertions(+) diff --git a/include/system/hvf.h b/include/system/hvf.h index a9a502f0c8f..8c4409a13f1 100644 --- a/include/system/hvf.h +++ b/include/system/hvf.h @@ -72,6 +72,9 @@ void hvf_arch_update_guest_debug(CPUState *cpu); * Return whether the guest supports debugging. */ bool hvf_arch_supports_guest_debug(void); + +bool hvf_arch_cpu_realize(CPUState *cpu, Error **errp); + #endif /* COMPILING_PER_TARGET */ =20 #endif diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index b38977207d2..b9511103a75 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -588,6 +588,8 @@ static void hvf_accel_ops_class_init(ObjectClass *oc, c= onst void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); =20 + ops->cpu_target_realize =3D hvf_arch_cpu_realize; + ops->create_vcpu_thread =3D hvf_start_vcpu_thread; ops->kick_vcpu_thread =3D hvf_kick_vcpu_thread; =20 diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index b932134a833..fd493f45af1 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1082,6 +1082,11 @@ int hvf_arch_init_vcpu(CPUState *cpu) return 0; } =20 +bool hvf_arch_cpu_realize(CPUState *cs, Error **errp) +{ + return true; +} + void hvf_kick_vcpu_thread(CPUState *cpu) { cpus_kick_thread(cpu); diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 99e37a33e50..28484496710 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -367,6 +367,11 @@ int hvf_arch_init_vcpu(CPUState *cpu) return 0; } =20 +bool hvf_arch_cpu_realize(CPUState *cs, Error **errp) +{ + return true; +} + static void hvf_store_events(CPUState *cpu, uint32_t ins_len, uint64_t idt= vec_info) { X86CPU *x86_cpu =3D X86_CPU(cpu); --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681803; cv=none; d=zohomail.com; s=zohoarc; b=kbAZ40iNMvQVizvmLTubOwi3Inc7jMAzHAKvwap5gqjCWJa/1OUl2hvPtCQvxhcCj2YGaAA/0Wuo6WVesHCLQ1MZ1nRd0Bqn0l08lQVutmJjM66VJ0IL3lqdBhiyt2Yc+jUxhI3SpQ5qvLzh8QDrVLR5B94lEMRzb5PD/TITO5o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681803; h=Content-Type: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=NW0Hu04oFurHIvjEpsNrwT15qBihdHLv3c5t8qKFRhE=; b=X0DVg/LtQLKU1YazO/2KLPEi+hUiS5gf3HaqMDHzi+RmpZo37tO+L/hb9T9YRiQ2FQJHb2+oAaRR8krFoucXhJJ7RSy5ENgKbLDo9Zg7YkyZbRGveRhGxbPdMssWMdFSRb/2psIKJXxshV73yIJCTyR6iY2wvS6cCosjRVgEiNs= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681803266771.3571033171207; Mon, 23 Jun 2025 05:30:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTgAD-0002ud-Nz; Mon, 23 Jun 2025 08:20:41 -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 1uTg9w-0002CG-QC for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:25 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg9p-0000vh-Qg for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:22 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-451ebd3d149so21447425e9.2 for ; Mon, 23 Jun 2025 05:20:16 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45365af83easm103189385e9.25.2025.06.23.05.20.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:20:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681215; x=1751286015; 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=NW0Hu04oFurHIvjEpsNrwT15qBihdHLv3c5t8qKFRhE=; b=zP74SQHBdjUEUjjjBVAvJm2u8nRqZxe+Ertm9WgJn30t/CYBKYApUlz3RsyXqALheW xxHbYLypQRoxBSrEdfFGx0025urURyVxseog4HoM9oKDzS78c7K01cE9769CvP0q8ftH B1ScQqp77I1uan5dcIk2qpNAwDiWxUVDiLmBdQ6yXrqKWJX2aBpvidZYdxPInjvKYnTh oEdrQrVEN5egxl/p1eiziu3aWavoDv/W9IpDyrIIcZ+SZq677RRS6zPO5gi9lDdGrtAr WxHfd+Pa2vdaoJ9Tm+SbbdXewUYr/xsQccygajdA7NcFaFZjrhRpRNYA1fCUgBGn67Jn 9XYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681215; x=1751286015; 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=NW0Hu04oFurHIvjEpsNrwT15qBihdHLv3c5t8qKFRhE=; b=oRjFdatl5G9tEMSx856tzqnlHeylHWFaW3p+fPjbqochO6sQKiPIow42ZdsidpJY0F aPO5ZLgzjX8XqaP303Bwn3vA1+PbyK4ai4o00KqCGgNEpZw9uUSR2x7Zxw7WTbCxJjUP joPX9AATPeLGMdaCjdk4WHmRr5PH1/7okjYS+nMyRG/Hn6FkNS+aj+UinGz40kmSayax VxvnSp0qK1eeSc73YlOhjfhlAjZkWHgFWz6qXmWFJLjeRNDH3iGo3qnOKhukOFRPQN9a X85qNgnlvF0CTcMj3KDKVRYNl1e5YHXo7u1qWgfnOA8MGmrqxbR/4YEIIrEZVKZ3SerF rerw== X-Gm-Message-State: AOJu0YwEEHYeLK+BzlGhbKTDYvdawGxrzFng2s9xnKvrGILkRRBe+OQ3 ANvE8w1Qvw4q934UKFblOyTibmy9giiBojsRIOe3T9GBFTbOmyM59U67inZvPvgh0ggK0rjYLWW GWJ1x X-Gm-Gg: ASbGncuaiXBblC44ucLZ4yipYmI+2q/CJRVC3wiHtfihQ+nChC2WG38TDr+ktoq/BzZ 4u+9eE8vKMyNJMGfNHgmBUKCiWjT8EiwQr7b/sQ2+/743ur9BpkNUA+L3VrZE6pLe6kPnvEM7Li qSN4woWQdwJgJgu/n8m2wbbu5VtE9RdKgzJv48/slMZdG6LGkioz2zZN1QIsAdnjYpgHZgnHDt3 gCc0tnBNiOiHGai5A37mu4FoOYeWL+njnvrAadt6+FC032IivTAB3pBd/cgCTTQgUnO38Bts1MI vx/xZEOaL9WTljljHnql9piYPvnFwEoRXOs0wM0Xr9EHKCfSIKHLu/rJiBvDCuSYex7pQDD0oLO tmg/uQdf+qzxtZ16xNwsBE07SxSzf4iZoCP0p X-Google-Smtp-Source: AGHT+IFf+qYjcOwhbvT72NmXzsm0w8Ys9vtpByCOFfjMZimo/xqX2xIjROq90NsVmzqznUgThHB+QQ== X-Received: by 2002:a05:600c:548a:b0:442:e03b:589d with SMTP id 5b1f17b1804b1-453656c2b8emr119430815e9.24.1750681214699; Mon, 23 Jun 2025 05:20:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 17/26] target/arm/hvf: Really set Generic Timer counter frequency Date: Mon, 23 Jun 2025 14:18:36 +0200 Message-ID: <20250623121845.7214-18-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1750681804776116600 Setting ARMCPU::gt_cntfrq_hz in hvf_arch_init_vcpu() is not correct because the timers have already be initialized with the default frequency. Set it earlier in the AccelOpsClass::cpu_target_realize() handler instead, and assert the value is correct when reaching hvf_arch_init_vcpu(). Fixes: a1477da3dde ("hvf: Add Apple Silicon support") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/hvf/hvf.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index fd493f45af1..52199c4ff9d 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1004,6 +1004,13 @@ cleanup: return ret; } =20 +static uint64_t get_cntfrq_el0(void) +{ + uint64_t freq_hz =3D 0; + asm volatile("mrs %0, cntfrq_el0" : "=3Dr"(freq_hz)); + return freq_hz; +} + int hvf_arch_init_vcpu(CPUState *cpu) { ARMCPU *arm_cpu =3D ARM_CPU(cpu); @@ -1015,7 +1022,9 @@ int hvf_arch_init_vcpu(CPUState *cpu) int i; =20 env->aarch64 =3D true; - asm volatile("mrs %0, cntfrq_el0" : "=3Dr"(arm_cpu->gt_cntfrq_hz)); + + /* system count frequency sanity check */ + assert(arm_cpu->gt_cntfrq_hz =3D=3D get_cntfrq_el0()); =20 /* Allocate enough space for our sysreg sync */ arm_cpu->cpreg_indexes =3D g_renew(uint64_t, arm_cpu->cpreg_indexes, @@ -1084,6 +1093,10 @@ int hvf_arch_init_vcpu(CPUState *cpu) =20 bool hvf_arch_cpu_realize(CPUState *cs, Error **errp) { + ARMCPU *cpu =3D ARM_CPU(cs); + + cpu->gt_cntfrq_hz =3D get_cntfrq_el0(); + return true; } =20 --=20 2.49.0 From nobody Sat Nov 15 14:49:48 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681399; cv=none; d=zohomail.com; s=zohoarc; b=TvVCW47maBPwXhHlyDe4gstRpC1KwyWYm640agcvK0/0VsriH6CiHSiGtoTkqrCYFHEzyPnDjgtLQ21iq/YlScRnlT9wlA4CQxuGRv/gT45CEp7QsLf4byiV4EFa9EeLwlZ9gUx4Fcls9aTLyLLDSe4jJu9MjaQvN8B+UMWHk0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681399; h=Content-Type: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=CoTleeCUcvYndolgWSxVbjuEBw5fGt+mb1nmRFlbWPU=; b=V98pHw0pfzEmJ1QuZSPya1kn0DPbD8L0T6+KuZJCgdf+YYo2LNBoA9oD7bnSK3i1m1vc9UF/axOAnVeu3Qm+lFzdEwzzzCQsmSfp0LhkQkpWD0zPZ85SwdGKNZb/tU7rj1EtA4lELoAXup6XG3+t/JGMxx0Cz3Qil1nCrFQzbV8= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681399604112.61921431355177; Mon, 23 Jun 2025 05:23:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTgA9-0002q6-Ge; Mon, 23 Jun 2025 08:20:37 -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 1uTg9y-0002K4-BR for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:26 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg9u-0000xb-Gu for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:26 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-453647147c6so30958585e9.2 for ; Mon, 23 Jun 2025 05:20:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-453647071f4sm109685435e9.34.2025.06.23.05.20.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681220; x=1751286020; 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=CoTleeCUcvYndolgWSxVbjuEBw5fGt+mb1nmRFlbWPU=; b=T22vsVJtPH2TQZHCJLNniO58sS4ILvl5t8W0ISHEHsySk4n3cbNxzFC13HTVuTAtbf Eep8YdccSSRcOwFpaGUlO8cRuKfdsGMjKDs+rgxpdQVzv81ylQV+n+VRZCwL2s9HbUQp wHqrlmYrTWcFy0l2vRqgQEwJxyyLSimKp+ygQmjT2smSRh1LG8sNGEC887+ZAL7xkp6h VJAN4fpw9I0vdApbWrRitJJx69/RI/3qfqcwmQ1mSLOP30libozLuQKeSAxIxhlS4LXy bOCvFTGxiClCNYUVBAYXi/UFxcxBBR1pynEDgSGJOrEpcBjyLaCSqxADkleykbF5qHGX jH/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681220; x=1751286020; 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=CoTleeCUcvYndolgWSxVbjuEBw5fGt+mb1nmRFlbWPU=; b=EBQtYrRwuhbrnTFGeFB2CZQylB5TfAajJV8DiRsFOka12Gt2oDAeqcF2h1GGXDk6Ir EGqLcVqv04TwkzDXGkkoDSYcM2An3G4Nnz2HYkyL7vQYJW30ZQR69mC0VGN7PkgG5QyR njQ0oT/heNsM1+P4OMQKJLQVH7heQc3QuReu9PetvpvyUE8wL4XVv/RPUj7bilXbObb4 dViyXTdE2Xkg3cmj5v5x9TvzS634IwjPflaLxci9OWmPmiO+wWZvpmHkzU3E6GzZqgQu WD7T+wfwPFqlgkJzVCL4HNV1moLMXUQIktXb0b8BNkTUngShLbdh9w2EDk/yh32kmVqA LNcQ== X-Gm-Message-State: AOJu0YwJ/Njkz178YJL9fv2RZUoUz0C6m7PV0w9qx824B2PYdYZjS2/5 WtUAGl31X1HIZBREaDde3J7lL52RfefbGIQYbMJ6XLGnksP5QbmZgKjsyk8rYY72U/+vnbjLAEj sLUQl X-Gm-Gg: ASbGncsr9bt+saqGVE5Q7ArDVkZ9g06ylbvNlE4qXN1IcCP6jHGvm55pl/eXs0x8Y4m WIDSOigxez9pB5Kfz+mxfhLK2QTrxp+GYZgMyD7TxW//AWVnjUBqgrLaISH1c+NR//Mf+UuVpEB JYt49+YUzCRJpNVoPPlhb/fp/WitXG4zKHxuRM7u7+XNMcUwjeaMdQBWjMclAJ7a1g3VD5X7x4e 9+YIntnUlk4CZQFp2np+1m+Hu/5PTBagqdYA4DtALMDN8VWOHzw+m3C2fv8rEK1yIw8gz4z5Xcr WzU6fw2YJZyZQg507+7mZoTubu+8St/3ItP1CFJk0Kj9P/uHLylAlqdbpTWR46e2ZC9RPusTU3a j84DhtZujGVayPdRndSsdQVBhAlDFTZJeZd0pM8L98k8Yju8= X-Google-Smtp-Source: AGHT+IFBHJwLkEEc6nlf5I87v2Hc8Cpzzh5zV8wh3kfSp+SDxvF8pOTvTMZ84BVKQcVmti0UNd5Jng== X-Received: by 2002:a05:600c:a345:b0:453:58e8:a445 with SMTP id 5b1f17b1804b1-453654cb7bemr101468665e9.11.1750681219792; Mon, 23 Jun 2025 05:20:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 18/26] hw/arm/virt: Only require TCG || QTest to use TrustZone Date: Mon, 23 Jun 2025 14:18:37 +0200 Message-ID: <20250623121845.7214-19-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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 @linaro.org) X-ZM-MESSAGEID: 1750681401813116600 We only need TCG (or QTest) to use TrustZone, whether KVM or HVF are used is not relevant. Reported-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/arm/virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 99fde5836c9..b49d8579161 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2203,7 +2203,7 @@ static void machvirt_init(MachineState *machine) exit(1); } =20 - if (vms->secure && (kvm_enabled() || hvf_enabled())) { + if (vms->secure && !tcg_enabled() && !qtest_enabled()) { error_report("mach-virt: %s does not support providing " "Security extensions (TrustZone) to the guest CPU", current_accel_name()); --=20 2.49.0 From nobody Sat Nov 15 14:49:49 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681738; cv=none; d=zohomail.com; s=zohoarc; b=Z0u71GGVMv8mEkB48NL9AzfWEKgvrzlcz6fGHEvlAGhb2HfW8bgmKZtv/1254ypq7ia+eHYtfaTk9Kn7qJVeB5ynPjwas0rox+RrABBctg5dUOdbZu2WuEiI7e6zhPFQWNu89P2Pxjjx1/3zx3dmGkSvDCWOvOPa869e6jbM7l8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681738; h=Content-Type: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=jKb7+45W8wr+DNWypSxWBKVEj0bAIAzVgg/1Er2vy8s=; b=lUt96BN+sbS48zEwIjGEN0GPoCeXa5pj1s8SYB99Fep1bNjaJRiypI8WWZABJM+YaJomjXZKIkJJ+/VYN1f6PZT4UOJW359JrBkBzBr9r3c5lzLBWvo017DIhVaPmxG6ilAyiyQ9zEIgETb5643fpNzOigJpqLYiQRBP9M1TosM= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681738325660.0883289966513; Mon, 23 Jun 2025 05:28:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTgAE-0002y8-AK; Mon, 23 Jun 2025 08:20: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 1uTgA3-0002es-U4 for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:32 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTgA0-0000zn-7X for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:31 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-453426170b6so30287035e9.1 for ; Mon, 23 Jun 2025 05:20:26 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d0f189cdsm9446171f8f.35.2025.06.23.05.20.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:20:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681225; x=1751286025; 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=jKb7+45W8wr+DNWypSxWBKVEj0bAIAzVgg/1Er2vy8s=; b=Vy6VQW1vnIP8en4NO/ga28+qONobaoTesil20hsfXcPhmt/uLwA7MdO1dhmhMO7wS0 20hfqwgP+MV4ttN3JD9osbCCIBVVc+VNjcLgORgKltw12vgpEI1xB2hcAGh1cXpNQuzO /YePmIPdf9U8Qx1ohIdBxNlEUfjU7hxjOdtecFylzO38OmyvNMQ1TqakXU9DK//rQ00X kbb8LNRXgKFLnyolFQrHcDfoYLnTwWHBEsQAgA+8Xps9UAZ6eGbLgTVeW7B630I97pRQ +aq1rncp7pBwSCvMNEOJGSTMihOZ4n6VEpeNjCkxY80RimDkGOaRwebsjI8vwrBWy0ik PbLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681225; x=1751286025; 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=jKb7+45W8wr+DNWypSxWBKVEj0bAIAzVgg/1Er2vy8s=; b=tHxGZb6M7n4WR1c4SGyevL5uZZGjfRmZyGaCAl/TdhTokbJUcQZV7sgF+yni76ddms vCqhBaGTvcoDs5URHe+/HCHo9E+DmsboZEQe1ANDJiJjp7ZvnSlFYLjUQuehdIaqhKur MSGjlPJF+WQb+yQVZJ4u+uMZB/1ICzEqAuXRb06ceWv5oXKuuUs53Bosdrd48LFskUn2 iTRteVJbezg1pOgiJQs/01EBi7DuTc1z1FGbWt5Awt7Z4KHigP3prYPtJcKg22RMgPCx hPpeS6bW7cVtTshMWnQjqIKDbu0fNkO21OlRnsuVSGSEBjEWJNFGW75zHHCvbkqCJ07u EZMQ== X-Gm-Message-State: AOJu0YxoJR0K8IqX5u0plyM6xK8k/FGB+5sSn7SAH6+lbEWhVUYa0XXc w6gc7X0lo9vZTC4u8qpQDOFssJgpOny5S+L443dXBOnNJipuxaLsN3zdoKLZQ5zMrTcnwKqxcor S+GQ4 X-Gm-Gg: ASbGncvR73OFW7ixgoo6QKSj/T/KaUjBwGPkxWkHAEQd0N/lKMIJuSN1WJx/XHSKV5r 0L26YIi+hNql3m30vrTFwHKt+sMLkKQF89FOUn02JFr2WHwWCHUcalRSrvQRyjDK2yEX28dQjDh c0elYW6hg9hXISrWZVEW6L/R08pQ/MH62X/nsdba9Db0c2WP1UsJ61HO6uD05tHDPLml2+6AlxQ SknLN/okLQ5KqvKonSfGi12lhJAthDtWBsFxWazewb9rOrTQF1D6tb1BfqZGtkOlpYvk1kaZZH+ bmvNvkhNfLMcPDLDRRPn8MTlgbuwXolARg4c0LsyA+VztUzwSftgK0S6SlNt3RpULcHtCnTFIM7 2e8ziuwVsXrZWsurcnXCK3e2TfDq4VNZKvJMghcCazG8nPVM= X-Google-Smtp-Source: AGHT+IFKeCPKvJTY1oRMd774pzSdTPhl9ZbHhi8QfaLesPsg0MuI5svGt7VJgysSnyjP9cXdhnmSyw== X-Received: by 2002:a05:600c:848e:b0:450:d79d:3b16 with SMTP id 5b1f17b1804b1-4537a7e5111mr3528625e9.14.1750681224860; Mon, 23 Jun 2025 05:20:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 19/26] hw/arm/virt: Only require TCG || QTest to use virtualization extension Date: Mon, 23 Jun 2025 14:18:38 +0200 Message-ID: <20250623121845.7214-20-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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 @linaro.org) X-ZM-MESSAGEID: 1750681739959116600 We can not start in EL2 / EL3 with anything but TCG (or QTest); whether KVM or HVF are used is not relevant. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- hw/arm/virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index b49d8579161..a9099570faa 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2210,7 +2210,7 @@ static void machvirt_init(MachineState *machine) exit(1); } =20 - if (vms->virt && (kvm_enabled() || hvf_enabled())) { + if (vms->virt && !tcg_enabled() && !qtest_enabled()) { error_report("mach-virt: %s does not support providing " "Virtualization extensions to the guest CPU", current_accel_name()); --=20 2.49.0 From nobody Sat Nov 15 14:49:49 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681839; cv=none; d=zohomail.com; s=zohoarc; b=IbvaHPtJ7jAl0+MyqKiFV+YhChjHeOe+QAFHBPRn67pxE7XpmP/9HAMX1H6ClB7sNqwsHED/saSfNKxRCMhAatFXgEghzV869DbioBVOcD3djXNQgdfXioxJTP7bo95rU70A2VSaeAUqTktCBPZSYhr+yMDp4Zzhk+RdLfp4dvc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681839; h=Content-Type: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=fvGV0OwfNAMYe1Mulybvoaq3k7G7T7tR2QdHLx3eR4k=; b=F/qjeyIh215f6YwZ2gkLkNXbnG+DlzyVxzd8RAEvgGuJQjanTXZmoAeQMDzRu7bMbqtuzbAFvpT/xfL4yKwHFfKCi+RJyzuNN19dS8uBPIGniwDHr3lLpasN1vX4NwmpVf+JwWRpfNot1kvlWf8CvmlQ9Q4WYZxzIKIm3Ha2qCw= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681839456384.78190464955696; Mon, 23 Jun 2025 05:30:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTgAE-0002z0-GL; Mon, 23 Jun 2025 08:20: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 1uTgA6-0002js-2s for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:35 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTgA3-00011D-W2 for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:33 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3a531fcaa05so1701035f8f.3 for ; Mon, 23 Jun 2025 05:20:31 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d0f19b30sm9525253f8f.37.2025.06.23.05.20.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:20:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681230; x=1751286030; 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=fvGV0OwfNAMYe1Mulybvoaq3k7G7T7tR2QdHLx3eR4k=; b=n113Z5x9b5s+HlKXxgEvsQRSyAJ8WSfA3sE78/ZtMrJDC+pamWyM3eF7SyUZrxLNHA h6UM6TdBqPMzZdSIDxUx8LfwaRQ5YDHRRh1A8kvcAUqZKgpMwyjpmkrjDfOXuV5Gh9gg 3SB3lgkTRxgKPgMSrLjXXcgcrLcAZapIumngFrdpeYjWTTN6NxovpLFAxnrdq9DV5152 2S7Z8bc6YOrmgSayZunhi1qJp1R5u5PEURLorR+BHzINLipw8Ed/igbyp4pqYR/QBK/P 5gzn6KXXJxba8y1+6ouja7S1gcSlVCLZfh3zKnHdy76R8EiyNSoWAUidLQycw56CSBat OYYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681230; x=1751286030; 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=fvGV0OwfNAMYe1Mulybvoaq3k7G7T7tR2QdHLx3eR4k=; b=wqbWle9rvwNzp0JzghV4STUB7qDiJmF26NR2nNjMJo1EkDakClFdn4gVIyIJBijm+X PwDl2Lmakt5kg/uUGc6Lxok7NWD44+/KpVSnI/sX7AtBnVfZabeGmobwrywyiUsMxBNA ZWLLWudwmzyz068T9UYYiPEqQF8/6IwjkhL8gahIIpLLDnI9JzOkd1xgmtG3+N63GGxD AlufmnalFvKEjRXxTkbcBmBL8z7HqRkAoc6nMS739Fg5PC3zKDkzzO5ahkeiEanlF+Jc +w1fckRwNfzLudTWOvM77YqZSLxgm5IwyyuXXI20MO1gEtoK99oSA0UNbaLNXjBYM7Bc vqkQ== X-Gm-Message-State: AOJu0YwpE58mVrIGdDJQfQGryG6D24J3efRR4BZ+bbDJ6/VSGXeu0z0a /GT+CTq8N96/T7p1TgwGbRCF4ObyaYTLrrF4sfxlgK+A3IB/FN8W0GXjtll1XsfORoMlkp5HD8Q b7VZA X-Gm-Gg: ASbGncuwqeQB1OcIq9gH6aLAJCfeNLE/ekTFZ6eWa4oJoCmjW8LYsTNhWQHexEjb1p0 RiueoMJ4B7eGs8qwNyK+UuLWKmCtrilEBsMUy5Mwbb8a6KOtJhugAAsHKNRCUFA2Nv/yiBJNr31 Uu/iOYlafC0SfYXMqxQO4bDkt2vNq8VcwvROmDUESCnuJmF0736gu/PmudAi5NyaS3tNhwFRQsG Vwg6mVOOU14Bqggyc1LcbhmiqJ/0S9cr4y2iEoNMNSGY+/mwMHp8C+tza4M9gltjD819HzbBy1j sjsMhsEO+EwN/S5/6zY4DXos019rM6w9oShDQXfBwYyLTrSIEMNHtB+ws+gspG6T1WTT696QsOM cblt8bbUaB+LCzwjzLkxPx4UcL91sbK3JF37I X-Google-Smtp-Source: AGHT+IFHvPu69hvLV8v46JK3gDouHS/oh+Msk1ox8QgY0quFrYsKcRStqL+fYhN7WRhsh7mvIZOwqg== X-Received: by 2002:a05:6000:3c5:b0:3a5:2208:41e3 with SMTP id ffacd0b85a97d-3a6d11910bdmr10782043f8f.4.1750681229837; Mon, 23 Jun 2025 05:20:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 20/26] hw/arm/virt: Rename cpu_post_init() -> post_cpus_gic_realized() Date: Mon, 23 Jun 2025 14:18:39 +0200 Message-ID: <20250623121845.7214-21-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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 @linaro.org) X-ZM-MESSAGEID: 1750681841223116600 QDev uses _post_init() during instance creation, before being realized. Since here both vCPUs and GIC are REALIZED, rename as virt_post_cpus_gic_realized() for clarity. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/arm/virt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index a9099570faa..da453768cce 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2032,7 +2032,8 @@ static void finalize_gic_version(VirtMachineState *vm= s) * virt_cpu_post_init() must be called after the CPUs have * been realized and the GIC has been created. */ -static void virt_cpu_post_init(VirtMachineState *vms, MemoryRegion *sysmem) +static void virt_post_cpus_gic_realized(VirtMachineState *vms, + MemoryRegion *sysmem) { int max_cpus =3D MACHINE(vms)->smp.max_cpus; bool aarch64, pmu, steal_time; @@ -2349,7 +2350,7 @@ static void machvirt_init(MachineState *machine) =20 create_gic(vms, sysmem); =20 - virt_cpu_post_init(vms, sysmem); + virt_post_cpus_gic_realized(vms, sysmem); =20 fdt_add_pmu_nodes(vms); =20 --=20 2.49.0 From nobody Sat Nov 15 14:49:49 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681474; cv=none; d=zohomail.com; s=zohoarc; b=fKGkvTCrrtF4dSiuVHUCYN//edylXiEoZDDrkzRBwCXgXGTRMq2lKeXED1thUPfUe25cNsX0tDzNZWYq7OG7mRPAJ8nZ2u7irIayO2Fk6IJfeDCZRu6bRt2H80u4btstH6jw/I2o2lm0AHRZaZj3p9TXauRod2eQheCFe9azbyY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681474; h=Content-Type: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=X1avEvgULJGN3+NnzgbjknnR4xz+wRJgrCM6KmdqT58=; b=Xr1q6oUgFr02j0D33GvoPSkEiv7nl65obzM+xkXRoa2InpkOrSVVKbMEO8E2WiCJDCVk1XiaJnU4wSspqpnQllPv6IcY70h91tkH9/C1YrJ9WxP3QHPzK4poAOhSEHAFIP3hOVwksR39D1qhSjIHhdxmR4iJMInfO0UOROz03Jc= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681474201231.01771291008197; Mon, 23 Jun 2025 05:24:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTgAG-00035R-5u; Mon, 23 Jun 2025 08:20: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 1uTgAE-0002zD-BF for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:42 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTgA9-00012n-FZ for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:42 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3a54700a46eso2273007f8f.1 for ; Mon, 23 Jun 2025 05:20:36 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d0f18a29sm9449877f8f.36.2025.06.23.05.20.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:20:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681235; x=1751286035; 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=X1avEvgULJGN3+NnzgbjknnR4xz+wRJgrCM6KmdqT58=; b=g7xN2Jh9JD5r8vncUs94H1lrNpok/40FDBWsrrf31XC/ybM59haSL5kM5QXja8LN3j y2xcNgtBQfglw+XTn1GOZNVrrh1dpJGrK0J6WtjY2PcG84NjBHPGTIl8AuEKNzzaCGK/ NJpqEY3zxuK2BMY3O92PFoVXWi/2DjFJO2hRh2nSUTjx48JqjAIZjylbS05sCZ9uW8Nh NMlzr7HPnNzpC7GDhok+kNZC6GehcPhms5dtg/lnC3Fpc1R7h46D20cS2xxZ7EITDN2z ZDHD/STdI8hUIyB9HxsJEStjUmeMTLv76j27kBB5+QUcDuhHlsDTxOx120W7eZHnQR2G sTXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681235; x=1751286035; 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=X1avEvgULJGN3+NnzgbjknnR4xz+wRJgrCM6KmdqT58=; b=EZd4Cqz3eADvO+Ol7MmTM5ExhbNxQwV6ro9AzN+6ovQO+llQTGnTRfLhp6TcNbT14p pwEQJplUlp0cpsuSeIr5ilw04m7hQRwQQ95hcLAIqMjRoRYAegQI3yz/VVPqaswGogjB ICIHcqUP70egywMxh2Mpfy+cz/Xro5GUYub1cWfEzjUpi7zHhMtdFWZ7TY87371c7i68 hY2u0oHMcBuWtg3t7A4hHyvFwXqdtXfctB9LAmeyBltmc7O/rDvsBAD+a0gPwydWPjJD R4xYDkSvxKc4Odk46IP03jsFQsc3vDL/KCSL3rellYT/IUehpd6AXoF+M86TXdqOusBj iK+Q== X-Gm-Message-State: AOJu0YwluIUnHsHxKgEqfyl6bPbJ9x5mwdKF+h2G4NM2WRPmI/YJTKY7 YlRLeSa7lOH7pFK423NMc+qc2HA/nHTInBecyispyILjg8+j4AQbimWR2TjU0xCFGSzDwXpIlvR +SGXq X-Gm-Gg: ASbGnctfTdnE3wIP3bpASbK5K4QF6eqsX816UR8s7onfkcNVT8lu+5c4cUYm4IIfeiR Hx5F8IPwmJWGaaTG5A5qJytXjJ1Gf5nXnD/bYjQCHX+eRTFF3WiqCYPXEzWaRHQwD/QaiCmAkkz Cz2jpdRfPB7R6f9IXD3GGN6FxYJ8o/9BM1kt15UFQ1hYaOqoRZz9gG9MYbrOtVxUBt4qD8RBPYp uA9au7zUBM8Z3B4NVAhwFcYkklTs8aKmOpidBetNaXUlOTu9PhIx0/xNcsVieF6Z+ZzwAyMiO9a s1K9LinUzT5U/ZjQsVo+wzR4KFI8haIi2vuRlA0uhP/fsaND2a2lNNx62TI6UaqjI0ebhx2TS1x CKGl8Vyu5FABQ8W0lA/bKHCrGOuFATRQqA1pS X-Google-Smtp-Source: AGHT+IGfmWKuPWWupTZ/ZnEeVOjJmb/p1NM+3sPwfupLNJuwEpOvWNKETdLlJnkiht7JLvtuJ9EAAg== X-Received: by 2002:a05:6000:40c9:b0:3a4:e2d8:75e2 with SMTP id ffacd0b85a97d-3a6d132fbfamr8548741f8f.50.1750681234897; Mon, 23 Jun 2025 05:20:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 21/26] hw/arm/sbsa-ref: Tidy up use of RAMLIMIT_GB definition Date: Mon, 23 Jun 2025 14:18:40 +0200 Message-ID: <20250623121845.7214-22-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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 @linaro.org) X-ZM-MESSAGEID: 1750681474891116600 Define RAMLIMIT_BYTES using the TiB definition and display the error parsed with size_to_str(): $ qemu-system-aarch64-unsigned -M sbsa-ref -m 9T qemu-system-aarch64-unsigned: sbsa-ref: cannot model more than 8 TiB of R= AM Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/arm/sbsa-ref.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index deae5cf9861..15c1ff4b140 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -19,6 +19,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/cutils.h" #include "qemu/datadir.h" #include "qapi/error.h" #include "qemu/error-report.h" @@ -53,8 +54,7 @@ #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" =20 -#define RAMLIMIT_GB 8192 -#define RAMLIMIT_BYTES (RAMLIMIT_GB * GiB) +#define RAMLIMIT_BYTES (8 * TiB) =20 #define NUM_IRQS 256 #define NUM_SMMU_IRQS 4 @@ -756,7 +756,9 @@ static void sbsa_ref_init(MachineState *machine) sms->smp_cpus =3D smp_cpus; =20 if (machine->ram_size > sbsa_ref_memmap[SBSA_MEM].size) { - error_report("sbsa-ref: cannot model more than %dGB RAM", RAMLIMIT= _GB); + char *size_str =3D size_to_str(RAMLIMIT_BYTES); + + error_report("sbsa-ref: cannot model more than %s of RAM", size_st= r); exit(1); } =20 --=20 2.49.0 From nobody Sat Nov 15 14:49:49 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681395; cv=none; d=zohomail.com; s=zohoarc; b=j4at7RoHqgjSpisN127lTr/cnl4YVBkKcOiqCpO/dpEgnlm1xGeLhxJpRowMV7ljcQmktLqwNj0vpYh9PaJhge3BKHt4fqcrX+s3g++5tFP687ExML/slfY1DbRNfhZO3uLy/Pd6b7ghLhBNUbYoGAvNdcnBXpxYo0ZBKvJuPNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681395; h=Content-Type: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=xtQNZzACUXAAbylIZWuCAJaOBU6QlQnouJAN5jXvi6I=; b=iSoLb9cZyKdIbJZHo+t0aCtg78Q5sXrcs0SlwPDdOye+Mxop1cDe0tUlAkMoUpH66fvAMA8l3RkTFjfGt4f7rfUSvXBngnVBffaM1T/qslIiZQH09d3uJTFXAvhlcYOSvF8Ms33aA710CrGE7GbZKnBHCsdvP/tliV/ZKY5Oww4= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681395874268.8030230369018; Mon, 23 Jun 2025 05:23:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTgAj-0003wH-UJ; Mon, 23 Jun 2025 08:21:26 -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 1uTgAI-0003AI-Oy for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:46 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTgAG-000147-IP for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:46 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-451d41e1ad1so28467255e9.1 for ; Mon, 23 Jun 2025 05:20:41 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d0f104f6sm9656927f8f.12.2025.06.23.05.20.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:20:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681240; x=1751286040; 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=xtQNZzACUXAAbylIZWuCAJaOBU6QlQnouJAN5jXvi6I=; b=YGfZwPofegnI+ZMTvpDgWncTBpOAzVVbxl5lG5PlPyTxWVvcVHAqDe8KS8GlA3wYH5 eyWZFlwIXXr5K6gPU5MY3iziTmSeBGivCZKC/2E26fob9rTHeAYs3xRENPTcYvxMWbb1 XhGdvLuY2iZWl0u5TOsxnsMOGDQCpztjxDO7TjwL4JT6oW615RsNVHiRIb6uj4sSHPAP NrqjXLTbyF0cdyGmrMkhbC/tAQgS1+T/Cm1krZVlW7TpM6Pu/Kos2/I2P7ZhDYWL/kGJ jUgdMci2h2zZJsfeCfPpntYHJLkUs66vq+PxNMX4tKu1y4r8rdKfhlhjlHlC6gWoXgdV raQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681240; x=1751286040; 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=xtQNZzACUXAAbylIZWuCAJaOBU6QlQnouJAN5jXvi6I=; b=QeJV6q69DBd1qr9B0tcajRFHFmfHvEeACs0J1UZ9sTUPZmdXtTGLacIONEeTXcA0pW IcyodB5R6PrjWLzjo2/SOVfuYcbj75AVUY1u4EdTfHzQTs4s62TYxpdUn6c16bCT0hyK tSJS79YLltcHixN/+iez0TYvlX5+u1JQCi28fbDtn6TcpJMhSfESgXgRqRkSF3YnRYKz ffgbQrX4DiLHdRkYR0559d6y/juVFAUhmp1oJq9+w0ty6SZ92qWIxsVvhkw7KFXEi/PW EseP6qRC6VQ2Hqq37LYttQfDuyeKmFerP5puQAcUnzb/sBtLFZPfAKJXGm5WpAKlEUr2 OBXg== X-Gm-Message-State: AOJu0YxDHWJdxKGGCVKnfaEwLpMRO+PQfJTnFad0RfoM75bJqwIWgiWD Zsd7rLTe+HY1P0HOgP2rbyMvJmAcGfgyKMpaihZh2ykNdbUoOOqSezm60dZ0HDFJ4tIoMdu6gDR 5cFvi X-Gm-Gg: ASbGncuUgsr/hTU+i/tvsySEqHjteoRfjP9hUvAQNuhtv3o4oR1/ja58A9A6kZwNdhR XzfeKowbyAgQEZyrkGWuAZtGCNB+nlppbUYduj2gsso0TMK139F+y2BYiqk08HwIU42kQFF0Zwz nzs9uupuQrQ6DdnFRCyjxSWsKX9tpqrutC+CJR0801v43biuHo6do+05wAnx50cqYKHbBT3YdW7 cVwd/4tUCuufBTOvpYvcxzKkzTzRl6n/nEcYC8RWvAu2eRJqF/LQARsR8V9ozsFHAazKbnt64xQ XRbknasHgtg8E4nGXXmMtexSsLjT3xWH+KG4s3ae+ihAovOd58am9FeA7wB7iNIefSQKLJORrey 0GplKd3twMFFSf8Wp3Oqb/mXSpAlpxG3irGkZ X-Google-Smtp-Source: AGHT+IGloUAr04yva76gXPckxz6WSYPWq4wDXpDI9HHEpLc89a3rsZ2d9KIpm2RuC3BaoxLIlkYNIg== X-Received: by 2002:a05:6000:230e:b0:3a4:ef48:23db with SMTP id ffacd0b85a97d-3a6d12f9af7mr10894746f8f.59.1750681239899; Mon, 23 Jun 2025 05:20:39 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 22/26] tests/functional: Set sbsa-ref machine type in each test function Date: Mon, 23 Jun 2025 14:18:41 +0200 Message-ID: <20250623121845.7214-23-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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 @linaro.org) X-ZM-MESSAGEID: 1750681397859116600 fetch_firmware() is only about fetching firmware. Set the machine type and its default console in test_sbsaref_edk2_firmware(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Leif Lindholm --- tests/functional/test_aarch64_sbsaref.py | 5 +++-- tests/functional/test_aarch64_sbsaref_alpine.py | 3 ++- tests/functional/test_aarch64_sbsaref_freebsd.py | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/functional/test_aarch64_sbsaref.py b/tests/functional/te= st_aarch64_sbsaref.py index e6a55aecfac..d3402f5080a 100755 --- a/tests/functional/test_aarch64_sbsaref.py +++ b/tests/functional/test_aarch64_sbsaref.py @@ -40,8 +40,6 @@ def fetch_firmware(test): with open(path, "ab+") as fd: fd.truncate(256 << 20) # Expand volumes to 256MiB =20 - test.set_machine('sbsa-ref') - test.vm.set_console() test.vm.add_args( "-drive", f"if=3Dpflash,file=3D{fs0_path},format=3Draw", "-drive", f"if=3Dpflash,file=3D{fs1_path},format=3Draw", @@ -68,8 +66,11 @@ class Aarch64SbsarefMachine(QemuSystemTest): =20 def test_sbsaref_edk2_firmware(self): =20 + self.set_machine('sbsa-ref') + fetch_firmware(self) =20 + self.vm.set_console() self.vm.add_args('-cpu', 'cortex-a57') self.vm.launch() =20 diff --git a/tests/functional/test_aarch64_sbsaref_alpine.py b/tests/functi= onal/test_aarch64_sbsaref_alpine.py index 6108ec65a54..87769993831 100755 --- a/tests/functional/test_aarch64_sbsaref_alpine.py +++ b/tests/functional/test_aarch64_sbsaref_alpine.py @@ -26,8 +26,9 @@ class Aarch64SbsarefAlpine(QemuSystemTest): # We only boot a whole OS for the current top level CPU and GIC # Other test profiles should use more minimal boots def boot_alpine_linux(self, cpu=3DNone): - fetch_firmware(self) + self.set_machine('sbsa-ref') =20 + fetch_firmware(self) iso_path =3D self.ASSET_ALPINE_ISO.fetch() =20 self.vm.set_console() diff --git a/tests/functional/test_aarch64_sbsaref_freebsd.py b/tests/funct= ional/test_aarch64_sbsaref_freebsd.py index 26dfc5878bb..3cddc082f3b 100755 --- a/tests/functional/test_aarch64_sbsaref_freebsd.py +++ b/tests/functional/test_aarch64_sbsaref_freebsd.py @@ -26,8 +26,9 @@ class Aarch64SbsarefFreeBSD(QemuSystemTest): # We only boot a whole OS for the current top level CPU and GIC # Other test profiles should use more minimal boots def boot_freebsd14(self, cpu=3DNone): - fetch_firmware(self) + self.set_machine('sbsa-ref') =20 + fetch_firmware(self) img_path =3D self.ASSET_FREEBSD_ISO.fetch() =20 self.vm.set_console() --=20 2.49.0 From nobody Sat Nov 15 14:49:49 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681452; cv=none; d=zohomail.com; s=zohoarc; b=R3ml3SOtjrM/j79AYYOhksKJlVJfOiZ/963zKMYH0I+RIMjBs1s/HnR0Pv7gZkPhBuffw7QU7MGeBn5sl6zNu2CqfJ7WPzKz6KV1G/UBxWuvtCyADImImE43DGcXvdKrRvq/+fOB8m6Ck5zF7b60G+usCOs4JAKYWJYZY24fgrA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681452; h=Content-Type: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=Y66de3esKoxe7Lq7nXgyyvCOXzL/4wNdUP/QM7Hg6f4=; b=FEzmmgQntHj53aaED8umLfEa9KgQFfnSukTNz5QO7o7t95M14FJSI9BFaA0BqeKc8ynCZEPUoS9szrzBDbPSzR19gbkWSuzTo9056w9jw7LySnxKjcYpX1eB2ris3ENDnSqa7qDaFQcvbvsk5V0tKr8aWnKIPHyTPuirdQNiLik= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681451995343.0378153860145; Mon, 23 Jun 2025 05:24:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTgAc-0003Yq-Ul; Mon, 23 Jun 2025 08:21:08 -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 1uTgAL-0003IR-Kw for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:53 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTgAJ-00015Z-Nx for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:49 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-450cf0120cdso32242415e9.2 for ; Mon, 23 Jun 2025 05:20:46 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d117c0fcsm9565403f8f.62.2025.06.23.05.20.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:20:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681245; x=1751286045; 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=Y66de3esKoxe7Lq7nXgyyvCOXzL/4wNdUP/QM7Hg6f4=; b=ldciURYTOm5WO7LytwRDyyl11r0PXpTRuS04+9YnvZqUA53SZ9chP4UOUb/Kcppzft 7g/2U8IvEhiBCOBRzi4pgYuZbr39L8rhdFD1jJDU3aQR1IOSqmlRXZyNN4RiXvihNx4Y /Ijflf4l6aAmL3ULXn8ujwsD5GXF/d7shnAEBqc9Jcd9eHNmil0/TrjnAJTYxRSCt4+R mYE0twcg+5ze+Gpxv+Retw+hEGlgl6AS5hIPkFMxLgBjyRvq+bCw0Jkyd9bMkMX500Gm ZrDK8+J3z9x9I2kHqNuesT6zGMOKpda1rdZRtXGxXxANTPEjr8ODdmRh5BNpctH6+26f bjjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681245; x=1751286045; 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=Y66de3esKoxe7Lq7nXgyyvCOXzL/4wNdUP/QM7Hg6f4=; b=RlUNsBkf8EGk3OsfADd4quA/crqBFmAJk+a3tVQqDUkURHkd/dH9XcF9c2o1Uo4FRi /bTa37ve92HFRmVTTFd29E80h5arOteHXHhttYySz82t+p5rS1DnKt9vgRm46dV0Ip5m oSyDI/ZXD9CtOzeSZBP/ffe/ORIMWPDOkh38a3nYevWPQ2E+7IFpCsfn/A24KT2+EZCY dV2iMCpsdReW5ysZe0Cj97Pvd7ueysLdz1F5mtfuCgX5OV033uU+YoWSVQQ3+foMJ7sx IJB0+nY+rDsoK8XBUI1Nkk0OsiHHCtukvvXvQDOzS803e8VsvyGeKB6ePgYlRQwdEQOL MO6Q== X-Gm-Message-State: AOJu0Yym9pSHj4PQB/P0+uoKqfW2tFD8N27Ked8qffi/AFjvzjZtWdza Z66e6N3BGlsQihS6wmY5xXcWvWmmUmCDcTdY97JYcMxUxzAWPcHxnUqvAe5u3MCHvAw+HDjMgjG VasjR X-Gm-Gg: ASbGnctTEdCfwZ5ScFqo6rqyhhcgI9zlhqNUrMHKHZEDU8W6BKNk3jU29MLCYtezUgw hJNg0pPWhwl+BWXCgtladwbX72pE0qAmfGjB0s4vhDoT+3cblxZoKCVhNEN678YpamDQHoNqiC3 /5Zh5EYmhx9C3GIlTOl2HVHLdl4ZN12jwGjstWCdhkP6fYpBuUrk31oCgWhhm4L7sZ17hgOjCTf lJLrWCljHLQkvew1yutPyd+Pe+EMOKWNeTyktQJAnLKjJgpTNL9XaeQW9UowddpYS2aJuo//4Hv jkZ+K5XpW5ytG5OWrJK+WTWAZcLmLu8v1BAiBBjvabD3qkspr6LByZc/Qf8+E38vIVYLMv6c8oT 2dSSiKIixgwsSPgpYWMhY2eNOgNa2AXBQ7Key X-Google-Smtp-Source: AGHT+IEID5av1fp7z71GMDcrtgYTt/iBmDplBK/iwcImMCZA+DLu+Yd9shEYZ/xuGkpZgY5IEvOhLw== X-Received: by 2002:a05:600c:c1c8:20b0:450:d3b9:4ba2 with SMTP id 5b1f17b1804b1-453659d4330mr62504005e9.24.1750681245056; Mon, 23 Jun 2025 05:20:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 23/26] tests/functional: Restrict nested Aarch64 Xen test to TCG Date: Mon, 23 Jun 2025 14:18:42 +0200 Message-ID: <20250623121845.7214-24-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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 @linaro.org) X-ZM-MESSAGEID: 1750681452589116600 Currently QEMU only support accelerating EL0 and EL1, so features requiring EL2 (like virtualization) or EL3 must be emulated with TCG. On macOS this test fails: qemu-system-aarch64: mach-virt: HVF does not support providing Virtualiza= tion extensions to the guest CPU Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tests/functional/test_aarch64_xen.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/functional/test_aarch64_xen.py b/tests/functional/test_a= arch64_xen.py index 339904221b0..261d796540d 100755 --- a/tests/functional/test_aarch64_xen.py +++ b/tests/functional/test_aarch64_xen.py @@ -33,6 +33,7 @@ def launch_xen(self, xen_path): """ Launch Xen with a dom0 guest kernel """ + self.require_accelerator("tcg") # virtualization=3Don self.set_machine('virt') self.cpu =3D "cortex-a57" self.kernel_path =3D self.ASSET_KERNEL.fetch() --=20 2.49.0 From nobody Sat Nov 15 14:49:49 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681474; cv=none; d=zohomail.com; s=zohoarc; b=e7bDWkpVN0HdKQ3NS6ikFcQZR/RVVQF0yMVk8FvZu+W7xWhk7UHyrT2bb5EW8gpKXUe2Mo4HVHBFVe7uEPNoMcmqhRTUBOfQ2uIl2oyg1hx7MRu7c+n4fDWWQGgAXJhr56arttmo30uFT65pKPr4QTOGyPnH0xJvC6ZE1ArbD+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681474; h=Content-Type: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=/XMJ0zIICEYOJOmZnjjg6la4eos6APBolhDpaT3Vg7M=; b=VytHR/LDRJtGsBmi6f5vt/UdInMWu/DLufDg6gZuQw9cjjnz0mH67PWBbnEJbq/+Wr977Kp39aWdAp0R3jf5Xp+BcZUA29jHFG/MRWu0x+16kE9rVlZNPyugoyG3ieMa7HtCV9LwpFdX/A/fmqCaamYX6CvQ1t3suUQfLILbN/U= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681474708452.8935409727079; Mon, 23 Jun 2025 05:24:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTgCU-0005Ak-7d; Mon, 23 Jun 2025 08:23:02 -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 1uTgAR-0003Ud-GK for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:57 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTgAP-00016k-Lj for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:55 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4535fbe0299so21239125e9.3 for ; Mon, 23 Jun 2025 05:20:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d0f10138sm9313250f8f.3.2025.06.23.05.20.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:20:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681250; x=1751286050; 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=/XMJ0zIICEYOJOmZnjjg6la4eos6APBolhDpaT3Vg7M=; b=dn8/lNAXyiU6RgrIIOdcgb3JdUGQf2O8D6bpKprEPKb/dQvne94iBsSo4gaVEKuKIF V2Gj+vJQosn4ZO3w592sc3G/491ubQL6FftxaJh6DWhqs+U49QMFXsPpk/PJDAAlGsHg 8s/MMFxB9XOccBAJM/kBodgzl079Tei/oxsEBt/CneNeCF8BKEw5qC13V7aswsJEVmiB WAXNE2gsD0o5pVK48fFHyTHjK4GGoKB1UZ53eCKm+S+J12CoABMRrbuwcSVmGZoT76dx VG87fZlQz4YMgvhR/Jf+VanbkrbJB3UBspqVJoCGu0zNfGaZqhDASe8XDpdGfZvqqMb6 iZmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681250; x=1751286050; 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=/XMJ0zIICEYOJOmZnjjg6la4eos6APBolhDpaT3Vg7M=; b=LSPfGpzXdeb97FXC4wqiROHP/DKk8dLtGpL/PdAJaGEltP5XoJTgqRKba132nFWtCY MbvM8wiJ2qOohymM/lPe+PyTokRJL6qkxU6p60e+9YFpSJ6BnPIEW6YDvld6mj44jz+L /SrJTB9H45BIQeD9DRDk836NQAt52Ou5BnGIbNiISIKmL4DyymJSfVDBT2t70x2NQh/w KJx9IZYh9/pJjzrRQpFlsxBvsbGcFPcwzQZ7l7/niC4u+X9X9UNaDEF95aYzeEmKGZFp +jJdLdcsMLb9dzb+u6U5BgaRREgpbp9PxKzyJo02CSizptYfvwW7mwvBlL7lAne7I1oz GxlQ== X-Gm-Message-State: AOJu0YztFSH+3Nw0jD7+PipG2iSYjsEVuZMLf7TwUDAvZgkf2ICgS5GV oVbrezNrS1VthcJ95S72PDNgdzhcyNdSgPPos3WG3IKl66M/2yVEnLbEgduKV3zUU9WRvg53Qso DpDce X-Gm-Gg: ASbGncuffAU0Xhs99n3kkwQvsHsiUs1O99sqRsNXtC/CCS1JPwFxveXtgFrkNQIh92N wx0wDfEUt/qSlejoG9hkpxe6xwQK2XKf8z9SNFFRScEauqUN0Y1R8MLnA+14cM4O9TlVb9tlaRu QKat83AtD3MZoW42I+B7hbQhdwhQcfnsmQWcqwQyOpyeTepBkp9pP8pXYPjC0mHEPaAVg7YPROM ZE6OkfVJrz/4fIGUrJTQRTgRxXhwNzae5cT4Ykxjl8Ak0rZ0LQq43V7B9a6npMzbwAHuDscUoeI yhCZDSMHTYxejbqVnVXZkQRnQUEfN8gakZdlD8hHUJ+RPRCUgf1r94LnudIcHKaH/Mp8aLLIINZ FMt2DMbXaVzJPLdjAwPLt9Nd7OfHz7wOvD2N+ X-Google-Smtp-Source: AGHT+IEa/iknzQpht+lrSGEcOk6XAtkG3t/fuyvBomWpFBo82CfJvaf+wwRcGbgYUNKrlTzMZ6RvuA== X-Received: by 2002:a05:600c:5024:b0:442:f482:c42d with SMTP id 5b1f17b1804b1-453659c9c39mr118467105e9.9.1750681250095; Mon, 23 Jun 2025 05:20:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 24/26] tests/functional: Require TCG to run Aarch64 imx8mp-evk test Date: Mon, 23 Jun 2025 14:18:43 +0200 Message-ID: <20250623121845.7214-25-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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 @linaro.org) X-ZM-MESSAGEID: 1750681476973116600 The imx8mp-evk machine can only run with the TCG accelerator. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- tests/functional/test_aarch64_imx8mp_evk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/functional/test_aarch64_imx8mp_evk.py b/tests/functional= /test_aarch64_imx8mp_evk.py index 638bf9e1310..99ddcdef835 100755 --- a/tests/functional/test_aarch64_imx8mp_evk.py +++ b/tests/functional/test_aarch64_imx8mp_evk.py @@ -49,6 +49,7 @@ def setUp(self): self.DTB_OFFSET, self.DTB_SIZE) =20 def test_aarch64_imx8mp_evk_usdhc(self): + self.require_accelerator("tcg") self.set_machine('imx8mp-evk') self.vm.set_console(console_index=3D1) self.vm.add_args('-m', '2G', --=20 2.49.0 From nobody Sat Nov 15 14:49:49 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681839; cv=none; d=zohomail.com; s=zohoarc; b=Fc6EvYiiUrl0SW81A1iL4SXTJMcV5ZATd702WHp+M6W1becrbPMLhyb04eF/Vx2QqYnKNg9LDZWHf3H9BNGGzvw2axND6xGoAGfIFtDliTn5+kqMZJZOJ2Vr8MdRtRZrjLz8YUT1OdtX2sGPX6P6ktM8W7ZIB82XD7IKQCmDHm8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681839; h=Content-Type: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=uYUPy6c9pCrsEaCpnIHygEtzD7GwjrL4VzsD7TAXMX4=; b=DxjwvmaBBpP9A4kUIpTw+Mq5pnoCyhkmuTvtkPUqvdUoYHcvA9CVTDXsyXJN6icxXJUgGanIBLGfDo3F+mehq/3UneYKaAZZgZ2d3Jt+BP/l28EybGqHc0ebSkqBV/yzamlr9zydfitztzHqDY53v6cgsgQVuUYsMv5+gIYFnQw= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681839678536.9230306808388; Mon, 23 Jun 2025 05:30:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTgCZ-0005SZ-6E; Mon, 23 Jun 2025 08:23:07 -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 1uTgAV-0003a2-80 for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:21:00 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTgAT-00017t-5Q for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:58 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-451dbe494d6so47711665e9.1 for ; Mon, 23 Jun 2025 05:20:56 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6e2036094sm2263838f8f.99.2025.06.23.05.20.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:20:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681255; x=1751286055; 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=uYUPy6c9pCrsEaCpnIHygEtzD7GwjrL4VzsD7TAXMX4=; b=k8xT4zvzkwxHX7rXPIOG4kXTie7djOwtkXy2+psn46jLX0a2lB/9k7uMx4pzfvOhB+ TQPrISjxxCW3MgpeiWyKccTAXLcLr5GgSFD4TVtah/yE9MqBgXR7GNhsQmAzBLpDk2Jj fgsAd51v1mejvlClPuOLiQSSjRv9i351wh9vyjglajtJKIByuzd19tdBkA4uRlrywzYO wIqhjFv54ijtH8KWVLrnP96JGgt/B158k+osDl+jO4DCrWFlqzN8bqD6K5m1umMii6U4 nQ4kbpX+7vhNO1lDP89IX/f0W305p9/z/x3yZ9zvlLRA6NnfVnR3a6+4R4u/5zme3TlY rm/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681255; x=1751286055; 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=uYUPy6c9pCrsEaCpnIHygEtzD7GwjrL4VzsD7TAXMX4=; b=oNZoPMpS6y5kwgpEdw86Rj/UxFapFgC56/eKluHk5shTek12/FTzAHLzKlHaMl0btn nmMS2Sbhcc7sNS83NdciYglWWPUoGXUJoODr6Vc1CtPCRt6Zsp5qOGo7hSj4JGqtn+Im zCNkVhT32jmr1X6SGfC+BpNesjIES93KG/P5hSsvFUyP+EjBJRLQ2IgChHEJNMzkwN2e Kil9HBXxLUntw6P27Ds3e8rCL2ElFbeY9AIyfYmN+5SsWXmvWwiYsC7+d2fgKQgFbCjX POfp8sUrXSq60Yg+XQ7xT7XS/BRl8/co+DQ1Fo9OjVLGML1MlaYA6WHe/XHQ/9wgHwr/ w8MQ== X-Gm-Message-State: AOJu0YxCl6VDSXtcN6QRWkeJiDXmo5XKBMopifQZRyrfWQrt0GB5wrV+ ywXwvpNYTTjyk2zanCcOEsMY6Oin9OPrPJSstlEVCW/2fXeuduQ7K9ruBgGXAmtX/E3p/jW8/TQ Lu45o X-Gm-Gg: ASbGncv5wLr2AzomlHSUAWD3jCMITj5pgZFYVt6ugZxEyIe1+xrhovc6mBjvAeLblzg stSaXpG6IdAMbaz8asevQy8LYdRGcjGaZyUKJywI9Lc8WTl8FGFLc35ytQi6aW+tyx4EqValEYm 2PcVx/6KQH0dtMIp5EXK1fUNyegOEPd27FCHKhN+lbCEJ9CyAIUAyvSP1Ze0P92dXe9BH8Lv7EX vo/uxjyAoMYHGJjDpv/x7ehxpn2eNizccVs/aHyw+QJFNKoxVHCgIYiHoVvjBbdRK1MKel6BSKS e1tkx2k99rd0TKxS+LIL//+KXShMo+7CH+PqaYzqrhPp4TY3orMRpFIY2xrt/TICqtNuLpumYiU /e8FVT48Nba8kt5aPJH6LauV/wyUS3SlE4Txc0ju68npcW8o= X-Google-Smtp-Source: AGHT+IGT6YWtiD9z6rC4lmVWjBSvzyqzKhJAfYphN1oZr29sjiHZbaoLUEt5rTgirbEWO1WecJkvgA== X-Received: by 2002:a05:600c:4512:b0:453:5c30:a1d0 with SMTP id 5b1f17b1804b1-4536e0da765mr56200145e9.21.1750681255141; Mon, 23 Jun 2025 05:20:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 25/26] tests/functional: Add hvf_available() helper Date: Mon, 23 Jun 2025 14:18:44 +0200 Message-ID: <20250623121845.7214-26-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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 @linaro.org) X-ZM-MESSAGEID: 1750681841180116600 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- python/qemu/utils/__init__.py | 2 +- python/qemu/utils/accel.py | 8 ++++++++ tests/functional/qemu_test/testcase.py | 6 ++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/python/qemu/utils/__init__.py b/python/qemu/utils/__init__.py index 017cfdcda75..d2fe5db223c 100644 --- a/python/qemu/utils/__init__.py +++ b/python/qemu/utils/__init__.py @@ -23,7 +23,7 @@ from typing import Optional =20 # pylint: disable=3Dimport-error -from .accel import kvm_available, list_accel, tcg_available +from .accel import hvf_available, kvm_available, list_accel, tcg_available =20 =20 __all__ =3D ( diff --git a/python/qemu/utils/accel.py b/python/qemu/utils/accel.py index 386ff640ca8..376d1e30005 100644 --- a/python/qemu/utils/accel.py +++ b/python/qemu/utils/accel.py @@ -82,3 +82,11 @@ def tcg_available(qemu_bin: str) -> bool: @param qemu_bin (str): path to the QEMU binary """ return 'tcg' in list_accel(qemu_bin) + +def hvf_available(qemu_bin: str) -> bool: + """ + Check if HVF is available. + + @param qemu_bin (str): path to the QEMU binary + """ + return 'hvf' in list_accel(qemu_bin) diff --git a/tests/functional/qemu_test/testcase.py b/tests/functional/qemu= _test/testcase.py index 50c401b8c3c..2082c6fce43 100644 --- a/tests/functional/qemu_test/testcase.py +++ b/tests/functional/qemu_test/testcase.py @@ -23,7 +23,7 @@ import uuid =20 from qemu.machine import QEMUMachine -from qemu.utils import kvm_available, tcg_available +from qemu.utils import hvf_available, kvm_available, tcg_available =20 from .archive import archive_extract from .asset import Asset @@ -317,7 +317,9 @@ def require_accelerator(self, accelerator): :type accelerator: str """ checker =3D {'tcg': tcg_available, - 'kvm': kvm_available}.get(accelerator) + 'kvm': kvm_available, + 'hvf': hvf_available, + }.get(accelerator) if checker is None: self.skipTest("Don't know how to check for the presence " "of accelerator %s" % accelerator) --=20 2.49.0 From nobody Sat Nov 15 14:49:49 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1750681512; cv=none; d=zohomail.com; s=zohoarc; b=Rzhom6fN+KYTg+TBPTssR8DyerS9MZdDbv4lamendCd7fB1bYPmqB1yDorQv4QKm1mXyxNMLTEIJKWbu9DLkcvD6iPE/sP9lHeyrqH+QD+MDG/KP2QjzHzrtbTOfRTD5VkBAybi5uH+AowMW2ssqs/daZSK402v+PiujUVYhAhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750681512; h=Content-Type: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=udXllEXY1gPSi8pgPr+YWAsY2WGcZfddjVlJVNiCuOE=; b=cLA1iV+vAdVRUtxOBEbl5VCAi+8/rl2fIQBMu/jfW8PkyWYwKHJHFZiGmL8egBlif6Es617x3Jp07F6uoyZ03NWVEoUkfRDvsiniYXuDBUjIqDcijyG9mGqUim/h3aRlhVoqutpdL3rhg/llN+qEK1QDOvIfVDYzJN5VonqZ8M8= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750681512243187.0327210442049; Mon, 23 Jun 2025 05:25:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTgCe-0005qo-KZ; Mon, 23 Jun 2025 08:23:12 -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 1uTgAd-0003wM-6N for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:21:09 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTgAY-00018W-Vq for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:21:06 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-450cf214200so37523495e9.1 for ; Mon, 23 Jun 2025 05:21:02 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d0ec947fsm9340220f8f.0.2025.06.23.05.20.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:20:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681260; x=1751286060; 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=udXllEXY1gPSi8pgPr+YWAsY2WGcZfddjVlJVNiCuOE=; b=p4iThvalXLPbHqb4TmUXgPVR6yY51PhtEWDHf+AVUILJsIDbybhuvI/ZID0LsZofuB 8tyPatkaum8NYxOs8zfoQFgX5yZJqHzOmhQ1gUjhVh8FWFPTbMON52EYB/xdwHbyk1bz m4/+GGG8n+K6xybfo5clXVdhgUu6t8cRKZmZz4mfpoKG1QYlrlxTUptqlF6wHg64eZ4D FjAkCj2zniBEkbed1x802DDXjxm5DfRqff2Ko6cIfJcuKbHDT5up13+tXX4IDS/x4Tdk ljVarDLayp87kBV7PTXTJS5kIbmjBSfT8mssYaKDiOfXKsQvVp3+lwDIB1EzC+g8Fiyx ftgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681260; x=1751286060; 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=udXllEXY1gPSi8pgPr+YWAsY2WGcZfddjVlJVNiCuOE=; b=Aa1IF5ohJJkn35X1r1W9RIoQjDUVrJxnayqibD+zYgD4YQMH6co89X/J4Q8zBxm296 MOTw/G/PhqjO1/o52v431H6XfbBh29m6MYVqaSwJUM46tekqWwBq8+P4okkaMxwWw9lH TFr+Z/Nvk5NJcf9pyp+02XohFAVptFsY4Mt6ChX2z86SoJ2gu8CyoxsBXjqilxC6gLIX is4SP9fL22GABGU3DQk+HccPmJt5l2vRZHqxkP9l3+JLJvJ9lqnGlFmosIvxJddxHg+I OF8+1YZeN0JBd8BXUJ/2md+qZkG1aEHHG2gE6fO/xE/LVYE0qlrcvQE6ib2Y39wFedyI 8GAw== X-Gm-Message-State: AOJu0YwZFputHv5xnR4zBxnWTqoqgxqRZputHOcpd7ybcF3WmJM9T1EF zyS08YgXsXSxOwd4unZHShm1rkQtnVUCdPmENbpZPm/ihi8DTTJ8tVhgOUo63TA6Kt7bc3LJJW8 NgJd2 X-Gm-Gg: ASbGncvr1nITaBupmn701OEvxVHnuXG3a2o3PVebmxO9jJU2i6MM69JfwHrFQGdtxZk rcHowBfC8uBUQ9teWvz4Owwdk3dxV5INFfyBMKjVBR9zKMdWBZGP7bw68IU3UJv/h1nEQ1dt9od thNm/6VUEgBNsj2RH5Z9bbhRuyqCcjeCg4W7R39dJmmb36s/XX7xSNtBqe/RwjtSTV5vFj8toGE t4V3sWBo6o59ZUywLv6LH9HJBCZdXrJKHGFBRCuKLz9tT9FluqvdUl5kza3DwUZqlqLVruLcXkW lEcUsYoHYPPoPzu9ZAjZiHGJ9uLQZA7wiYVvnETUHi+QO36VT7fNS7aghZmEY44IBrFJN8sOgPu JIVvm6rS3M/RDj5SUsSiAdNWAtrefbcLJxW+j X-Google-Smtp-Source: AGHT+IGSZgVi8a4ONdtjF7+uNRguyN8Xn3B71Lmx7xCfC5fcG/JmZoeL4oP6TQwKjqTxGU0oRlOa5A== X-Received: by 2002:a05:6000:2d11:b0:3a4:e1e1:7779 with SMTP id ffacd0b85a97d-3a6d130707cmr5965156f8f.32.1750681260192; Mon, 23 Jun 2025 05:21:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v3 26/26] tests/functional: Expand Aarch64 SMMU tests to run on HVF accelerator Date: Mon, 23 Jun 2025 14:18:45 +0200 Message-ID: <20250623121845.7214-27-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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 @linaro.org) X-ZM-MESSAGEID: 1750681513431116600 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- tests/functional/test_aarch64_smmu.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/functional/test_aarch64_smmu.py b/tests/functional/test_= aarch64_smmu.py index c65d0f28178..e0f4a922176 100755 --- a/tests/functional/test_aarch64_smmu.py +++ b/tests/functional/test_aarch64_smmu.py @@ -17,7 +17,7 @@ =20 from qemu_test import LinuxKernelTest, Asset, exec_command_and_wait_for_pa= ttern from qemu_test import BUILD_DIR -from qemu.utils import kvm_available +from qemu.utils import kvm_available, hvf_available =20 =20 class SMMU(LinuxKernelTest): @@ -45,11 +45,17 @@ def set_up_boot(self, path): self.vm.add_args('-device', 'virtio-net,netdev=3Dn1' + self.IOMMU_= ADDON) =20 def common_vm_setup(self, kernel, initrd, disk): - self.require_accelerator("kvm") + if hvf_available(self.qemu_bin): + accel =3D "hvf" + elif kvm_available(self.qemu_bin): + accel =3D "kvm" + else: + self.skipTest("Neither HVF nor KVM accelerator is available") + self.require_accelerator(accel) self.require_netdev('user') self.set_machine("virt") self.vm.add_args('-m', '1G') - self.vm.add_args("-accel", "kvm") + self.vm.add_args("-accel", accel) self.vm.add_args("-cpu", "host") self.vm.add_args("-machine", "iommu=3Dsmmuv3") self.vm.add_args("-d", "guest_errors") --=20 2.49.0