From nobody Tue Dec 16 22:14:02 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A40E824336D for ; Tue, 18 Feb 2025 16:34:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739896492; cv=none; b=NJ1wKDYGaKin8yIMmUGA/3jp0rIpDpkwloLHPKY4pHBNiFJyAHP4A0xUE6j90Kq+ddNzY55mFG1p5JCfA1a1np69iT3fSNpErnm/BXYdGi4oQlEeJINXu/K3Ded+03nojutiZ2hTVNlr4YrUT1EABSSu4WZdo0SJlCY/EkolX2M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739896492; c=relaxed/simple; bh=HDIro145JF8qLhcr+46jJCYyEkbhSTfDHCqE/GyK3Uw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KoOnvOkpNqU2wKjiAJBazHvBO2Qk+DpapTIw4wCyXOaGXpgQDp9egEHtLROeIPaXeH69ITouugLD+AuVpuEjZzPLxU5mOZ0oTAVuRMI0Bo/sAlB9P1igMgeYgZteDTGatMp7suJ1HprERt/XSiFsEmPq4hcZkUR8RCfvILTAa3I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=eGVc6TJY; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eGVc6TJY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739896489; 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=FBAJYqM7ldZvJEhXpvC4FzpZR8Z/lsR/9f9gWywL5Lk=; b=eGVc6TJYfN6Oo3uQ/aqlkBIScXDUCnOLgo+6eTl5jFncOplaiCyFGjj+A5zK+htgMBKqEc FWJyo2jxku592Dxtvg240HFZrBEPZiV+ztqFvuAlGHWvxZYddPXdwWrB51M+eqNPWTCo4i wqQMzCFShhiX2R0LeCeki6omNSezxo8= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-150-4q-jDF79Mrm5wWC-pILGlg-1; Tue, 18 Feb 2025 11:34:48 -0500 X-MC-Unique: 4q-jDF79Mrm5wWC-pILGlg-1 X-Mimecast-MFC-AGG-ID: 4q-jDF79Mrm5wWC-pILGlg_1739896487 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-38f42f21f54so1286624f8f.1 for ; Tue, 18 Feb 2025 08:34:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739896487; x=1740501287; 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=FBAJYqM7ldZvJEhXpvC4FzpZR8Z/lsR/9f9gWywL5Lk=; b=iK+gns254Uwy1wjww5ePhLPAeJF6Xld/feaRWvzZ6XLYY68fUtfSLozWh7BohxHpaQ GHkSId2b5CTseZqYa+wOp3FuLy2bqegTBJR3tJolh10BUKpekQ31RKonY+Pb6K4BuBQS DRGs07Z+y+1kaFlTp/07Ip/pmbdaUYUXnA5qXxS0/HCdmBgr8Wz62DyHVjd/+25LQ+yr Gh6ywkVn2iriwoeAS2oOD+re4Xs6lLZHsIcwloQ1g7ljBDUWzxmYxQ7Ezf+pz7aPMA8f RmkCsSElxJHBCxtX3k1L9EGYDWouP/zkt+P2ER/8xuCXhjo8YQUN71NvMsvxQyw5wvCE T9YA== X-Forwarded-Encrypted: i=1; AJvYcCVrXlDQGILx2JgejKMAAGeGftLN1lJq9f7eONqfQngT67TN4yx6XwHhVDw24ZgMLvwA4CDxmJtSBzOz88M=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1dAgZB8x2B9859Z/sI5IGs9jkt1ynYUNAJ6cmZ+gikx01OcFc yS0LpFz/Zv0bwp2T+bCyLCyZIIqEpLy6eAzl9YNPMEpgMyG3rqKib//DZlmEJonjWsLFt+agZFU GaCDTBLZHGw6nQzOzt26csClKWXKk1TvVVlmmxPuZp6U7VHEv5OXtqZR6+aJqpw== X-Gm-Gg: ASbGncsJoY525QhcPhCq7ewLklrn4qK6x1UrLSUR5JcZEe7D7MbHbQN9bPC9nyHPCEv VJEToVBwxb6GobBRBXmGjkC0XJ7nfrJTRMy4U45u9isxT7TxkAIpitXA8VdEAssou44amBqVCdh 0mjv3gHmZmeC0rbiAaj682UqxcY1An7gx2n4Ej8T4brZsh5txyia0MSJK1+YwcVOXyFbw9SxOxA ymrO7MPXsG153OvcDTrUT6e0KQfjF8SWvXmQrxd8TfXY/o8twiIC6ojZKVUyQUDc8W9eXjOR/lN U7g+2ePhdnILXOgpKGrkiHI0e0l4LAGfes5cVyS1qpt1fxDqtdI/BgJ5vbXJVV4jTZ6M X-Received: by 2002:a5d:6da4:0:b0:38f:451b:653c with SMTP id ffacd0b85a97d-38f451b663emr6976524f8f.7.1739896486739; Tue, 18 Feb 2025 08:34:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IEsArJCvYl0ZKZFFHRbr5Xj8NRWFPVPzZuhGHIdrmzHwJLirylNpc8AXsKQt8ODWlx1pdqlzg== X-Received: by 2002:a5d:6da4:0:b0:38f:451b:653c with SMTP id ffacd0b85a97d-38f451b663emr6976491f8f.7.1739896486212; Tue, 18 Feb 2025 08:34:46 -0800 (PST) Received: from rh.redhat.com (p200300f6af0e4d00dda53016e366575f.dip0.t-ipconnect.de. [2003:f6:af0e:4d00:dda5:3016:e366:575f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4396b5267eesm85091845e9.0.2025.02.18.08.34.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 08:34:45 -0800 (PST) From: Sebastian Ott To: Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , Shameer Kolothum Cc: Cornelia Huck , Eric Auger , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/4] KVM: arm64: Allow userspace to change MIDR_EL1 Date: Tue, 18 Feb 2025 17:34:40 +0100 Message-ID: <20250218163443.32836-2-sebott@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250218163443.32836-1-sebott@redhat.com> References: <20250218163443.32836-1-sebott@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Enable VMMs to write MIDR_EL1 by treating it as a VM ID register. Since MIDR_EL1 is not handled as a proper arm64_ftr_reg apply only a sanity check against the writable mask to ensure the reserved bits are 0. Set up VPIDR_EL2 to hold the MIDR_EL1 value for the guest. Signed-off-by: Sebastian Ott --- arch/arm64/include/asm/kvm_host.h | 3 ++ arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 5 +-- arch/arm64/kvm/hyp/nvhe/sysreg-sr.c | 10 +++++- arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 28 ++++++--------- arch/arm64/kvm/sys_regs.c | 42 ++++++++++++++++++++-- 5 files changed, 64 insertions(+), 24 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index 7cfa024de4e3..3db8c773339e 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -373,6 +373,7 @@ struct kvm_arch { #define KVM_ARM_ID_REG_NUM (IDREG_IDX(sys_reg(3, 0, 0, 7, 7)) + 1) u64 id_regs[KVM_ARM_ID_REG_NUM]; =20 + u64 midr_el1; u64 ctr_el0; =20 /* Masks for VNCR-backed and general EL2 sysregs */ @@ -1469,6 +1470,8 @@ static inline u64 *__vm_id_reg(struct kvm_arch *ka, u= 32 reg) switch (reg) { case sys_reg(3, 0, 0, 1, 0) ... sys_reg(3, 0, 0, 7, 7): return &ka->id_regs[IDREG_IDX(reg)]; + case SYS_MIDR_EL1: + return &ka->midr_el1; case SYS_CTR_EL0: return &ka->ctr_el0; default: diff --git a/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h b/arch/arm64/kvm/hy= p/include/hyp/sysreg-sr.h index 76ff095c6b6e..c8f37e702724 100644 --- a/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h +++ b/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h @@ -168,9 +168,10 @@ static inline void __sysreg_restore_user_state(struct = kvm_cpu_context *ctxt) } =20 static inline void __sysreg_restore_el1_state(struct kvm_cpu_context *ctxt, - u64 mpidr) + u64 midr, u64 mpidr) { - write_sysreg(mpidr, vmpidr_el2); + write_sysreg(midr, vpidr_el2); + write_sysreg(mpidr, vmpidr_el2); =20 if (has_vhe() || !cpus_have_final_cap(ARM64_WORKAROUND_SPECULATIVE_AT)) { diff --git a/arch/arm64/kvm/hyp/nvhe/sysreg-sr.c b/arch/arm64/kvm/hyp/nvhe/= sysreg-sr.c index dba101565de3..a01be1add5ad 100644 --- a/arch/arm64/kvm/hyp/nvhe/sysreg-sr.c +++ b/arch/arm64/kvm/hyp/nvhe/sysreg-sr.c @@ -28,7 +28,15 @@ void __sysreg_save_state_nvhe(struct kvm_cpu_context *ct= xt) =20 void __sysreg_restore_state_nvhe(struct kvm_cpu_context *ctxt) { - __sysreg_restore_el1_state(ctxt, ctxt_sys_reg(ctxt, MPIDR_EL1)); + u64 midr; + + if (ctxt_is_guest(ctxt)) + midr =3D kvm_read_vm_id_reg(kern_hyp_va(ctxt_to_vcpu(ctxt)->kvm), + SYS_MIDR_EL1); + else + midr =3D read_cpuid_id(); + + __sysreg_restore_el1_state(ctxt, midr, ctxt_sys_reg(ctxt, MPIDR_EL1)); __sysreg_restore_common_state(ctxt); __sysreg_restore_user_state(ctxt); __sysreg_restore_el2_return_state(ctxt); diff --git a/arch/arm64/kvm/hyp/vhe/sysreg-sr.c b/arch/arm64/kvm/hyp/vhe/sy= sreg-sr.c index 90b018e06f2c..a57a771e9be6 100644 --- a/arch/arm64/kvm/hyp/vhe/sysreg-sr.c +++ b/arch/arm64/kvm/hyp/vhe/sysreg-sr.c @@ -87,11 +87,12 @@ static void __sysreg_restore_vel2_state(struct kvm_vcpu= *vcpu) write_sysreg(__vcpu_sys_reg(vcpu, PAR_EL1), par_el1); write_sysreg(__vcpu_sys_reg(vcpu, TPIDR_EL1), tpidr_el1); =20 - write_sysreg(__vcpu_sys_reg(vcpu, MPIDR_EL1), vmpidr_el2); - write_sysreg_el1(__vcpu_sys_reg(vcpu, MAIR_EL2), SYS_MAIR); - write_sysreg_el1(__vcpu_sys_reg(vcpu, VBAR_EL2), SYS_VBAR); - write_sysreg_el1(__vcpu_sys_reg(vcpu, CONTEXTIDR_EL2), SYS_CONTEXTIDR); - write_sysreg_el1(__vcpu_sys_reg(vcpu, AMAIR_EL2), SYS_AMAIR); + write_sysreg(kvm_read_vm_id_reg(vcpu->kvm, SYS_MIDR_EL1), vpidr_el2); + write_sysreg(__vcpu_sys_reg(vcpu, MPIDR_EL1), vmpidr_el2); + write_sysreg_el1(__vcpu_sys_reg(vcpu, MAIR_EL2), SYS_MAIR); + write_sysreg_el1(__vcpu_sys_reg(vcpu, VBAR_EL2), SYS_VBAR); + write_sysreg_el1(__vcpu_sys_reg(vcpu, CONTEXTIDR_EL2), SYS_CONTEXTIDR); + write_sysreg_el1(__vcpu_sys_reg(vcpu, AMAIR_EL2), SYS_AMAIR); =20 if (vcpu_el2_e2h_is_set(vcpu)) { /* @@ -191,7 +192,7 @@ void __vcpu_load_switch_sysregs(struct kvm_vcpu *vcpu) { struct kvm_cpu_context *guest_ctxt =3D &vcpu->arch.ctxt; struct kvm_cpu_context *host_ctxt; - u64 mpidr; + u64 midr, mpidr; =20 host_ctxt =3D host_data_ptr(host_ctxt); __sysreg_save_user_state(host_ctxt); @@ -220,23 +221,18 @@ void __vcpu_load_switch_sysregs(struct kvm_vcpu *vcpu) __sysreg_restore_vel2_state(vcpu); } else { if (vcpu_has_nv(vcpu)) { - /* - * Use the guest hypervisor's VPIDR_EL2 when in a - * nested state. The hardware value of MIDR_EL1 gets - * restored on put. - */ - write_sysreg(ctxt_sys_reg(guest_ctxt, VPIDR_EL2), vpidr_el2); - /* * As we're restoring a nested guest, set the value * provided by the guest hypervisor. */ + midr =3D ctxt_sys_reg(guest_ctxt, VPIDR_EL2); mpidr =3D ctxt_sys_reg(guest_ctxt, VMPIDR_EL2); } else { + midr =3D kvm_read_vm_id_reg(vcpu->kvm, SYS_MIDR_EL1); mpidr =3D ctxt_sys_reg(guest_ctxt, MPIDR_EL1); } =20 - __sysreg_restore_el1_state(guest_ctxt, mpidr); + __sysreg_restore_el1_state(guest_ctxt, midr, mpidr); } =20 vcpu_set_flag(vcpu, SYSREGS_ON_CPU); @@ -271,9 +267,5 @@ void __vcpu_put_switch_sysregs(struct kvm_vcpu *vcpu) /* Restore host user state */ __sysreg_restore_user_state(host_ctxt); =20 - /* If leaving a nesting guest, restore MIDR_EL1 default view */ - if (vcpu_has_nv(vcpu)) - write_sysreg(read_cpuid_id(), vpidr_el2); - vcpu_clear_flag(vcpu, SYSREGS_ON_CPU); } diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 82430c1e1dd0..3cd4dfdd287a 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1666,7 +1666,7 @@ static bool is_feature_id_reg(u32 encoding) */ static inline bool is_vm_ftr_id_reg(u32 id) { - if (id =3D=3D SYS_CTR_EL0) + if (id =3D=3D SYS_CTR_EL0 || id =3D=3D SYS_MIDR_EL1) return true; =20 return (sys_reg_Op0(id) =3D=3D 3 && sys_reg_Op1(id) =3D=3D 0 && @@ -1999,6 +1999,33 @@ static int get_id_reg(struct kvm_vcpu *vcpu, const s= truct sys_reg_desc *rd, return 0; } =20 +static int set_id_reg_non_ftr(struct kvm_vcpu *vcpu, const struct sys_reg_= desc *rd, + u64 val) +{ + u32 id =3D reg_to_encoding(rd); + + guard(mutex)(&vcpu->kvm->arch.config_lock); + /* + * Once the VM has started the ID registers are immutable. Reject any + * write that does not match the final register value. + */ + if (kvm_vm_has_ran_once(vcpu->kvm)) { + if (val !=3D read_id_reg(vcpu, rd)) + return -EBUSY; + + return 0; + } + + /* + * For non ftr regs do a limited test against the writable mask only. + */ + if ((rd->val & val) !=3D val) + return -EINVAL; + + kvm_set_vm_id_reg(vcpu->kvm, id, val); + return 0; +} + static int set_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, u64 val) { @@ -2493,6 +2520,15 @@ static bool access_mdcr(struct kvm_vcpu *vcpu, return true; } =20 +#define FUNCTION_RESET(reg) \ + static u64 reset_##reg(struct kvm_vcpu *v, \ + const struct sys_reg_desc *r) \ + { \ + return read_sysreg(reg); \ + } + +FUNCTION_RESET(midr_el1) + =20 /* * Architected system registers. @@ -2542,6 +2578,8 @@ static const struct sys_reg_desc sys_reg_descs[] =3D { =20 { SYS_DESC(SYS_DBGVCR32_EL2), undef_access, reset_val, DBGVCR32_EL2, 0 }, =20 + { ID_DESC(MIDR_EL1), .set_user =3D set_id_reg_non_ftr, .visibility =3D id= _visibility, + .reset =3D reset_midr_el1, .val =3D GENMASK_ULL(31, 0) }, { SYS_DESC(SYS_MPIDR_EL1), NULL, reset_mpidr, MPIDR_EL1 }, =20 /* @@ -4594,13 +4632,11 @@ id_to_sys_reg_desc(struct kvm_vcpu *vcpu, u64 id, return ((struct sys_reg_desc *)r)->val; \ } =20 -FUNCTION_INVARIANT(midr_el1) FUNCTION_INVARIANT(revidr_el1) FUNCTION_INVARIANT(aidr_el1) =20 /* ->val is filled in by kvm_sys_reg_table_init() */ static struct sys_reg_desc invariant_sys_regs[] __ro_after_init =3D { - { SYS_DESC(SYS_MIDR_EL1), NULL, reset_midr_el1 }, { SYS_DESC(SYS_REVIDR_EL1), NULL, reset_revidr_el1 }, { SYS_DESC(SYS_AIDR_EL1), NULL, reset_aidr_el1 }, }; --=20 2.42.0 From nobody Tue Dec 16 22:14:02 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70AF01B6D18 for ; Tue, 18 Feb 2025 16:36:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739896564; cv=none; b=Jrc3qMWJSHsD6NFN2Jrvl10H1+WIeqymjS9IIiulv3zKYfdbsWGr4zPAWN2beJ/WzPPtD+NA7p8AapE4xNcKSHWC2ZzlElBKGDQY75MXjaYWr3/MVDxMoAS6ruX4bsZwqCeF1z7XmYz4RpOBy/WMmYN+0NcuOQ9EJHNVsoY4OaM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739896564; c=relaxed/simple; bh=kI8f+ZCKDCxxkN6vwc72VPsmzF9WcnNXHOsT35Jb1nw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=abmsQc8wNEXO2wPGbI+53RhXe5l+0AWD3PlEv/TRGRVgGe0DRp902vYpoOlpscCQglk5Xox0+M/Ig45LrOvFftRgE6L24Qjq1dxZLR+JQ/Rdobw4VL5432KIp+anh3eGz8lew7lJcPEwcSMAfJcbFVn9TmZZzV1/Y8krfoVrra4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ghT2sY0f; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ghT2sY0f" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739896561; 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=NeQXcS3pEHXKPjpS1aBvSo5HEPQatvaCcC9yZ+tXu5k=; b=ghT2sY0fQdwA20BCjKW1pqtun8pUwWt4hnVNwJc+fPD9D7LcMVrXs7qoozD6cziBHdf83O pBo5Mdb9CS4iC1rmREVzmkleTCXgDFagMt+x63U3nslVgNIUGYRj/BA0QNsST9E0mSNCfP 3zGdpYnc9YJncmQakJApIwHU8oVwOIE= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-218-fe5DnT7sPAGC36alDfQumQ-1; Tue, 18 Feb 2025 11:34:49 -0500 X-MC-Unique: fe5DnT7sPAGC36alDfQumQ-1 X-Mimecast-MFC-AGG-ID: fe5DnT7sPAGC36alDfQumQ_1739896488 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43933b8d9b1so30269725e9.3 for ; Tue, 18 Feb 2025 08:34:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739896488; x=1740501288; 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=NeQXcS3pEHXKPjpS1aBvSo5HEPQatvaCcC9yZ+tXu5k=; b=N6X7PjW+aEAK+M8QN6T1tvTy8WGbvmVX/hT6V6rjVIzwE7h9rXUfcvbxLKPqdtNV0e F7tpT01kTx48qrKn+aRBpfVSoKB97febaGll/NUXJp1mON0TnzkN/pgxbg4hizNf7CEv ueM1nctE97neHpOfgYTUaWjtfklkrYIpEeB6QaEENXQuKz4gvDRik98qzfWMKnPCKUF6 kCN4j0nTE+QMcYXxBPrqDGtkXcv3njualR478hkcyPKzueBkc4wN4mAg2RKfPw8W6zND nM1b9bRYnM+QnegPRA2aCPLOZwWlg4Btys8gramoB8oOx1k5AaxUh/wYQ+Iur4EGiiuA psow== X-Forwarded-Encrypted: i=1; AJvYcCVg5vPPAZKm7+w+rRdz5EPW+BeEzizCCpNgMAGUHT+EMfU69puRelKuAypMh4+Xpa4i89a50QodfuH27ms=@vger.kernel.org X-Gm-Message-State: AOJu0YwfI+qyCRKxyDS3qkHeQ2E29RZWVIpjbJeGNrvOLhDuk1kA36mB bDljd4n1US2G5mg5teB1isUbxjXKVe9qo/R195MChK6iPe2uBEoh2eQgKA8OzvGEHgxg8ceuiGh BJpyg/It56f4IZXw3kcOrb2aUfkuP3SIqpS02q5wuCarC/HQhUgf7hkOSTOarUQ== X-Gm-Gg: ASbGncv1B8lq4bfBuotNf69LEKRSvlLBzeaNZGP++IeOTeTtezBwLuLDj51bsZjKx+c 9z+trWlh58ESbe7BX+h60g9gPwDkPEl2tCZFGy2Z6x6C+EmqqIkm6pfFnGWeRq/O/EnPxDJwKdM hefvH5cu/rJagAamRB8NLiMWEb6pjjaUhufrSNZH1irnhWJnfxJQLMcSymDTdMRkqpFmwaCJv1P fIfr1825kLiU4wNO4qaxVKpZ8K96XWSHMpBjjWtOf/Ir5lzu0vleLEEa1pxhu3jDrdEr3R8a1P6 Pd2UVsb+bQvqnuX/3yDo+R4fyazR3UfL2uQ3I4htqpBXOiY2GunWksYwMQyhQM+hsa/t X-Received: by 2002:a05:600c:1c86:b0:439:9863:e876 with SMTP id 5b1f17b1804b1-4399863e985mr12624665e9.24.1739896488297; Tue, 18 Feb 2025 08:34:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IGhjzSey7Os9gD/9cBHHf8QXaWprjYC5klxAlQo6nfv7hgprgS0BPQtKhe2iSIdbXKsawM7OA== X-Received: by 2002:a05:600c:1c86:b0:439:9863:e876 with SMTP id 5b1f17b1804b1-4399863e985mr12624455e9.24.1739896487978; Tue, 18 Feb 2025 08:34:47 -0800 (PST) Received: from rh.redhat.com (p200300f6af0e4d00dda53016e366575f.dip0.t-ipconnect.de. [2003:f6:af0e:4d00:dda5:3016:e366:575f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4396b5267eesm85091845e9.0.2025.02.18.08.34.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 08:34:46 -0800 (PST) From: Sebastian Ott To: Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , Shameer Kolothum Cc: Cornelia Huck , Eric Auger , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/4] KVM: arm64: Allow userspace to change REVIDR_EL1 Date: Tue, 18 Feb 2025 17:34:41 +0100 Message-ID: <20250218163443.32836-3-sebott@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250218163443.32836-1-sebott@redhat.com> References: <20250218163443.32836-1-sebott@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Enable VMMs to write REVIDR_EL1 by treating it as a VM ID register. Trap guest access of REVIDR_EL1 when the VMs value differs from hardware. Signed-off-by: Sebastian Ott --- arch/arm64/include/asm/kvm_host.h | 3 +++ arch/arm64/kvm/sys_regs.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index 3db8c773339e..c8fba4111b77 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -374,6 +374,7 @@ struct kvm_arch { u64 id_regs[KVM_ARM_ID_REG_NUM]; =20 u64 midr_el1; + u64 revidr_el1; u64 ctr_el0; =20 /* Masks for VNCR-backed and general EL2 sysregs */ @@ -1472,6 +1473,8 @@ static inline u64 *__vm_id_reg(struct kvm_arch *ka, u= 32 reg) return &ka->id_regs[IDREG_IDX(reg)]; case SYS_MIDR_EL1: return &ka->midr_el1; + case SYS_REVIDR_EL1: + return &ka->revidr_el1; case SYS_CTR_EL0: return &ka->ctr_el0; default: diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 3cd4dfdd287a..c12fd91574ab 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1666,7 +1666,8 @@ static bool is_feature_id_reg(u32 encoding) */ static inline bool is_vm_ftr_id_reg(u32 id) { - if (id =3D=3D SYS_CTR_EL0 || id =3D=3D SYS_MIDR_EL1) + if (id =3D=3D SYS_CTR_EL0 || id =3D=3D SYS_MIDR_EL1 || + id =3D=3D SYS_REVIDR_EL1) return true; =20 return (sys_reg_Op0(id) =3D=3D 3 && sys_reg_Op1(id) =3D=3D 0 && @@ -2528,6 +2529,7 @@ static bool access_mdcr(struct kvm_vcpu *vcpu, } =20 FUNCTION_RESET(midr_el1) +FUNCTION_RESET(revidr_el1) =20 =20 /* @@ -2581,6 +2583,8 @@ static const struct sys_reg_desc sys_reg_descs[] =3D { { ID_DESC(MIDR_EL1), .set_user =3D set_id_reg_non_ftr, .visibility =3D id= _visibility, .reset =3D reset_midr_el1, .val =3D GENMASK_ULL(31, 0) }, { SYS_DESC(SYS_MPIDR_EL1), NULL, reset_mpidr, MPIDR_EL1 }, + { ID_DESC(REVIDR_EL1), .set_user =3D set_id_reg_non_ftr, .visibility =3D = id_visibility, + .reset =3D reset_revidr_el1, .val =3D -1ULL }, =20 /* * ID regs: all ID_SANITISED() entries here must have corresponding @@ -4632,12 +4636,10 @@ id_to_sys_reg_desc(struct kvm_vcpu *vcpu, u64 id, return ((struct sys_reg_desc *)r)->val; \ } =20 -FUNCTION_INVARIANT(revidr_el1) FUNCTION_INVARIANT(aidr_el1) =20 /* ->val is filled in by kvm_sys_reg_table_init() */ static struct sys_reg_desc invariant_sys_regs[] __ro_after_init =3D { - { SYS_DESC(SYS_REVIDR_EL1), NULL, reset_revidr_el1 }, { SYS_DESC(SYS_AIDR_EL1), NULL, reset_aidr_el1 }, }; =20 @@ -4985,6 +4987,9 @@ static void vcpu_set_hcr(struct kvm_vcpu *vcpu) else vcpu->arch.hcr_el2 |=3D HCR_TID2; =20 + if (kvm_read_vm_id_reg(kvm, SYS_REVIDR_EL1) !=3D read_sysreg(REVIDR_EL1)) + vcpu->arch.hcr_el2 |=3D HCR_TID1; + if (vcpu_el1_is_32bit(vcpu)) vcpu->arch.hcr_el2 &=3D ~HCR_RW; =20 --=20 2.42.0 From nobody Tue Dec 16 22:14:02 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F16E126E65B for ; Tue, 18 Feb 2025 16:34:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739896494; cv=none; b=W3F9l9v7IVjSApfKNuNaw8dqKUo9V5MBXKEveQSKQxSLLVnKxlCaN24DhfRpGEfSpqQ2fvmjLPKW+1JtRE5gK+2PnGEdt/tpDrDJrn9iTR0Ht6+0WDBhzDwchykdpjFkc+XlBhPKTH9pblYlGNswXaamoPsBL9wd6F8mP/NeslM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739896494; c=relaxed/simple; bh=ZVloPN1fD4UQcmC89bjs58//7KVKKTPl0NepyMe8SEM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jcoRg/1nMF5SBmHn5V5qOCRGhbd0tZKH5lzAcq448OB/jb0KWxj3S9F5NHiMt7Eiy2O7ES4qJhegdNt/NbkgnRfZQk9+VBGL85KEHHl5yErrqU8u366fQw4GTHnpFvSgNOKd9o9Y8LvRXw+ireSi1iC6DzDdz3HZbw0YaCKBzwY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=XPtDo3he; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XPtDo3he" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739896491; 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=h8+328qXkkbZhSNY9Ft7M6L1S6M16B35hy1ZghZxpZI=; b=XPtDo3he2WnjRJpki8MiNQC4D7MxOeCF6pm8yoVCJWWfn6S8IbGItCCzv3uOIViju7BoU4 bY1gUpr+v5gO3OM0oOxqx1QMG3ORkvrDxlr+wh8mhhXeWrT3KU1KuiKxU8HcXhUePsnY2T k0fMz1NGbnYi34/amcuruOeIC2EHWCM= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-607-NCv09f2ePLy6oLz4K66wQg-1; Tue, 18 Feb 2025 11:34:50 -0500 X-MC-Unique: NCv09f2ePLy6oLz4K66wQg-1 X-Mimecast-MFC-AGG-ID: NCv09f2ePLy6oLz4K66wQg_1739896489 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4398ed35b10so8017985e9.1 for ; Tue, 18 Feb 2025 08:34:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739896489; x=1740501289; 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=h8+328qXkkbZhSNY9Ft7M6L1S6M16B35hy1ZghZxpZI=; b=s4Xxt7+7n1OhBwTxPBxn7VPiAyZAptuLXYY+AL1nRcwI++nTjzoW64nOj+Mryg6JeZ akIPrgZDjkGR3DbqAJrPrETFJ64+E7uhSoXS/cpMWlNaPeSO8hhynACZ5vyt45Eyr/xG ae55WK8ERcZG0OMc5ecPyftKqY/+JB++Jv12yHJdpJVHKevnLMB5IwnBj2KQ3l1m2Gth RLEtF5s+L811xzfJpk4C+0ZdV36eNysi6SLC24PtcPzjeV7vo/WpVqhM9Nx5xCRHP7RR 5OcoOI1S5CvO9VW7TI0376aRhh3Qqj7JvPlwkFsCMKqkI+ct8d31PYrl42BhlIQ2VsmR CL8g== X-Forwarded-Encrypted: i=1; AJvYcCVvGa4LdhdPHA6kmadIPtMilLVYOYniOmG0q+ViTdX8b2MdcobipoMXWPJo9TfJvslokqD2vZbdBayZpbA=@vger.kernel.org X-Gm-Message-State: AOJu0Yzwu6vVR2HL4g3tkBH/0j6mlB346TdhxoTX5/gbapzwKOj4HoDt ZZa+IlydnxFuNU4VV+4s3M/Wa8lAqfxS6axVWzRtKpg1mwp80cuSycCSzi2KppCiytpTjPc45m/ R1WQds/iwQ2DzKN0wNUe3BIyehuLBleqjvUxajcrsfd59m1byBC/AfVBLZOAHBg== X-Gm-Gg: ASbGncvZE7flGO7i4vU4TodX8Kg26X3YqUCMbwc42Jfwu6VAtZ00E5Fn7RRwzLw8JFB Nrbd0SKQLSNOK5QZJJfXHQU6vhT3BNlDz1DMGkW0Fw4Hk4FPqzEcEja4JI2Yju9BDEvtIa4MdHW 2MhDVgALc4/q+H5FuR7m/ymeZDfRYARogqFlVgzI63tW6+Rg6DjciHtrsTmQGcu+zNcXJ5QrbJ9 oyICHIb+B6d0NeD6WWzvVumYPxc9ykbDgOGe1z4iQ6VQNXFmL+zseNmDRSeeZkvv+gqEKsuORRx 5zYz1hCXXcQ+xNXkHapAZRMe++9XSqCIFMm6QCYTZbfMPj/E1Mm93ukC+WPWT+daGu1X X-Received: by 2002:a05:600c:4f0b:b0:439:8e3e:b0d6 with SMTP id 5b1f17b1804b1-4398e3eb2efmr50743825e9.13.1739896489426; Tue, 18 Feb 2025 08:34:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IFoGgK4BaVZXPPpQ7eoOxfRAzJ7ZHbx/iMmEzLD1TPtPXGjU41tvzcRbGV+tANko10ThiC7sg== X-Received: by 2002:a05:600c:4f0b:b0:439:8e3e:b0d6 with SMTP id 5b1f17b1804b1-4398e3eb2efmr50743515e9.13.1739896488934; Tue, 18 Feb 2025 08:34:48 -0800 (PST) Received: from rh.redhat.com (p200300f6af0e4d00dda53016e366575f.dip0.t-ipconnect.de. [2003:f6:af0e:4d00:dda5:3016:e366:575f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4396b5267eesm85091845e9.0.2025.02.18.08.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 08:34:48 -0800 (PST) From: Sebastian Ott To: Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , Shameer Kolothum Cc: Cornelia Huck , Eric Auger , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/4] KVM: arm64: Allow userspace to change AIDR_EL1 Date: Tue, 18 Feb 2025 17:34:42 +0100 Message-ID: <20250218163443.32836-4-sebott@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250218163443.32836-1-sebott@redhat.com> References: <20250218163443.32836-1-sebott@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Enable VMMs to write AIDR_EL1 by treating it as a VM ID register. Trap guest access of AIDR_EL1 when the VMs value differs from hardware. Since this was the last invariant register remove all the stuff that was needed to handle these. Signed-off-by: Sebastian Ott --- arch/arm64/include/asm/kvm_host.h | 3 ++ arch/arm64/kvm/sys_regs.c | 90 +++---------------------------- 2 files changed, 10 insertions(+), 83 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index c8fba4111b77..de735e2ad9ce 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -375,6 +375,7 @@ struct kvm_arch { =20 u64 midr_el1; u64 revidr_el1; + u64 aidr_el1; u64 ctr_el0; =20 /* Masks for VNCR-backed and general EL2 sysregs */ @@ -1475,6 +1476,8 @@ static inline u64 *__vm_id_reg(struct kvm_arch *ka, u= 32 reg) return &ka->midr_el1; case SYS_REVIDR_EL1: return &ka->revidr_el1; + case SYS_AIDR_EL1: + return &ka->aidr_el1; case SYS_CTR_EL0: return &ka->ctr_el0; default: diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index c12fd91574ab..a1a683ba6bb9 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1667,7 +1667,7 @@ static bool is_feature_id_reg(u32 encoding) static inline bool is_vm_ftr_id_reg(u32 id) { if (id =3D=3D SYS_CTR_EL0 || id =3D=3D SYS_MIDR_EL1 || - id =3D=3D SYS_REVIDR_EL1) + id =3D=3D SYS_REVIDR_EL1 || id =3D=3D SYS_AIDR_EL1) return true; =20 return (sys_reg_Op0(id) =3D=3D 3 && sys_reg_Op1(id) =3D=3D 0 && @@ -2530,6 +2530,7 @@ static bool access_mdcr(struct kvm_vcpu *vcpu, =20 FUNCTION_RESET(midr_el1) FUNCTION_RESET(revidr_el1) +FUNCTION_RESET(aidr_el1) =20 =20 /* @@ -2856,6 +2857,8 @@ static const struct sys_reg_desc sys_reg_descs[] =3D { .set_user =3D set_clidr, .val =3D ~CLIDR_EL1_RES0 }, { SYS_DESC(SYS_CCSIDR2_EL1), undef_access }, { SYS_DESC(SYS_SMIDR_EL1), undef_access }, + { ID_DESC(AIDR_EL1), .set_user =3D set_id_reg_non_ftr, .visibility =3D id= _visibility, + .reset =3D reset_aidr_el1, .val =3D -1ULL }, { SYS_DESC(SYS_CSSELR_EL1), access_csselr, reset_unknown, CSSELR_EL1 }, ID_FILTERED(CTR_EL0, ctr_el0, CTR_EL0_DIC_MASK | @@ -4620,61 +4623,6 @@ id_to_sys_reg_desc(struct kvm_vcpu *vcpu, u64 id, return r; } =20 -/* - * These are the invariant sys_reg registers: we let the guest see the - * host versions of these, so they're part of the guest state. - * - * A future CPU may provide a mechanism to present different values to - * the guest, or a future kvm may trap them. - */ - -#define FUNCTION_INVARIANT(reg) \ - static u64 reset_##reg(struct kvm_vcpu *v, \ - const struct sys_reg_desc *r) \ - { \ - ((struct sys_reg_desc *)r)->val =3D read_sysreg(reg); \ - return ((struct sys_reg_desc *)r)->val; \ - } - -FUNCTION_INVARIANT(aidr_el1) - -/* ->val is filled in by kvm_sys_reg_table_init() */ -static struct sys_reg_desc invariant_sys_regs[] __ro_after_init =3D { - { SYS_DESC(SYS_AIDR_EL1), NULL, reset_aidr_el1 }, -}; - -static int get_invariant_sys_reg(u64 id, u64 __user *uaddr) -{ - const struct sys_reg_desc *r; - - r =3D get_reg_by_id(id, invariant_sys_regs, - ARRAY_SIZE(invariant_sys_regs)); - if (!r) - return -ENOENT; - - return put_user(r->val, uaddr); -} - -static int set_invariant_sys_reg(u64 id, u64 __user *uaddr) -{ - const struct sys_reg_desc *r; - u64 val; - - r =3D get_reg_by_id(id, invariant_sys_regs, - ARRAY_SIZE(invariant_sys_regs)); - if (!r) - return -ENOENT; - - if (get_user(val, uaddr)) - return -EFAULT; - - /* This is what we mean by invariant: you can't change it. */ - if (r->val !=3D val) - return -EINVAL; - - return 0; -} - static int demux_c15_get(struct kvm_vcpu *vcpu, u64 id, void __user *uaddr) { u32 val; @@ -4756,15 +4704,10 @@ int kvm_sys_reg_get_user(struct kvm_vcpu *vcpu, con= st struct kvm_one_reg *reg, int kvm_arm_sys_reg_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_re= g *reg) { void __user *uaddr =3D (void __user *)(unsigned long)reg->addr; - int err; =20 if ((reg->id & KVM_REG_ARM_COPROC_MASK) =3D=3D KVM_REG_ARM_DEMUX) return demux_c15_get(vcpu, reg->id, uaddr); =20 - err =3D get_invariant_sys_reg(reg->id, uaddr); - if (err !=3D -ENOENT) - return err; - return kvm_sys_reg_get_user(vcpu, reg, sys_reg_descs, ARRAY_SIZE(sys_reg_descs)); } @@ -4800,15 +4743,10 @@ int kvm_sys_reg_set_user(struct kvm_vcpu *vcpu, con= st struct kvm_one_reg *reg, int kvm_arm_sys_reg_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_re= g *reg) { void __user *uaddr =3D (void __user *)(unsigned long)reg->addr; - int err; =20 if ((reg->id & KVM_REG_ARM_COPROC_MASK) =3D=3D KVM_REG_ARM_DEMUX) return demux_c15_set(vcpu, reg->id, uaddr); =20 - err =3D set_invariant_sys_reg(reg->id, uaddr); - if (err !=3D -ENOENT) - return err; - return kvm_sys_reg_set_user(vcpu, reg, sys_reg_descs, ARRAY_SIZE(sys_reg_descs)); } @@ -4897,23 +4835,13 @@ static int walk_sys_regs(struct kvm_vcpu *vcpu, u64= __user *uind) =20 unsigned long kvm_arm_num_sys_reg_descs(struct kvm_vcpu *vcpu) { - return ARRAY_SIZE(invariant_sys_regs) - + num_demux_regs() - + walk_sys_regs(vcpu, (u64 __user *)NULL); + return num_demux_regs() + walk_sys_regs(vcpu, (u64 __user *)NULL); } =20 int kvm_arm_copy_sys_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindic= es) { - unsigned int i; int err; =20 - /* Then give them all the invariant registers' indices. */ - for (i =3D 0; i < ARRAY_SIZE(invariant_sys_regs); i++) { - if (put_user(sys_reg_to_index(&invariant_sys_regs[i]), uindices)) - return -EFAULT; - uindices++; - } - err =3D walk_sys_regs(vcpu, uindices); if (err < 0) return err; @@ -4987,7 +4915,8 @@ static void vcpu_set_hcr(struct kvm_vcpu *vcpu) else vcpu->arch.hcr_el2 |=3D HCR_TID2; =20 - if (kvm_read_vm_id_reg(kvm, SYS_REVIDR_EL1) !=3D read_sysreg(REVIDR_EL1)) + if ((kvm_read_vm_id_reg(kvm, SYS_REVIDR_EL1) !=3D read_sysreg(REVIDR_EL1)= ) || + (kvm_read_vm_id_reg(kvm, SYS_AIDR_EL1) !=3D read_sysreg(AIDR_EL1))) vcpu->arch.hcr_el2 |=3D HCR_TID1; =20 if (vcpu_el1_is_32bit(vcpu)) @@ -5142,16 +5071,11 @@ int __init kvm_sys_reg_table_init(void) valid &=3D check_sysreg_table(cp14_64_regs, ARRAY_SIZE(cp14_64_regs), tru= e); valid &=3D check_sysreg_table(cp15_regs, ARRAY_SIZE(cp15_regs), true); valid &=3D check_sysreg_table(cp15_64_regs, ARRAY_SIZE(cp15_64_regs), tru= e); - valid &=3D check_sysreg_table(invariant_sys_regs, ARRAY_SIZE(invariant_sy= s_regs), false); valid &=3D check_sysreg_table(sys_insn_descs, ARRAY_SIZE(sys_insn_descs),= false); =20 if (!valid) return -EINVAL; =20 - /* We abuse the reset function to overwrite the table itself. */ - for (i =3D 0; i < ARRAY_SIZE(invariant_sys_regs); i++) - invariant_sys_regs[i].reset(NULL, &invariant_sys_regs[i]); - ret =3D populate_nv_trap_config(); =20 for (i =3D 0; !ret && i < ARRAY_SIZE(sys_reg_descs); i++) --=20 2.42.0 From nobody Tue Dec 16 22:14:02 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E716826D5CA for ; Tue, 18 Feb 2025 16:34:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739896495; cv=none; b=N4rQgICC+bASnOQIVAZ8GySz2J/pbhL547WqC/b7zTlcfzKagfUtJElDczOPCQEU5RDQnap4PFFjhN+ybxJ7lFcDsYBzbtLMi4zRXNYkTpFJ9esGkcdd0ZTT+ZTk1VRh6MDjpo637fvcJ4ayqzxYCHEoGdosl/70x5kKkdBbitA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739896495; c=relaxed/simple; bh=48SNocFIEyTD401Bn7uEPWmyPGgbFKE7acbIYbRpQLE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C+c/ix7Ezz7kqqKdInLIgAncC805wYYc38+jEs2Li1co0qKx6+ZSj6fb1FnB6Fs2fpEeFkAvcuMVU9Z1XKzjX5ePlW4ggYMKDehH656UGYjRU/SWL3nneSgaFHMnlCfaDteUJX0EUYroBLqYhHlHbmcKlTlUgoGfq1SYMYsNZUc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=X+yWgzCh; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="X+yWgzCh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739896493; 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=RdghYHu234rwHRoSlAkfrkrUKfnT4YJfki186RS5/GU=; b=X+yWgzChE/hRGL1PfDgdeo0Jqz2At+8DUApHp6BeWWzx6B5TskMMI2f6WrRHalmz+FDqb9 rYEvW9VFnKiHLB52RLjg8tKTwkUubYicgs2dc0PE2/Ky0OV8HelpV5jo/SB1nr4/6w/hZh qgUepxPo8u9otPlROvl/58I+c1KyTco= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-474-gQFdXMjyN6az8V25UKJiOw-1; Tue, 18 Feb 2025 11:34:51 -0500 X-MC-Unique: gQFdXMjyN6az8V25UKJiOw-1 X-Mimecast-MFC-AGG-ID: gQFdXMjyN6az8V25UKJiOw_1739896491 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-43942e82719so49555345e9.2 for ; Tue, 18 Feb 2025 08:34:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739896490; x=1740501290; 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=RdghYHu234rwHRoSlAkfrkrUKfnT4YJfki186RS5/GU=; b=omJVA5fAfTi9csn5ixeudD0lX2Lwzgg+K8dKn/nIcaRZuGDGU117XbZAk7pMLlZtdV tKOa645HfjrlU47owRVN1COlL2byaIJ41TyXUWLjFBYx3lSmfgNqk3cBypy23TpNrDR9 BDLdTIGKNti9HEKYYWeu+NUP+os5FzKNOFu2vMJYYZV7w2aR+EtuFFyNaanIJzPfsb65 t5rcm6sGuF+XDBR/QTdkKKwxGi0zZUWhrau7QhXjU4hiCX2CgNOowa3rwqOzcEUSQUdH ePw5agfDK2D8NYqClVDEvCLlWvxjvw+gPpoZBqEVr6kasb5JKz65EwfciHtC+muO5I3V Mbeg== X-Forwarded-Encrypted: i=1; AJvYcCUYvmHNLmuZ8zcHwBBaYcfMzVxi7FF39jD4fEwEpl0JVhr6c0WEeNM5MmFtKS6WEQdSUo55ggkhIWRO5z8=@vger.kernel.org X-Gm-Message-State: AOJu0YyTzJrJP2OGFHbBzXZYI61v6ngKUyM89zOPt2zwk03cQjmeVakL +wTazA3OBdZnTsCF6rxTnhvXWAXvUmkDrNjipEOtcAMI01m7AECzQUTpsXgvhIR6Yoe/VosyxuZ vZw8k+djLL5ZugulfMtkepyJEQKwvmo3Iw88nJUq0BxltwEfPPPMPQTDnR5MOLQ== X-Gm-Gg: ASbGnct0Ic/Ek1H5n5Tl2obCVmzniSMBXvATWgaw+4rVj8c29qHhHZ/+htEaHNXEpvT woptH52yrYdHf3YMJJbXZA49YCt3I6ddf9UCzDheOXixQ1aLRBDzFP+fGndYpkWX+WkCyNwYDzf QUyBPTyzP1arO7ucQ3fda+fUxMvTmGjUd2jcNyVzPtGhFLTDw9lOEF7hugxANLsHEriY1NoDXMw lVnbsmk/x6V680pT9K2Nu5282oHrKOMlnqy8hEy4jHwcgNw9pLYjTCA8SatSFICJZ6r/oeKBBwE ZcV6Ix9XAC8iy/0yYbd+XciJM+tCBVwll9f7uaQK2y+t0vOm34fQAPeTRC/tXo+Vgyvj X-Received: by 2002:a05:600c:3b9c:b0:439:967b:46fc with SMTP id 5b1f17b1804b1-43999d8f506mr3286565e9.8.1739896490602; Tue, 18 Feb 2025 08:34:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IGr/dmaK1oQWajwLZOsOW11YMixQScvE0fX+ohPe438Pqvb/Vo3/S0ChTjcAbtFCmmO7n+NIw== X-Received: by 2002:a05:600c:3b9c:b0:439:967b:46fc with SMTP id 5b1f17b1804b1-43999d8f506mr3286265e9.8.1739896490174; Tue, 18 Feb 2025 08:34:50 -0800 (PST) Received: from rh.redhat.com (p200300f6af0e4d00dda53016e366575f.dip0.t-ipconnect.de. [2003:f6:af0e:4d00:dda5:3016:e366:575f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4396b5267eesm85091845e9.0.2025.02.18.08.34.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 08:34:49 -0800 (PST) From: Sebastian Ott To: Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , Shameer Kolothum Cc: Cornelia Huck , Eric Auger , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/4] KVM: selftests: arm64: Test writes to MIDR,REVIDR,AIDR Date: Tue, 18 Feb 2025 17:34:43 +0100 Message-ID: <20250218163443.32836-5-sebott@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250218163443.32836-1-sebott@redhat.com> References: <20250218163443.32836-1-sebott@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Assert that MIDR_EL1, REVIDR_EL1, AIDR_EL1 are writable from userspace, that the changed values are visible to guests, and that they are preserved across a vCPU reset. Signed-off-by: Sebastian Ott --- .../testing/selftests/kvm/arm64/set_id_regs.c | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/kvm/arm64/set_id_regs.c b/tools/testin= g/selftests/kvm/arm64/set_id_regs.c index 217541fe6536..d719c2ab1e31 100644 --- a/tools/testing/selftests/kvm/arm64/set_id_regs.c +++ b/tools/testing/selftests/kvm/arm64/set_id_regs.c @@ -230,6 +230,9 @@ static void guest_code(void) GUEST_REG_SYNC(SYS_ID_AA64MMFR2_EL1); GUEST_REG_SYNC(SYS_ID_AA64ZFR0_EL1); GUEST_REG_SYNC(SYS_CTR_EL0); + GUEST_REG_SYNC(SYS_MIDR_EL1); + GUEST_REG_SYNC(SYS_REVIDR_EL1); + GUEST_REG_SYNC(SYS_AIDR_EL1); =20 GUEST_DONE(); } @@ -609,18 +612,31 @@ static void test_ctr(struct kvm_vcpu *vcpu) test_reg_vals[encoding_to_range_idx(SYS_CTR_EL0)] =3D ctr; } =20 -static void test_vcpu_ftr_id_regs(struct kvm_vcpu *vcpu) +static void test_id_reg(struct kvm_vcpu *vcpu, u32 id) { u64 val; =20 + val =3D vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(id)); + val++; + vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(id), val); + test_reg_vals[encoding_to_range_idx(id)] =3D val; +} + +static void test_vcpu_ftr_id_regs(struct kvm_vcpu *vcpu) +{ test_clidr(vcpu); test_ctr(vcpu); =20 - val =3D vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_MPIDR_EL1)); - val++; - vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_MPIDR_EL1), val); + test_id_reg(vcpu, SYS_MPIDR_EL1); + ksft_test_result_pass("%s\n", __func__); +} + +static void test_vcpu_non_ftr_id_regs(struct kvm_vcpu *vcpu) +{ + test_id_reg(vcpu, SYS_MIDR_EL1); + test_id_reg(vcpu, SYS_REVIDR_EL1); + test_id_reg(vcpu, SYS_AIDR_EL1); =20 - test_reg_vals[encoding_to_range_idx(SYS_MPIDR_EL1)] =3D val; ksft_test_result_pass("%s\n", __func__); } =20 @@ -647,6 +663,9 @@ static void test_reset_preserves_id_regs(struct kvm_vcp= u *vcpu) test_assert_id_reg_unchanged(vcpu, SYS_MPIDR_EL1); test_assert_id_reg_unchanged(vcpu, SYS_CLIDR_EL1); test_assert_id_reg_unchanged(vcpu, SYS_CTR_EL0); + test_assert_id_reg_unchanged(vcpu, SYS_MIDR_EL1); + test_assert_id_reg_unchanged(vcpu, SYS_REVIDR_EL1); + test_assert_id_reg_unchanged(vcpu, SYS_AIDR_EL1); =20 ksft_test_result_pass("%s\n", __func__); } @@ -675,13 +694,14 @@ int main(void) ARRAY_SIZE(ftr_id_aa64isar2_el1) + ARRAY_SIZE(ftr_id_aa64pfr0_el1) + ARRAY_SIZE(ftr_id_aa64pfr1_el1) + ARRAY_SIZE(ftr_id_aa64mmfr0_el1) + ARRAY_SIZE(ftr_id_aa64mmfr1_el1) + ARRAY_SIZE(ftr_id_aa64mmfr2_el1) + - ARRAY_SIZE(ftr_id_aa64zfr0_el1) - ARRAY_SIZE(test_regs) + 2 + + ARRAY_SIZE(ftr_id_aa64zfr0_el1) - ARRAY_SIZE(test_regs) + 3 + MPAM_IDREG_TEST; =20 ksft_set_plan(test_cnt); =20 test_vm_ftr_id_regs(vcpu, aarch64_only); test_vcpu_ftr_id_regs(vcpu); + test_vcpu_non_ftr_id_regs(vcpu); test_user_set_mpam_reg(vcpu); =20 test_guest_reg_read(vcpu); --=20 2.42.0