Received: by 2002:a05:7300:232a:b0:178:84eb:402c with SMTP id r42csp3934451dye; Wed, 2 Jul 2025 09:33:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXP9E7KAA0iuoXMCl7GTe7I6+JxpaiDkbPKSkgvO6SqGq2asJpphanH+IQ4QeXH6O6RUIMe7cdxM8eJ8g==@linaro.org X-Google-Smtp-Source: AGHT+IGdXEI6hpERfrww3b10c9gjK0o0xvJ97W+0PGpBsX4tmiGlIUNDeYghmlGDQO2rhFiZiQhn X-Received: by 2002:a05:6102:3051:b0:4e9:b793:1977 with SMTP id ada2fe7eead31-4f160d1b3aemr2622129137.0.1751473983284; Wed, 02 Jul 2025 09:33:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1751473983; cv=none; d=google.com; s=arc-20240605; b=GyRPjCg4LtsCa8kO897LGwzYJdVubv9d0mkm5xTw0zU1rE/iGpzESNxDSK6sLQEW5m 6FmKkv6Qk2Hx8O2wKGbCw/jB3orGIYwNxFMyMFm4iVXcYGyZFbYfiubq/uyyswSxpzec Hfd4+teUnizRc+/hTqnHVzUx6qOdyz5rnYCPnkbTIJljkgPdGICs0xZYhN3CDKeO0x4f tQFhkgHLD3X47rneyodWu2iWy7GA69CqXLvUkwXECDg9acOV1mpZppxyvs2g7uXlhopS fgTj8Cm50CuMyx7K8aHhBLiXaYYitIBfaalquBIHRq6z+eqkSe/UcHsQwwFxzm1yN5Is dUng== 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=VIO3QjGihpg0pRmeEdaHGcV+vixwNp8615zzaf7hMBA=; fh=UVrGBnfE9R8/5nTz0HPCluylUu4vXq1b0MPFtmDhPnc=; b=ZO0tei9XG/y7DKerm1sQWUnO16KgJmFmKYHGD9kgfb32d3aEw4PKWWjv7qRPYglaNK JkWxHNx/shmV4aUcPvWvHEI50+f1VdOGjw+9VYNNm6RkKy2MCZ2Cg1lTVdRdFBU/QKjN Gf/rKnNyVmFIBzmklP6js3AjJ3ojCBOa+/33XARbhW/ai3f/jtvSWKS2c9ae/8k9OU3C GOAmOS7+IpOXksUPW0SSv8DmL1VB02qHxRIWlatgwqhSZN17uSBFAtGviCmnlPUiqS4P Z4GwouemBjuVQ7IaKX+Bp7nmlGLnrZyyWqgEhRdDIOTOzzofXn5anzKUZG+RbHzHcnEl 12lA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YmRCPgno; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4efaa2efcb5si2021140137.118.2025.07.02.09.33.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 Jul 2025 09:33:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=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=@redhat.com header.s=mimecast20190719 header.b=YmRCPgno; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uX0NN-0001Fr-BF; Wed, 02 Jul 2025 12:32:03 -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 1uX0NC-0001Bm-7g for qemu-devel@nongnu.org; Wed, 02 Jul 2025 12:31:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uX0N6-0006Fc-CP for qemu-devel@nongnu.org; Wed, 02 Jul 2025 12:31:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751473901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VIO3QjGihpg0pRmeEdaHGcV+vixwNp8615zzaf7hMBA=; b=YmRCPgno0QNoXN47Kzhm5VWzwTn175kitrxXjf4129tN7reyfEjSvLc3k9QopCSOgGZAOn JSYcQU6bF7A0BEKGBFjMfZwdLCbMLxNGFGZm54uHgpb/lNnNuT/fc4v5Qdq3b9BgmWebL6 QK6tXWm661ColBJdohRmS0fmjY2+Fo4= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-443-yhxrP4-SM7Grzw9CJAgrPg-1; Wed, 02 Jul 2025 12:31:39 -0400 X-MC-Unique: yhxrP4-SM7Grzw9CJAgrPg-1 X-Mimecast-MFC-AGG-ID: yhxrP4-SM7Grzw9CJAgrPg_1751473897 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DFB7F1800343; Wed, 2 Jul 2025 16:31:36 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.44.32.16]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 204D5195608F; Wed, 2 Jul 2025 16:31:32 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, miguel.luis@oracle.com, peter.maydell@linaro.org, richard.henderson@linaro.org, maz@kernel.org, gkulkarni@amperecomputing.com, gankulkarni@os.amperecomputing.com Cc: hi@alyssa.is Subject: [PATCH v7 3/4] target/arm: Enable feature ARM_FEATURE_EL2 if EL2 is supported Date: Wed, 2 Jul 2025 18:30:42 +0200 Message-ID: <20250702163115.251445-4-eric.auger@redhat.com> In-Reply-To: <20250702163115.251445-1-eric.auger@redhat.com> References: <20250702163115.251445-1-eric.auger@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass client-ip=170.10.129.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.237, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+alex.bennee=linaro.org@nongnu.org Sender: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: Q3VxbhxQ3FA8 From: Haibo Xu KVM_CAP_ARM_EL2 must be supported by the cpu to enable ARM_FEATURE_EL2. In case the host does support NV, expose the feature. Signed-off-by: Haibo Xu Signed-off-by: Miguel Luis Signed-off-by: Eric Auger Reviewed-by: Richard Henderson --- v2 -> v3: - check pmu->has_el2 on kvm_arch_init_vcpu() when setting KVM_ARM_VCPU_HAS_EL2 feature (Peter) v1 -> v2: - remove isar_feature_aa64_aa32_el2 modif in target/arm/cpu.h [Richard] and use el2_supported in kvm_arch_init_vcpu --- target/arm/kvm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index e5708e54ae..46e5f19637 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -250,6 +250,7 @@ static bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) */ int fdarray[3]; bool sve_supported; + bool el2_supported; bool pmu_supported = false; uint64_t features = 0; int err; @@ -269,6 +270,14 @@ static bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) init.features[0] |= 1 << KVM_ARM_VCPU_SVE; } + /* + * Ask for EL2 if supported. + */ + el2_supported = kvm_arm_el2_supported(); + if (el2_supported) { + init.features[0] |= 1 << KVM_ARM_VCPU_HAS_EL2; + } + /* * Ask for Pointer Authentication if supported, so that we get * the unsanitized field values for AA64ISAR1_EL1. @@ -422,6 +431,10 @@ static bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) features |= 1ULL << ARM_FEATURE_AARCH64; features |= 1ULL << ARM_FEATURE_GENERIC_TIMER; + if (el2_supported) { + features |= 1ULL << ARM_FEATURE_EL2; + } + ahcf->features = features; return true; @@ -1887,6 +1900,9 @@ 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()) { + cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_HAS_EL2; + } /* Do KVM_ARM_VCPU_INIT ioctl */ ret = kvm_arm_vcpu_init(cpu); -- 2.49.0