From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5D5DDCA0ED1 for ; Mon, 11 Aug 2025 17:12:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulVzu-0005Jf-T3; Mon, 11 Aug 2025 13:07:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ulVzR-0004zu-94 for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:07:25 -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 1ulVzC-0001qy-Nv for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:07:14 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-45a0dc77a15so5423285e9.2 for ; Mon, 11 Aug 2025 10:07:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754932017; x=1755536817; 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=tTxLOjP4FhmiKvW9Jt5SVA/50ytmZzwnIVFBfjDcbbg=; b=tWU74dEgB3EVpn7rAjr+e77kFYrWhEh06tRS+95tcgAINtDcISArOQ42gFZ03dJjb6 1I2D/UPUKEDeJUN6X618wcDu0YVHHA9DjQaWX1jYJarbkaOdjSaRSdKQZ3ItkGncYdZS /oLYGg5iruAv/mH5N90Ggfs36ExhhNomD/gkmtSlNXugSBSAxaxFt9Sn0YPGkD+C0aOT 0mL/XniRbs5+MpT7wbwpx11a6Ru/2Q8h9bMgZT6zMFBxKlhHagycgbo1CJ5Z+JtE7+Fs eyEq6akGqTly/RFcVyEIyT6cAuDnZVrYltGYNusEtsEf4B+qEI/Ue9MznlVPAOgNnhxi ZJyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754932017; x=1755536817; 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=tTxLOjP4FhmiKvW9Jt5SVA/50ytmZzwnIVFBfjDcbbg=; b=gMhZfmvO3U7Jr6i798hsEjpbGCZ4qwUJ6dQmTb/Ay3kzrrlseaLK+I3zAL7zYeFV8n jSMsI68P4SGowkPo/pKxQpDlFtCmkizkmGdjcVcsBjdlSbHl/u+wgzVInRlUo+goSdZ4 gb0Uwo2chOSbwUgAQGLBEy0lEgYOgpfOrzoE7zKzHxcNez3a47DnSukc3TsAeoxKRk+2 zIHzLFD6Z3ad3RDpPNTUs2sR8Vdrr3jL71xgZ9LGgrn1l2mDLLqUv0ORducx2vQa7FBj NbOvypq9a0uMniioDNdVdUUHC3oOKe2Lr18PK9DeOJffQU9WAEChAbHnaX+C7/4I2FwE qo9A== X-Gm-Message-State: AOJu0YwqN5ni+ujpCoNy9ziw6mmWhnJeYZVX9zwuUNx4mzaAPwsucXC5 RI1WzulV/Hsp8qQlELs+plEMW4om+RNNB5X+8KcReBU2+Cj/jtzQZYUK4d0X5Y8b8aJnxi1o88u TAK2W X-Gm-Gg: ASbGncvlmVHUSIyXggimya+tvDg6nz9XdB5Y+931ru/wC+mQSlTXJRATtUjqEtx4fVl zJC6g1/danlyZ7iAfUGXHOnXDMMNr0BFQeEZY7u5PgppvFf4cy2HwSrxsb59ZI5q7Co6oGMNg2U p3vFlaGTaO6+iriae/7Fx6QjywzUBEZxxkGfJiTNsDaIZy/mj/nTa+syEpzrsy9PXm2B8wtBNTY mS8jBUvSq4jkACYjd60DeEoofBgA8JOZyzSutSixWNvphg3kb7Zo7jVdEygHCHyNh2ipX54gepE BPHjSjNDAuSdNoVPq4iqpR0bj5sH3wqvBfaDfwXizyAA9Ol0gJVrseDb5kXyw153I0HXwRuS+lY 6x6rJ06McJa7HSUrgRSiU/HKUZ8oFxLfinegWeciuALDTJ+2L3mpi0qG1klJ9trm8WIE/tGHuNQ gtaoDQa1k= X-Google-Smtp-Source: AGHT+IEMcG/Ev4eyU/L7hIS6KC5DMgPfd5GRoRtRkLPDfgT0WRaP7S9VSCoMBvoitgce/yrC+B3d3w== X-Received: by 2002:a05:600c:470c:b0:459:d709:e5cf with SMTP id 5b1f17b1804b1-45a10bad987mr5229185e9.3.1754932017284; Mon, 11 Aug 2025 10:06:57 -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-459e5887b7fsm261545415e9.30.2025.08.11.10.06.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 11 Aug 2025 10:06:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Miguel Luis , Richard Henderson , kvm@vger.kernel.org, Peter Maydell , Paolo Bonzini , Haibo Xu , Mohamed Mediouni , Mark Burton , Alexander Graf , Claudio Fontana , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mads Ynddal , Eric Auger , qemu-arm@nongnu.org, Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 08/11] target/arm: Replace kvm_arm_el2_supported by host_cpu_feature_supported Date: Mon, 11 Aug 2025 19:06:08 +0200 Message-ID: <20250811170611.37482-9-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250811170611.37482-1-philmd@linaro.org> References: <20250811170611.37482-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Use the generic host_cpu_feature_supported() helper to check for the EL2 feature support. This will allow to expand to non-KVM accelerators such HVF. Signed-off-by: Philippe Mathieu-Daudé --- target/arm/kvm_arm.h | 11 ----------- hw/arm/virt.c | 8 +------- target/arm/kvm-stub.c | 5 ----- target/arm/kvm.c | 6 +++--- 4 files changed, 4 insertions(+), 26 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 364578c50d6..7e5755d76b2 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -191,12 +191,6 @@ bool kvm_arm_sve_supported(void); */ bool kvm_arm_mte_supported(void); -/** - * kvm_arm_el2_supported: - * - * Returns true if KVM can enable EL2 and false otherwise. - */ -bool kvm_arm_el2_supported(void); #else static inline bool kvm_arm_aarch32_supported(void) @@ -213,11 +207,6 @@ static inline bool kvm_arm_mte_supported(void) { return false; } - -static inline bool kvm_arm_el2_supported(void) -{ - return false; -} #endif /** diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ef6be3660f5..c2f71ecbfa7 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2267,13 +2267,7 @@ static void machvirt_init(MachineState *machine) exit(1); } - if (vms->virt && kvm_enabled() && !kvm_arm_el2_supported()) { - error_report("mach-virt: host kernel KVM does not support providing " - "Virtualization extensions to the guest CPU"); - exit(1); - } - - if (vms->virt && !kvm_enabled() && !tcg_enabled() && !qtest_enabled()) { + if (vms->virt && !host_cpu_feature_supported(ARM_FEATURE_EL2, true)) { error_report("mach-virt: %s does not support providing " "Virtualization extensions to the guest CPU", current_accel_name()); diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index 3beb336416d..35afcc7d6f9 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -42,11 +42,6 @@ bool kvm_arm_mte_supported(void) return false; } -bool kvm_arm_el2_supported(void) -{ - return false; -} - /* * These functions should never actually be called without KVM support. */ diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 0fe0f89f931..a9f05bfa7ea 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -274,7 +274,7 @@ static bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) /* * Ask for EL2 if supported. */ - el2_supported = kvm_arm_el2_supported(); + el2_supported = host_cpu_feature_supported(ARM_FEATURE_EL2, false); if (el2_supported) { init.features[0] |= 1 << KVM_ARM_VCPU_HAS_EL2; } @@ -1780,7 +1780,7 @@ bool arm_hw_accel_cpu_feature_supported(enum arm_features feat, bool can_emulate case ARM_FEATURE_PMU: return kvm_check_extension(kvm_state, KVM_CAP_ARM_PMU_V3); case ARM_FEATURE_EL2: - return kvm_arm_el2_supported(); + return kvm_check_extension(kvm_state, KVM_CAP_ARM_EL2); case ARM_FEATURE_EL3: return false; default: @@ -1918,7 +1918,7 @@ int kvm_arch_init_vcpu(CPUState *cs) cpu->kvm_init_features[0] |= (1 << KVM_ARM_VCPU_PTRAUTH_ADDRESS | 1 << KVM_ARM_VCPU_PTRAUTH_GENERIC); } - if (cpu->has_el2 && kvm_arm_el2_supported()) { + if (cpu->has_el2 && host_cpu_feature_supported(ARM_FEATURE_EL2, false)) { cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_HAS_EL2; } -- 2.49.0