From mboxrd@z Thu Jan 1 00:00:00 1970 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 A836B24394B for ; Mon, 10 Feb 2025 15:50: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=1739202604; cv=none; b=hb2xhEn2R9Ov0z/GPKQLlG+xyog8h7vVF069UTmPvW6B1meGMI39TgfPoqW4g+e1mCudMTlzYy7XYYWXaYnShnZpreAgpHxgelF/yca7p3PYu9P+8V/3HMFbXG4uxjNwbQF0wQ0lixBjRupdQR85f1JlwQoNft9+D3m9abJsPjY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739202604; c=relaxed/simple; bh=NZOFfbRhsbRsC2hvzZDglWFLctXrjqBQJCBxNGafW7w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=cdBUvIA3eKx6MHTT4tNbb70NEm+ocdpJmdpVdX8zCN0e2qG6v//llPcENUE4ih5j2qN3I0wHK16wQov44YvcfmxWeTrxkCq1pQM8+T3aOxXiVos98VkWPqFcikggHPD2/Z/2gwQYI0+u2D3Y66gzqA2gI8tW/NeSY1pfEx1qWAg= 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=L2aKxhum; 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="L2aKxhum" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739202601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qZ5boF1+ov+a1CrxZW4hTB/OazVKXnCvFj7KGC76W04=; b=L2aKxhumGWM2hRUBWCrH3IJ4xRViDZnru6gNc/dmA2LsBIiO3EZvVEFoXov/KPEjtKVWyT oJVddVSLtvlqxuELLP2NOUv1BLDicdVSdmnn6MQMzscAcHaWsL7hlnrw9YW0+cm+OOteJ2 5JEakA8fI3R6CY0DWMzSAi8KLw1pb8E= 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-145-fwnanWaZMhGuQOwbw9S82w-1; Mon, 10 Feb 2025 10:50:00 -0500 X-MC-Unique: fwnanWaZMhGuQOwbw9S82w-1 X-Mimecast-MFC-AGG-ID: fwnanWaZMhGuQOwbw9S82w Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4394c489babso1414205e9.1 for ; Mon, 10 Feb 2025 07:50:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739202599; x=1739807399; 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=qZ5boF1+ov+a1CrxZW4hTB/OazVKXnCvFj7KGC76W04=; b=raR3ZKnj7+PwDAXaTxq3frFe8gfjtNO4mMJPlrF30xlNHRHJYtuqNJ2XucKMELNIt8 JOWP9H/Ub7dTjEmo5kVw/iHTdEt81DXHNx4X4XAFexcwML2woIopx7HJWXlrK74bj3ZS uFQB3oicN2AG4yAqA/hN1two09x3i7OauxmpgcIeOAikoGORFFwpA29KQZQF+WlF6/D1 HPap+Z7IijLsaUf5EXR1T0T5yoZCFLWDYJzPmjAprzi5iI7sQ6pi/WnWmxLt+s9av44J eJmQuqCJLX/sq0cU5ctGud3LcnVLzQCauxM62xOexzS+YTkU114FpVObYXVYuGbtSywS RVgA== X-Forwarded-Encrypted: i=1; AJvYcCVzQ80f3+dy5huF0DPPrbl9x4YDQpjsU5kGP40PCRbnDETxynFUe7e168FBxnx6r17GYkQ/l7g=@lists.linux.dev X-Gm-Message-State: AOJu0YzWyW0Cz6E4MiDKNkK/cRqFjI1UkoHp10i+btEYnFqzOXiC9OL0 Uur2GOqiwbubDgCPP16cPSM8vYuF61rAg8/+4YRMkiwqCBGgW5LGxuz1DmCQSCd5TKFF7D5KtDO z0a+oQpc6G+n0WtNBWsA8aAU+4WZsuoyndgZfz43yY04HTXqDMK9hhw== X-Gm-Gg: ASbGncu48KqND7CrOWXrD4mNr300g5USC1ZKh2dqCHl0DZOeAMHwDuTZibWtO0JcR/D bKYzF/cGRG4Ntl4F5cmBSu62NpDvRgmoLeaWCKi8NVtDstw5NqHhiZwnjgogWnFVfFpp6mpk+aS p0Rox7Noc0VHn0mRwnMVXdTZ2MGcv345JlXisrb1tR1ZcX6urps/qSstHn7nkEiUX7INJ9NpHxF 1mz5mHrbboVO3F84wiHEqS5sBokAPJgFl1SiUDxOCEhItkMrpKBkUMQQYD4Zjg+cWQOoQLgTU+z xnq7TVBDcqA0rMz/o91naK61IrDshWUgiaw/6t+IJywewAK2XVQANrDEgwiWYbvabJE= X-Received: by 2002:a05:600c:3b24:b0:42a:a6d2:3270 with SMTP id 5b1f17b1804b1-439249b04c5mr95485785e9.21.1739202599144; Mon, 10 Feb 2025 07:49:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IGy/hyTiJKOd5suOwHBU4YT0xl861inY+oh4hEO7p/dxFuxz5WWlSrwdmZ+NX1+MRBiiH1H4Q== X-Received: by 2002:a05:600c:3b24:b0:42a:a6d2:3270 with SMTP id 5b1f17b1804b1-439249b04c5mr95485475e9.21.1739202598710; Mon, 10 Feb 2025 07:49:58 -0800 (PST) Received: from rh.fritz.box (p200300f6af0e4d00dda53016e366575f.dip0.t-ipconnect.de. [2003:f6:af0e:4d00:dda5:3016:e366:575f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4391da96502sm153559395e9.1.2025.02.10.07.49.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:49:58 -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 3/4] KVM: arm64: Allow userspace to change AIDR_EL1 Date: Mon, 10 Feb 2025 16:49:52 +0100 Message-ID: <20250210154953.27002-4-sebott@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210154953.27002-1-sebott@redhat.com> References: <20250210154953.27002-1-sebott@redhat.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: R9tJ66nLRuhfmaHdVqHCWJjCVZftpuATvjgiMyMmGGI_1739202599 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Enable VMMs to write AIDR_EL1 by treating it as a VM ID register. 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 { u64 midr_el1; u64 revidr_el1; + u64 aidr_el1; u64 ctr_el0; /* Masks for VNCR-backed and general EL2 sysregs */ @@ -1475,6 +1476,8 @@ static inline u64 *__vm_id_reg(struct kvm_arch *ka, u32 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 0ab2b2c79881..7d588fedb50a 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 == SYS_CTR_EL0 || id == SYS_MIDR_EL1 || - id == SYS_REVIDR_EL1) + id == SYS_REVIDR_EL1 || id == SYS_AIDR_EL1) return true; return (sys_reg_Op0(id) == 3 && sys_reg_Op1(id) == 0 && @@ -2003,7 +2003,8 @@ static int get_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, static bool skip_feature_check(u32 reg) { return (reg == SYS_MIDR_EL1) || - (reg == SYS_REVIDR_EL1); + (reg == SYS_REVIDR_EL1) || + (reg == SYS_AIDR_EL1); } /* @@ -2524,6 +2525,7 @@ static bool access_mdcr(struct kvm_vcpu *vcpu, FUNCTION_RESET(midr_el1) FUNCTION_RESET(revidr_el1) +FUNCTION_RESET(aidr_el1) /* @@ -2850,6 +2852,8 @@ static const struct sys_reg_desc sys_reg_descs[] = { .set_user = set_clidr, .val = ~CLIDR_EL1_RES0 }, { SYS_DESC(SYS_CCSIDR2_EL1), undef_access }, { SYS_DESC(SYS_SMIDR_EL1), undef_access }, + { ID_DESC(AIDR_EL1), .set_user = set_id_reg, .visibility = id_visibility, + .reset = reset_aidr_el1, .val = -1ULL }, { SYS_DESC(SYS_CSSELR_EL1), access_csselr, reset_unknown, CSSELR_EL1 }, ID_FILTERED(CTR_EL0, ctr_el0, CTR_EL0_DIC_MASK | @@ -4614,61 +4618,6 @@ id_to_sys_reg_desc(struct kvm_vcpu *vcpu, u64 id, return r; } -/* - * 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 = 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 = { - { 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 = 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 = 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 != val) - return -EINVAL; - - return 0; -} - static int demux_c15_get(struct kvm_vcpu *vcpu, u64 id, void __user *uaddr) { u32 val; @@ -4750,15 +4699,10 @@ int kvm_sys_reg_get_user(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg, int kvm_arm_sys_reg_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) { void __user *uaddr = (void __user *)(unsigned long)reg->addr; - int err; if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_DEMUX) return demux_c15_get(vcpu, reg->id, uaddr); - err = get_invariant_sys_reg(reg->id, uaddr); - if (err != -ENOENT) - return err; - return kvm_sys_reg_get_user(vcpu, reg, sys_reg_descs, ARRAY_SIZE(sys_reg_descs)); } @@ -4794,15 +4738,10 @@ int kvm_sys_reg_set_user(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg, int kvm_arm_sys_reg_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) { void __user *uaddr = (void __user *)(unsigned long)reg->addr; - int err; if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_DEMUX) return demux_c15_set(vcpu, reg->id, uaddr); - err = set_invariant_sys_reg(reg->id, uaddr); - if (err != -ENOENT) - return err; - return kvm_sys_reg_set_user(vcpu, reg, sys_reg_descs, ARRAY_SIZE(sys_reg_descs)); } @@ -4891,23 +4830,13 @@ static int walk_sys_regs(struct kvm_vcpu *vcpu, u64 __user *uind) 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); } int kvm_arm_copy_sys_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices) { - unsigned int i; int err; - /* Then give them all the invariant registers' indices. */ - for (i = 0; i < ARRAY_SIZE(invariant_sys_regs); i++) { - if (put_user(sys_reg_to_index(&invariant_sys_regs[i]), uindices)) - return -EFAULT; - uindices++; - } - err = walk_sys_regs(vcpu, uindices); if (err < 0) return err; @@ -5133,16 +5062,11 @@ int __init kvm_sys_reg_table_init(void) valid &= check_sysreg_table(cp14_64_regs, ARRAY_SIZE(cp14_64_regs), true); valid &= check_sysreg_table(cp15_regs, ARRAY_SIZE(cp15_regs), true); valid &= check_sysreg_table(cp15_64_regs, ARRAY_SIZE(cp15_64_regs), true); - valid &= check_sysreg_table(invariant_sys_regs, ARRAY_SIZE(invariant_sys_regs), false); valid &= check_sysreg_table(sys_insn_descs, ARRAY_SIZE(sys_insn_descs), false); if (!valid) return -EINVAL; - /* We abuse the reset function to overwrite the table itself. */ - for (i = 0; i < ARRAY_SIZE(invariant_sys_regs); i++) - invariant_sys_regs[i].reset(NULL, &invariant_sys_regs[i]); - ret = populate_nv_trap_config(); for (i = 0; !ret && i < ARRAY_SIZE(sys_reg_descs); i++) -- 2.42.0