From nobody Sun Feb 8 05:59:04 2026 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 51C152505D3 for ; Tue, 11 Feb 2025 14:39:17 +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=1739284759; cv=none; b=kOEH6lwercyIM4EdD9n7hj9c2KqMnxixz3Mg7b43f22arHr3WhDOWoZaNf101/gZmzkgg7otshgQ+Hvl6X2dGvdt5MYcIN77B/9Im2S4vbvlL9keUmfd/e5U3ieAXw02o+oDLlU86c7aFw1ofwbPOVHQop5+Yot8DeUTGS6FKCs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739284759; c=relaxed/simple; bh=7JHbJ2DuZCv74J5NSz9ZAXfYRHZMl6ToNndRqFA4VjA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UWhuT6Piiq0tAaDJy+Mm3YvGPm6TIHjW9+/I8fRJKBhKY7z2htkWujBkh/EuIfXoRsWeXIdtRfyYJeyyhdA9IPivN0tP3678R0W7MzpDFHom5eG9O1B99qBF5kLUMLIMv0IMZtFsVhsF8ve8Pet6o8jeU7/hEbj7Q4Pr/mJPdQY= 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=M6I8q3Tu; 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="M6I8q3Tu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739284756; 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=dxQC5OSA8UNrYi2FsJ8qImpmh+po7bw6P6uEsaW3lFQ=; b=M6I8q3TubzWgikhKXjYI15HBLMefCkIPqJVCHCyFIPhvHqXp2bcgL4QGaH90czG678UQZe JWxerxweN04ydmq94iYFbSEarolGc3eUrhcU4n5vcxvWSRMlx+HdSkbl01zK7mmoGDt44F A67K3zCibIuGF9b++UO9a/t8V8k+cbg= 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-404-vngaNjaWOcaPKO6AnuREIQ-1; Tue, 11 Feb 2025 09:39:15 -0500 X-MC-Unique: vngaNjaWOcaPKO6AnuREIQ-1 X-Mimecast-MFC-AGG-ID: vngaNjaWOcaPKO6AnuREIQ Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4393e89e910so14427195e9.0 for ; Tue, 11 Feb 2025 06:39:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739284754; x=1739889554; 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=dxQC5OSA8UNrYi2FsJ8qImpmh+po7bw6P6uEsaW3lFQ=; b=gUNaJnPci7vJ4Rr3O+gdc0hPbXuURjFjeb3TztxPAqo6PH9My9OZxAa9XBAkrCp8Zb 0FCuvfGzMK9lxbifkvpAfw6Itt0uOxcSHDStL0Sajl17jYLtAnB8UGtr7F4WuZrmMg2c 1T1nHPtkIjEQf6nFlN4VggYBvDHkEUB9Mjo/bG7GPEfslwDmdcpGWvheXMSZ+/R+iovG mXZeWozE41YRGbPRO8mQSI36JY+0lUe7UKtQQ3q9K3AfZyKIxl3odIYP+OpieFp2MaSH t5KuOS81ZrfF8FLEhaLuOuxiBz5+PaKJhGtGZGZdUhVGuHSWVy4xcVs/ZdCCpXjVn6fE xTYQ== X-Forwarded-Encrypted: i=1; AJvYcCUX3deQDE5efkxaELCm8y0ShDo1GueZJcI+jnVegwN3TogbKmoi3HXa/q3br5GjADqdJ8ElIKTAehAds2o=@vger.kernel.org X-Gm-Message-State: AOJu0YwcTw90839cGNku+1frzIz60iqJphLPNh9SCKF+5/SFEhhjHelt 5qPz2cCxmk6ikQHfzOGKPqkA7/mERkOPb8S9+5aZhOXDDf+t8ja9C9hv5k5CcUgRd52Mf2AMCyx MIORYHejnoePtKiA2TsqaiEnyVi8OF8B8FOhHRCrfvrDik9IxB6NjkqCj5bKFhg== X-Gm-Gg: ASbGncufTKtdIRnOhJB7Y1QSN+zpywq+H/5qEDkk0iSg5rmU/ql1QY2zqf6qM7abe/L ImOSRgWwlo8uDSBWvT/CRTxnx/zjMOj3d+vuVE/CEO2pwkVp06e6kjVBUqXBCPTyFpj68WprP0+ JTNenzIW49AmAoSyK3dhm1ZYzjd3OFMjtGuFdv3deK7nzDBROYYFQjx7on4jeFSq7ygMbpAF3El 4OUUWsXp5mxLN3o5f96F2TFZu43enrKvtT4ZoF3oWcJAmvakmqjRhnZ2hWZnQSjWtvI/1dCAkyL zKFNtCzmy4G+9Au2MgXVobi9WAYtKC62Odsu6pz8ZQy9MgND4uchXeSWIMsTdtmmh/Y= X-Received: by 2002:a05:600c:190c:b0:439:42c6:f11f with SMTP id 5b1f17b1804b1-43942c6f5eemr83107085e9.4.1739284753682; Tue, 11 Feb 2025 06:39:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IFDvsaYgzTa5RWn9BkqT6d0zbIYe+dTe5ziVPY8IeCNWz/AYeRHaPoW5P6jv6YFeryIf9I1Lg== X-Received: by 2002:a05:600c:190c:b0:439:42c6:f11f with SMTP id 5b1f17b1804b1-43942c6f5eemr83106725e9.4.1739284753304; Tue, 11 Feb 2025 06:39:13 -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 ffacd0b85a97d-38dcc9bd251sm11745833f8f.9.2025.02.11.06.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 06:39:12 -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 v2 1/4] KVM: arm64: Allow userspace to change MIDR_EL1 Date: Tue, 11 Feb 2025 15:39:07 +0100 Message-ID: <20250211143910.16775-2-sebott@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250211143910.16775-1-sebott@redhat.com> References: <20250211143910.16775-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/sys_regs.c | 56 +++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 3 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/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 82430c1e1dd0..7e1c9884f62a 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,47 @@ 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); + int ret; + + mutex_lock(&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)) + ret =3D -EBUSY; + else + ret =3D 0; + + mutex_unlock(&vcpu->kvm->arch.config_lock); + return ret; + } + + /* + * For non ftr regs do a limited test against the writable mask only. + */ + if ((rd->val & val) !=3D val) { + mutex_unlock(&vcpu->kvm->arch.config_lock); + return -EINVAL; + } + + kvm_set_vm_id_reg(vcpu->kvm, id, val); + /* + * Since guest access to MIDR_EL1 is not trapped + * set up VPIDR_EL2 to hold the MIDR_EL1 value. + */ + if (id =3D=3D SYS_MIDR_EL1) + write_sysreg(val, vpidr_el2); + + mutex_unlock(&vcpu->kvm->arch.config_lock); + return 0; +} + static int set_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, u64 val) { @@ -2493,6 +2534,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 +2592,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 +4646,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 Sun Feb 8 05:59:04 2026 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 CE310250BE5 for ; Tue, 11 Feb 2025 14:39:18 +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=1739284761; cv=none; b=DoBnet3EzLkleM4gCYVavoXp5n8ZbxTxN+Z8OEakhETYtFojm3Bv+Azem8s22fnPkOXrziuU+0W9mNxxG205llSfXNQAvSSlVo1QAhuBxgUD/kI3ffwnCC+428GLsXNurH71CNbvOuXMuoANPcjpDxBCpsuYOYdktxiDF6kThFk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739284761; c=relaxed/simple; bh=Xh97xB0t4V0m4yRQ6og3fwpvTr3Hlw3peV8Pp9xA1Vk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XUEk+EBNXtF7n1csCnzlwSrHm9iYKT8KuSfEP8SXt2rmZgrVP+tAv/zdwLvTaPw1egLHx7VQAILWjGzIX5gdU5DtJZVro7d4zcEcGmRUIXNLpuR+Tk3SdxMiKFBe7t8e9b/IP/zTJXxSPSUN85pVdoKXFbzaNmP4yHcTJDKdKJ4= 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=DloCq0Oy; 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="DloCq0Oy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739284757; 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=wSVu+15UXFfSOFL1ip9ZLwAcn38zQdv9iDAl5Qkapx0=; b=DloCq0OyazzmozOE+rLRG8OFu/HQ8ppOsK+QvUP5xNgT9/Zpt5pBzLt/L2LiPx220fxnJ4 jDxAmLdIdUiGSpKAg/QzrZg9GjjcDHDqR60LtEW9PRebzRkJhzakAQ38c6BrA88EAD906u ezigBMBQgx1NN9Q43At6NPY80n4hByg= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-496-cavNOnVcP_mgVrDcYUwebQ-1; Tue, 11 Feb 2025 09:39:16 -0500 X-MC-Unique: cavNOnVcP_mgVrDcYUwebQ-1 X-Mimecast-MFC-AGG-ID: cavNOnVcP_mgVrDcYUwebQ Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-38dcd8ddc5eso2908671f8f.3 for ; Tue, 11 Feb 2025 06:39:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739284755; x=1739889555; 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=wSVu+15UXFfSOFL1ip9ZLwAcn38zQdv9iDAl5Qkapx0=; b=rUUXxHRYwMJz0ENzBN6V0M8d825Rs0HfTNKwvEHvdWOm/qC4xZWd+aysaSyTS6i8mF DktCkrbJ5d6XtZrK2iuNKciAYGeTdOnYVS+fyFHuZFv45JsvzdMb3xTkWhRixULQtRa4 5bPYsjULTPwdPrhgWtVaHn1PuA74h6ZCiBPVyu3Tt98mXAtLOXH95wdsjJ2BimFmYxnF nLrld7R/wr+9JcRbQY97U0U4dItXmtPU6XnT6MF7quwa30tCHczhoHWU4aSv5EGmQmMP HeNe5v+dwFxJ0lkJIxhcF3cli+AjUp7a1DQWPnIKLKQliWamf4Th96C52dhO5KnSB5VN mb2A== X-Forwarded-Encrypted: i=1; AJvYcCXbPAzQETQcmjjzwXxx8cNMypBO65BQC5egTOfq9DWqPL2tzEWPBl5pSM39V54K7jrhpjc1qX2Aizk5M/Q=@vger.kernel.org X-Gm-Message-State: AOJu0YxcBwZbVjc4htUxtivlwLe/HdGj5e4sAeFqgwv3IiYrcFrEQ0QJ 0OXxL3/WRyU4YjqT9sEbc6CXH7g64g0qn3z56ANWhzyxpBNhbRNuSRUs2w1+7SSE7MHD4493sXV 9is84AYEzmQi+XPnam5jWVDG1fm9tPa0lcxxgANmoKROgEFmsJ8Bq1jOjlnUz7Q== X-Gm-Gg: ASbGncuLryATTL7aeZMuwtFcmhqqQLpqby1R0WNvoUubPj9NJX9XeBJUUDlxxW1cUMO +t8rsfE7AjhKNtBBblYCLzDl4EqIEu6Y7utJrviw8cZoN0WhV1PqtsgR1CPUnSnXBMMEGk0qVHH Ccv8QsQSNnQABH3isABnhpUo5Sg0znzZ+FBTNDcvBqxYMWcKiNsnrCXwOZZ11iDgSqbZrB75H0B pJD3+FX1QgM+i6miDvM7h71xd1w67xj820OGf16sA2p7VDY8/oQtD+QPp3HO+nHetjZRkqpr/xM U3wIz42YQgvBuHIY1fDsA00ntPI7OC+v9QZDS1SQHpRsSNhlOTV1+8ml+j8N7KQoXEM= X-Received: by 2002:adf:ef4c:0:b0:38d:bec9:c8d with SMTP id ffacd0b85a97d-38dc936545bmr10411281f8f.53.1739284754973; Tue, 11 Feb 2025 06:39:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IGVlLeeltNgiMbHSqxLznPIfhFN4eDHUttCSHrTtTV0bsdUK3PjmcFdHZ6fTWELMuF2PXz6rg== X-Received: by 2002:adf:ef4c:0:b0:38d:bec9:c8d with SMTP id ffacd0b85a97d-38dc936545bmr10411256f8f.53.1739284754577; Tue, 11 Feb 2025 06:39:14 -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 ffacd0b85a97d-38dcc9bd251sm11745833f8f.9.2025.02.11.06.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 06:39:13 -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 v2 2/4] KVM: arm64: Allow userspace to change REVIDR_EL1 Date: Tue, 11 Feb 2025 15:39:08 +0100 Message-ID: <20250211143910.16775-3-sebott@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250211143910.16775-1-sebott@redhat.com> References: <20250211143910.16775-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 7e1c9884f62a..646c0a04e58a 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 && @@ -2542,6 +2543,7 @@ static bool access_mdcr(struct kvm_vcpu *vcpu, } =20 FUNCTION_RESET(midr_el1) +FUNCTION_RESET(revidr_el1) =20 =20 /* @@ -2595,6 +2597,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 @@ -4646,12 +4650,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 @@ -4999,6 +5001,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 Sun Feb 8 05:59:04 2026 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 32099250C11 for ; Tue, 11 Feb 2025 14:39:21 +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=1739284764; cv=none; b=AFVHt3iNGFq44ZknHJ6YY4bF1bcnZWsy4L2MWJ6Jm4vIeXxL5vJJqhpW1oD+VkwPEWSbrwQAUESTAL3u0JdRM9T6XlyN4K0BxgsQqGgrwdi4yyK+9W3W0C5XK5m2w7YLguzzuY7Z9TmvIOpQZBCC6wPxS6BGY6/stbQSO49meDM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739284764; c=relaxed/simple; bh=p9naWnQ0E1iqLvGPEhpxsWFpQ6BgZR017/nN0csyCE0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X9WhOKlAOp1EmPjFc52QITQ9bfTooZGvrSRF2MG5huZD3UJTwyb/fgJbZviJ2mqb62YUfGCEqXZMCeL6wdOOcOBEWDvgDC+GaA3msoJcMY2avZkMf2onAyf95sQXOL3XPe2SpqYOyKsqm2SqfkMBtomNcI34Wha3LBNjlJz/ZKk= 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=CXo+Qnnc; 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="CXo+Qnnc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739284761; 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=XPf5dvcDVGeFg4rp8rzaEx8TRiTLHtjfNYmtCjoBL30=; b=CXo+QnncJ8vAtgdRhga5vStt84VyLSyLhelFqZll5Y83bYYEIcHqR9oM/SK84RlV12V13S C5XIlYa7mamtTMVtazPcfaq9OjO10sMh96oMU+CFpQ4yw1fPcOdhdbUymBf8iYidYE1fsu Juz4zILoCVkZM+3GvMwacIr1z55zJpg= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-433-MgHh9RcbNj6xMEAAs2r4fw-1; Tue, 11 Feb 2025 09:39:17 -0500 X-MC-Unique: MgHh9RcbNj6xMEAAs2r4fw-1 X-Mimecast-MFC-AGG-ID: MgHh9RcbNj6xMEAAs2r4fw Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-38de11a0002so106178f8f.3 for ; Tue, 11 Feb 2025 06:39:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739284756; x=1739889556; 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=XPf5dvcDVGeFg4rp8rzaEx8TRiTLHtjfNYmtCjoBL30=; b=mbAw0hD20NbAprThbQY/MA6ypTyB8l6pQ69UBN2l1zYNDcB0xNOjdYwVVicUcNrmc2 D+zpapiF4fQO4sXsERova7b8Prk+5NlWI4XxdGb1ZZsJaxSzEpNebmoJNODS3nFhx5Hp 10yUfenuPq+zdBgw/Ry8fZBqEykskDX5p1bu5uIUHFNc32uWjVw3Wxko3BjQwfme1jcg 6FlmO41e7F2tjfkRKH5tpGrGwK6k8yuBgn0giBLXXChV0zTjyl8wNAug60oyAyr5Qd1p ffsw3iBq84zSKH5t8v4epggdNF71pq9nggM/ePmx9Wt6M9vdByXup2bAzXTizaGaepLD NU+w== X-Forwarded-Encrypted: i=1; AJvYcCWHK5ybBplVbB6c90ptdoHmnq7JyDvuhBgKtBBCwV2ya/VGCF/PbAosrkaLQhktZn2yzLEAIIv70mgZzBY=@vger.kernel.org X-Gm-Message-State: AOJu0YyvSViH/C458A4teSophW7dmiP8NOkY5rcqcf4Bn9ls3r1eXJ2a VS0FsZ4zfHukNxikMJ4ezeEa9usS4PahkEIEeNP+S8eqPWDU3EMKFGuwfXL/JwhgTV6CnbWD5oB pO6IUL7HTI+UQ+5KKE1VVObgKl6hMp49VDhXwCLevBdZVWOaMtPAd2jpsDiBIUA== X-Gm-Gg: ASbGncvgh6P3tBOVl76pfkVWzYbwQPAUwe5UvET3yg04vdGIZCQzS/vTBsrs0Q6Y8Ms OQDU5dtR8aWA0iDqUMBHOpLRO4bzqjn2Ykx8Esa33IOkeAc1fJ0HBdyycFS0XB21BZxA5yfAKWg XGLSLzV6q1zoIoM/n96j78LdezjUUT/zvVDY+mmChfvORlXp+dAJS9PHTaqPlCFEx8GMnHpCAJ4 LKix4iNghg/y7yiTuteUN5oon3UBzWuImEfMdIe3YqM3A5TqrYou8ZhN21Phcxwm/3OJEcgWM2d CYLMhzfX147JmBiTBdy+BqJUpPe+3rdn78d6QrNUwGiGPkpbVQ+LCBtU1kfA19/j2QM= X-Received: by 2002:a05:6000:1548:b0:38d:d3e2:db40 with SMTP id ffacd0b85a97d-38dd3e2dc3amr7819784f8f.17.1739284756327; Tue, 11 Feb 2025 06:39:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IFI48MsBZ0xT8yThrymEFgbe5pw/LDZFV6jmWuDquHS5367gme0u5rb2EuyuSeXzwWC2tE8KA== X-Received: by 2002:a05:6000:1548:b0:38d:d3e2:db40 with SMTP id ffacd0b85a97d-38dd3e2dc3amr7819754f8f.17.1739284755919; Tue, 11 Feb 2025 06:39:15 -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 ffacd0b85a97d-38dcc9bd251sm11745833f8f.9.2025.02.11.06.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 06:39:15 -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 v2 3/4] KVM: arm64: Allow userspace to change AIDR_EL1 Date: Tue, 11 Feb 2025 15:39:09 +0100 Message-ID: <20250211143910.16775-4-sebott@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250211143910.16775-1-sebott@redhat.com> References: <20250211143910.16775-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 646c0a04e58a..d388594d7b28 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 && @@ -2544,6 +2544,7 @@ static bool access_mdcr(struct kvm_vcpu *vcpu, =20 FUNCTION_RESET(midr_el1) FUNCTION_RESET(revidr_el1) +FUNCTION_RESET(aidr_el1) =20 =20 /* @@ -2870,6 +2871,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 | @@ -4634,61 +4637,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; @@ -4770,15 +4718,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)); } @@ -4814,15 +4757,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)); } @@ -4911,23 +4849,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; @@ -5001,7 +4929,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)) @@ -5156,16 +5085,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 Sun Feb 8 05:59:04 2026 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 7F072250BFD for ; Tue, 11 Feb 2025 14:39:21 +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=1739284763; cv=none; b=HWJ5b4y1wnP+NQD6d6k6s0Nm9g0WLtk26Am5HkWcGW/BPmcKxGNI6RD6TyRA1xDWbuPe+UcfR7KON2cgcGmoNom8T+AKxICbEZ929IZC/Q2NYer3iqDI58kwbNdJyb5PtgLhGY3qpmG9vGfhmZn4KJm6etQEK0P0I6CehK9Fpdk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739284763; c=relaxed/simple; bh=48SNocFIEyTD401Bn7uEPWmyPGgbFKE7acbIYbRpQLE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pDygFe7ijzoji8sCM88HDl02R5KIe+8BXQD4lyu5vDcKdbE7ffmulYVfo+kSoR6GWqTBw1AFDBXnnl+/3Po3s9lh6R3ELnfTJBKpHVpe3gGHeknRXMr75zz+pj0B8DNOf1INz43noT+D7QPbmYcxJ8iBjXRxFxD83GvYS1qapTY= 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=FhvN2k3F; 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="FhvN2k3F" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739284760; 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=FhvN2k3FWysvStIc1MPhRfVDOy4EFW8YAplupaesOQGmmuYN9Qtq64VAW2UMOlq4X30yY3 AyFCHnTPobwdFGAWrEzOmJXx6WAae1fKKr+9CR6wEIedFyj78IXl5M7hBHbbFDtLKgpH1y ANQyHr7s7K+cEyuNAJiOKfmwgUbnmsc= 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-457-2sI33svoNdeFgZBCLNhC5w-1; Tue, 11 Feb 2025 09:39:19 -0500 X-MC-Unique: 2sI33svoNdeFgZBCLNhC5w-1 X-Mimecast-MFC-AGG-ID: 2sI33svoNdeFgZBCLNhC5w Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-38dc6aad9f8so2232505f8f.1 for ; Tue, 11 Feb 2025 06:39:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739284757; x=1739889557; 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=ICpvBtPI7wjWJeInIhUFMWkubPYweN6WMSao9hdKqDDbGtEfKC1huQtIiCfI2NuaWU wd6adVvQPG+EAOmZCHvhBMcjFwtGf7JFcPKeLXf08g5HAKXR+fIGp1bKRyg8ROOasbQL b+LYSuGsJMhCXkoQyunHOzMnA4fDdbqhGaa6QpRtz1gfbLqmexxe6G0Ll921b7vdugls UkISCuXNkSos/n7HoOlhRpQKTZDGZYbFqcNHWfd4dwUm7LK6a0nsN6d5Yn40wfjFSF7R ZKpyz/Q0MQgwJIvYtRWPjNxBiOa6f2S3DgJwzkb3kSfH1NOAwscjZ37a40T49XML6wKd 40YA== X-Forwarded-Encrypted: i=1; AJvYcCW895tbQRtbJK5SJyXe3wnKkjb3cadtV7H/D/FZOvvHOubYWE5uUB9nrpwZdrMCa5AWw4dUHhqQf0EHdBo=@vger.kernel.org X-Gm-Message-State: AOJu0YwOIta44u6PY6KV8wos4ozdElrxy52TpSyc2XvLwJULCVllcPkB Gi9VcdsVfwtBZyuXVtstK6ZnoRIQeIxKepdiUvSl4cCUBHrC6dJI8z6ECNPLrjHokoAF58RrNKw g4LlEm/BLGncZk+TVfIPILwNuJGd9OBiuXqLovALV9DyavfJApwP9JhneA4F2jQ== X-Gm-Gg: ASbGnctI8n7CxMznpcUmgsfqKnRyRkfEq9CaiFojUR8MrxKdAWa4FdcmyTRf2q/q25D reHnNgUy1q0qLw0wyTyWZq6kxjY2wnEbkIp33/IEBDqkBdZASAy7Z7//peyo9otmVyeamHLEyT+ VcYkIZSO73InkR9S/RB2edOtgHiB3hZYIskKicoDt7CUsTe7GtpeyMoHLizEfuegEv9yZ38b0++ 7kSRbYZMQbr5XkTUpEuvUtC/D34HI3PY0v7XdVCffLo1eqZiWQ9PTk9Bz66QCStyjCTS49C3r9y b+IS2HQzTAK6vfhSdA25+GqlY92k9619NAIEmyorYqWPih5zjg4OEB+uQiUBYMXSY9o= X-Received: by 2002:a5d:648b:0:b0:38d:e259:4d10 with SMTP id ffacd0b85a97d-38de43aa5cfmr3602449f8f.13.1739284757118; Tue, 11 Feb 2025 06:39:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IGRoa6TpHpYjazCGXAA0zdDPm62ZyWpFuSI/jEW82VolHbg/Poh9pR7FaZIHb0wfaUNxzC+rg== X-Received: by 2002:a5d:648b:0:b0:38d:e259:4d10 with SMTP id ffacd0b85a97d-38de43aa5cfmr3602425f8f.13.1739284756792; Tue, 11 Feb 2025 06:39:16 -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 ffacd0b85a97d-38dcc9bd251sm11745833f8f.9.2025.02.11.06.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 06:39:16 -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 v2 4/4] KVM: selftests: arm64: Test writes to MIDR,REVIDR,AIDR Date: Tue, 11 Feb 2025 15:39:10 +0100 Message-ID: <20250211143910.16775-5-sebott@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250211143910.16775-1-sebott@redhat.com> References: <20250211143910.16775-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