From patchwork Tue Jun 17 16:33:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 897381 Delivered-To: patch@linaro.org Received: by 2002:adf:9b99:0:b0:3a4:ee3f:8f15 with SMTP id d25csp2245472wrc; Tue, 17 Jun 2025 09:34:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU1gkGlw4MMZL4KKBul1Wlmrj1wbDLsHmIL4TRQwQMuE9LQ205/GracLnOYTCaW2KZA8ppk6w==@linaro.org X-Google-Smtp-Source: AGHT+IFzzgoZqgozUIaU6OEa9NbOGVpI771Kv01OtFuqYJ4QxDXk4qgdjkAQZxTNoPxm+dmBIVHI X-Received: by 2002:a05:620a:2403:b0:7d0:9bd7:f9ae with SMTP id af79cd13be357-7d3c6c0c773mr1987250485a.2.1750178088891; Tue, 17 Jun 2025 09:34:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1750178088; cv=none; d=google.com; s=arc-20240605; b=VX9DpE2p/xG5qd0V1qDNMyRNSKwjbomwmBuwltbjZOp+KBWfRl4QpixpoLXx4iTlas 1u/tU32UEXJ7lO+BMKYrqjRouij9pO+Eyr0K69i3za0j+YHaAYB74osiWwlMvJpy5Lux gN+In9lwzk09AVeujSfsFiBxMhYbgbBqtgntQ/OH11hrgzYGERJxoq94U1RnKwwSlZRG Ov3ISRmK99TDNKQcFPWHT7qWmG2v1KyR43m5GhwNp1NcQ/ORDrwwhRPRpII0avTpdF4y UMwNuiTkVwtlLJDgI47iJkdiVqWG4EuKnIBMvj2i5kSdAluG4//NFXvXTZ8dQ1eY6+Yn 2S3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=I4mTaJwkAe0rgPcWQ6kEwY/uI1enES5AbvkajjNAiL4=; fh=CysBbgsazybhgHwNDtjR43A6u/TnfAIXG8xcQOkv9c0=; b=XSvXhA5UbD/Z98VMnUyKWRIQ6Oh/gmP5b+XzNcZCHO2TrfPLExlMmmAioAyxS7GpGA hJa2Z121W8gRkdHc3HRW92Hpt2wxANqN+r1uZgpmvha5dKfBYnkZ3y5qnZ0AY7cil9/W CPzGvzn5ImyRjal1fmg746y1Rx5xuzLjOnGPsuPEG9a2PBhcDrzfN3vQNY2qawOaESqC 562Ip5Gc4IPaP7tVmR5c9JWedTuDGdSYH03WegmiFsJqO8/H+CZzOnp/KhC2c/UXfTu0 ry2d7IW9K2LoVIBjhJh/lG0OC1YBvLljBav93Uwgfu+w1Z85R/PYnQ2dUVuA/apgj3Fy 7TSg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FT3jVPIk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7d3b8dc7287si1227910085a.13.2025.06.17.09.34.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jun 2025 09:34:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FT3jVPIk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRZGc-0000sZ-Gz; Tue, 17 Jun 2025 12:34:34 -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 1uRZG5-0000lO-LS for qemu-devel@nongnu.org; Tue, 17 Jun 2025 12:34:08 -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 1uRZG1-0000dP-Cl for qemu-devel@nongnu.org; Tue, 17 Jun 2025 12:34:00 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4533bf4d817so20403475e9.2 for ; Tue, 17 Jun 2025 09:33:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750178036; x=1750782836; 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=I4mTaJwkAe0rgPcWQ6kEwY/uI1enES5AbvkajjNAiL4=; b=FT3jVPIkt5uUfNwK/IZvjugQHOE5Fn6jzm8TZt0UNPS8R1z2MbtgBKoosXGoWIDSBs eeW6yfR+uVYPLIJK6GWDuKfsODCWwZ08q5tDCwOExP1bKccHjFRI6/uLS0cLPLf28EvS S7xSp8efVGYldEJR5/6RzD2j2x+z8u1MymYOd4MPTTwtn6eWWMMQ/G+8nyYQ8SSv31Is 9GVjv70tLTlM0XGn5ou6aTFohK2FxcRpDlIzBq7/6b4cOfLoiSFxVBiniGj6UWAXzgZL LnKNQ4dSlT0J0h1jxdnon4t2buxeZAxlRiC2xrrg5MXQdmUMQZPXQJdf6jMPCKv3aaOL H4/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750178036; x=1750782836; 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=I4mTaJwkAe0rgPcWQ6kEwY/uI1enES5AbvkajjNAiL4=; b=V+byQ2n72766k1SskNN6pg06WLalCDa9bOpbwtopW73ZQoI0G0MnJIYCyGxXg6+/do LNoI7tCOm4vf9NOkuO4eNdSG53w1nSv6Iq+LHC/FotgXQ5i+G6aJpj5UnTYnq/cURz+W SfP03kvuzHeKzkfbZpa7mIYnlVLi2+EgDFm1wES2TW+hWwl1eKHgjtY9x2cOdd3e9sTj diRtOxWckFlr6hbhgR2jIANIK5Pa4dpFmc0Y2ChPnilcNaFe7bQXTBGOwx+h+7gKkQ8N zLo0L+NoW4/mqydUB8YgFfCwRwPdWgc1RXqb9cwgIkF9sx4eZfY4E/KZcHNqdZkzGBiX 4CSA== X-Gm-Message-State: AOJu0YzdsLiOB/FaJXo+oKl/N/cNA3LC4VKEJGkxFXxB4ogh3ZfshQNc Xfj/hyEPxnTExAGHXWWPYDOSd8CHkxPzsuE3+Y6rp+nZFrVAeNVNc2Ertthbf86xtq4= X-Gm-Gg: ASbGncvRMvHems7MB1X6VBKL/5UknHCKJHzlHKPwCQCL/+w/FJcdXDOwCqNPmrPrWoP TiCX7kBkPa28bSEyDTmY5wwm4MHVQwNG00+52xGQPHtg4VzOJS/Z7Ds4UqjstAHDibGFW7wDH+j LnrJnlsdUckosvFGXZpxKFEEyxzV9Jj/Mpx4RHc6CFiP6fdc9WFynBfqIivBZGwBTR6RaIbygGo MQAVeHJkTv9hDhfxZKBveabfp8a1QedsHSwTMuYbaCW2hrJKK0lOPg5rSFIVnP9HQf6nfcX1/7e fdlaBbpfI9347z3EEsxJRlr+BFfl4DwAnnOp6gCRF5cWQp8UgJx44xg7kLNVEKw= X-Received: by 2002:a05:600c:1e02:b0:43d:fa59:af97 with SMTP id 5b1f17b1804b1-4533cac919bmr120131075e9.32.1750178035689; Tue, 17 Jun 2025 09:33:55 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4532e232219sm178762495e9.9.2025.06.17.09.33.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 09:33:54 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 5B8825F8B5; Tue, 17 Jun 2025 17:33:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , qemu-arm@nongnu.org, Mark Burton , "Michael S. Tsirkin" , Alexander Graf , kvm@vger.kernel.org, Peter Maydell , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= Subject: [RFC PATCH 05/11] target/arm: enable KVM_VM_TYPE_ARM_TRAP_ALL when asked Date: Tue, 17 Jun 2025 17:33:45 +0100 Message-ID: <20250617163351.2640572-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250617163351.2640572-1-alex.bennee@linaro.org> References: <20250617163351.2640572-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Alex Bennée --- target/arm/kvm_arm.h | 9 +++++++++ hw/arm/virt.c | 7 +++++-- target/arm/kvm.c | 7 +++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 7dc83caed5..a4f68e14cb 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -191,6 +191,15 @@ bool kvm_arm_sve_supported(void); */ bool kvm_arm_mte_supported(void); +/** + * kvm_arm_get_type: return the base KVM type flags + * @ms: Machine state handle + * + * Returns the base type flags, usually zero. These will be combined + * with the IPA flags from bellow. + */ +int kvm_arm_get_type(MachineState *ms); + /** * kvm_arm_get_max_vm_ipa_size: * @ms: Machine state handle diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9a6cd085a3..55433f8fce 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3037,11 +3037,14 @@ static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, /* * for arm64 kvm_type [7-0] encodes the requested number of bits - * in the IPA address space + * in the IPA address space. + * + * For trap-me-harder we apply KVM_VM_TYPE_ARM_TRAP_ALL */ static int virt_kvm_type(MachineState *ms, const char *type_str) { VirtMachineState *vms = VIRT_MACHINE(ms); + int kvm_type = kvm_arm_get_type(ms); int max_vm_pa_size, requested_pa_size; bool fixed_ipa; @@ -3071,7 +3074,7 @@ static int virt_kvm_type(MachineState *ms, const char *type_str) * the implicit legacy 40b IPA setting, in which case the kvm_type * must be 0. */ - return fixed_ipa ? 0 : requested_pa_size; + return fixed_ipa ? kvm_type : deposit32(kvm_type, 0, 8, requested_pa_size); } static int virt_hvf_get_physical_address_range(MachineState *ms) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 8b1719bfc1..ed0f6024d6 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -515,6 +515,13 @@ int kvm_arm_get_max_vm_ipa_size(MachineState *ms, bool *fixed_ipa) return ret > 0 ? ret : 40; } +int kvm_arm_get_type(MachineState *ms) +{ + KVMState *s = KVM_STATE(ms->accelerator); + + return s->trap_harder ? KVM_VM_TYPE_ARM_TRAP_ALL : 0; +} + int kvm_arch_get_default_type(MachineState *ms) { bool fixed_ipa;