From nobody Tue Dec 16 21:58:32 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 2AAB71E32A2 for ; Mon, 10 Feb 2025 15:50:00 +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=1739202602; cv=none; b=OWNrVUJUi0nA0Hk0vjwvkp139zfMGdJDtJ7JOvnKCBevn7RIcaEg8EwD+E4NRXz4oUditqtjX1Bu5kKu8dnFge/u81EoQxL293p0nrNfZm3JhlOniJP5PxNHgUbktTTrHaBWOFpZIhSkZ3udj3aSp9d+rhpO8Yj1UTV849/NWTA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739202602; c=relaxed/simple; bh=bZRkKNBufB7CB97QTFz3czCZY0uD4SYI+5r+AYUMhTA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uRXpJkjfLJng9yqzzKpgsWeiTgnlN6cDydWwrSXFvWQFh9QHrgtONMIw9cw4NdW8xF7lnygNkkNT6NmIjDHkApKd9LFk7sdqmMh4K3Bh7YGtMrwsC7QWifW/5HAnYVodzmuskFM3ffxVexDQe4KGnSDT8L8VlGXmWM0W7CK15cY= 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=gx3npQis; 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="gx3npQis" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739202599; 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=dWBLvh1vOG9Vtk8E5TaMoqin30xQfKHJVa4bPl7KdC4=; b=gx3npQisZFd1cmF/2WT0d87iUr0wBzjIDQQoFAEpz032342EqStZRrm7ohdxCFbhlJpOBz Jy387tsLWP9PK5PaYv5HqEtvqwaPoHYMemZX7PWJymh4eI2reUypGt3Z5w1ZgTz8lFWKTe Owr03vi9UK62i0Z1NsB5DtQEmQUSI6c= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-505-IcQVCcbZPiCMYsGiAQ3-bg-1; Mon, 10 Feb 2025 10:49:57 -0500 X-MC-Unique: IcQVCcbZPiCMYsGiAQ3-bg-1 X-Mimecast-MFC-AGG-ID: IcQVCcbZPiCMYsGiAQ3-bg Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-38dd533dad0so1262637f8f.0 for ; Mon, 10 Feb 2025 07:49:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739202597; x=1739807397; 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=dWBLvh1vOG9Vtk8E5TaMoqin30xQfKHJVa4bPl7KdC4=; b=W2+f/PT6VRdwWDdK/MxwbFe1vlqW2Z5wlQ+BLNmh/cOl7OwRBiZ4ZYJesOTfQ63Kge PidkuHdLL6fJ/0+MTuaApeAIaljLpTeUH3/Y7XhPTVCZgy1wJwt5qCzvboKMN3dWOKVE NX1iJ/WlIc/IxuysdVKsINzVzwjs8lbH/BfDHw2AA/6FPXAK344quyqfwwDJmU7KBVha 2K6Iuc4V6eSrQa8AJW4LUm6pGmRDrgBRR+vMXp7xuOpMbPPIIi8LzDYyw0o6KrP8WlfV S7sNWm1JOjMQYxN7oNZMiqp1CP1QpScVImfrFmYvv82x3vCJfksgUyim/w675b9DId/n geTg== X-Forwarded-Encrypted: i=1; AJvYcCWUf7mR5Sit00eSCziqPYELT75QwJ4j0VI+tYHUl62WZFIcFUrxSGFsJzI1g2mpVME7LUMl0gtZWTk3X+A=@vger.kernel.org X-Gm-Message-State: AOJu0Yz6n3BZAs3mGATb7j94QzbXYxLVHox9l1YgdloHPe1ZuXNivDmB zdIkcnl3TBLI5v54S30500V9DrRIR39+NYYtsMQ9a1Z3mk94p0xuLdTtS53LDybJA6beHxegwND aIgLEvAvXNKz4hHuKiE8dm10IOpF8U6DxgWBQRkW+0TgyHhOKGfSglBOsSXlA1A== X-Gm-Gg: ASbGncsyEg+3ua4lDsFzrSypJyqIAFAi96imGVP0kIxjfed+hdNQj75T6CKGs2yryAJ u4hTBraPzNo8QdR/Uj0x5XSczVEkEFRkBNDqDjwsYkpmmwn9LBdleV5L/pKjjuMCmp6W4vfHOAe 2YsVjzMbS84rWrEv3bdgjGe2cDA2iQ0S7F9Nr0LfU6jXd7I1MQH2QVRB6/UQp8J0gfDoDP+7wdU 9nXruL80MxYI5KYaMITvvcEKI9zOWV/tXRDxdVYrey2Dzt0Pe0usSq8lw7CQjSMUsQGXVgko7o5 CluLGQQ3rMLZu6pJkx0CGFDiLjgDXms/D4vipzt6wmcjNm1TQMOet0CQ5yeXq2yb+a0= X-Received: by 2002:a05:6000:85:b0:38a:2b34:e13e with SMTP id ffacd0b85a97d-38dc8ddefdbmr7961779f8f.18.1739202596609; Mon, 10 Feb 2025 07:49:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IErZeSIDhxVmXxw+MQqPx65Y2wGmkBfy9SY3c8qH880FDgrCYi3TbT7Nr9ofzZrqiORl2xfyQ== X-Received: by 2002:a05:6000:85:b0:38a:2b34:e13e with SMTP id ffacd0b85a97d-38dc8ddefdbmr7961764f8f.18.1739202596251; Mon, 10 Feb 2025 07:49:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:49:55 -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 1/4] KVM: arm64: Allow userspace to change MIDR_EL1 Date: Mon, 10 Feb 2025 16:49:50 +0100 Message-ID: <20250210154953.27002-2-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: 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. Signed-off-by: Sebastian Ott --- arch/arm64/include/asm/kvm_host.h | 3 +++ arch/arm64/kvm/sys_regs.c | 37 +++++++++++++++++++++++++++---- 2 files changed, 36 insertions(+), 4 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..cc94bed7299d 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,22 @@ static int get_id_reg(struct kvm_vcpu *vcpu, const s= truct sys_reg_desc *rd, return 0; } =20 +static bool skip_feature_check(u32 reg) +{ + return (reg =3D=3D SYS_MIDR_EL1); +} + +/* + * For non ftr regs do a limited test against the writable mask only. + */ +static int arm64_check_mask(const struct sys_reg_desc *rd, u64 val) +{ + if ((rd->val & val) !=3D val) + return -EINVAL; + + return 0; +} + static int set_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, u64 val) { @@ -2021,7 +2037,11 @@ static int set_id_reg(struct kvm_vcpu *vcpu, const s= truct sys_reg_desc *rd, return ret; } =20 - ret =3D arm64_check_features(vcpu, rd, val); + if (skip_feature_check(id)) + ret =3D arm64_check_mask(rd, val); + else + ret =3D arm64_check_features(vcpu, rd, val); + if (!ret) kvm_set_vm_id_reg(vcpu->kvm, id, val); =20 @@ -2493,6 +2513,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 +2571,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, .visibility =3D id_visibil= ity, + .reset =3D reset_midr_el1, .val =3D (u32)-1 }, { SYS_DESC(SYS_MPIDR_EL1), NULL, reset_mpidr, MPIDR_EL1 }, =20 /* @@ -4594,13 +4625,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 21:58:32 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 9FA95225A25 for ; Mon, 10 Feb 2025 15:50:01 +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=1739202603; cv=none; b=E47glK5YvNrtQA10kJ5ZeboiC9n2V/1ZMAHOsC8/kfkJuaOMNKwGszwx8lUwWyMRHZMJX+dvMYzXdD1FgElkpWWQgZbJz+YE+xPvncdjzsb8NIGbzjm0JZYz2U9aRfbNnaXCNWcOiU//ottO9vm1JoELMAOjF0+4hIOPtR3RN3s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739202603; c=relaxed/simple; bh=0my6NoAsd7P7y9OJgYipp1QVHC1ZbpCJcXEsrlAHxlo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bq44wF9HbFTlqGz7iyYsUXN9sn/UREr3Wc1UlpuANEBKZEUvmFK8ZE7E8eCtswjsDlq7ACzm8U4d2n76R0fnmy8nGsSWlFV55w1Ap5JSfq2RHQm+AJZuhRm70c3whPjUHWpaattMfVSOCDPufppcAmkQOgT4qIxOHPW6VTFEVQI= 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=Y+SXJAvz; 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="Y+SXJAvz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739202600; 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=k5AYcip1WpOMZ4l8MYmRKzKUrzrFcQKu9wKzGyAJc4c=; b=Y+SXJAvzz7lMDI5kNQ41x2v7c0xTgo/d1gMouV2WaB9AWOjQlaV+VCgw1raRQ2Ra0K9Rbf ofVulvdv45WLe4iT3jU5HDNau5twdSvHhkOfH1wH7W0u51S9brImY+A44FzN3oocjsPtEE 3engzgmjYYCUNY13jfGTH/phixcQFEE= 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-195-_FvyDZjuO1G9PyA1V4gZ7w-1; Mon, 10 Feb 2025 10:49:59 -0500 X-MC-Unique: _FvyDZjuO1G9PyA1V4gZ7w-1 X-Mimecast-MFC-AGG-ID: _FvyDZjuO1G9PyA1V4gZ7w Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4394c747c72so559315e9.1 for ; Mon, 10 Feb 2025 07:49:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739202598; x=1739807398; 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=k5AYcip1WpOMZ4l8MYmRKzKUrzrFcQKu9wKzGyAJc4c=; b=wYeKsHb4IBCtzXvFc+vlpBLbBvAT0/G6mfK3VVuhpraqAi+SGGI+zCBzbfBYEaXc/U /pm1deEK89dhvcJd6i3B8PjuB/xIQRkQJhdd7cghbq+fmm5Jw8tGZeAMEYYHs75GtQAP S2R6TB5v7sLYRF8ozF/h5wr+9IdjS9CF+nsuIOnP2BdKaZ0qjZ/f7SZA9W3CIitJ/MIB 8ET/xd+BhAhrsKebPCDzMIT0aV5Fc5YWkci3GkQ0qkuzGpPyPOStMdZE+WB3DrO8qnxG 3Oc0GKeZDHHdippVoY2sXjk/dx6ItE3hsKnPNSXX9Zu2LUlcbllUa+VtRoewK3hWtAt9 U8yQ== X-Forwarded-Encrypted: i=1; AJvYcCXJTAsHglvlG+R72KQg47EJZb/7u30ZtUCukYI4irb8qOWQqnQJHkma2Arxwcd5L3QsYzzXJduLA72SJhM=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5M9t+p/mBy87JPsz9b6PWUCcswNpfPyI+N2l0ZOl0pJSQyWtV xghbBSuOMfx1Uf+ZQqLB3dUIPtSWQVjz1K583mTYCVy4L5h2Ftwv6kLhLO1xfxXbHZTzlO9E+bA L2hLjYa/OVo++U77byZChSlYcA54qPy02wFxWsQNRZ/IURw4omdX9UDOnFBD9uw== X-Gm-Gg: ASbGncuippxdLu2D5sXTW2w31+mKMotXSFlhrIl4sHlPklFBDM5jEgvLBrfXXHZt5+2 +ig2OEInwsuwhT4Sk0TmKNIhpYVHaDjXgkiBb1Xcp5DdDeEsUePOigmFRl/rWtV45I//S5wfk6X RDq7cJ5aZNxQNOmSBingC3OUGMKMc6Q92E3qdn4Q9spPZM2IfhqFoTMBskRqQpzUQ8PrfUFDNBO CvL+SrLAMgmitU7TRCY32W3yCrAY26CTqpDi3fad3Es4XjdtxwwoPvRvLtiC0QXq+2+ZfVjjgnX KvlJcbdcI6mpvZ3mE5xBNbUZwlA6jaWcSuUi3uJd6olk3s6CP2m552rWE4U79/jsejc= X-Received: by 2002:a05:600c:cce:b0:434:f131:1e64 with SMTP id 5b1f17b1804b1-4394c815898mr2835305e9.9.1739202597839; Mon, 10 Feb 2025 07:49:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IE/gXGeXIZb0aJTYjdY1ZH66XscPhh3eLXFgOg1KHJQ8jUhpcmWvkE0k+kfaiy48I06jOKA8w== X-Received: by 2002:a05:600c:cce:b0:434:f131:1e64 with SMTP id 5b1f17b1804b1-4394c815898mr2835065e9.9.1739202597479; Mon, 10 Feb 2025 07:49:57 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:49:57 -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 2/4] KVM: arm64: Allow userspace to change REVIDR_EL1 Date: Mon, 10 Feb 2025 16:49:51 +0100 Message-ID: <20250210154953.27002-3-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: 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. Signed-off-by: Sebastian Ott --- arch/arm64/include/asm/kvm_host.h | 3 +++ arch/arm64/kvm/sys_regs.c | 11 +++++++---- 2 files changed, 10 insertions(+), 4 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 cc94bed7299d..0ab2b2c79881 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 && @@ -2001,7 +2002,8 @@ static int get_id_reg(struct kvm_vcpu *vcpu, const st= ruct sys_reg_desc *rd, =20 static bool skip_feature_check(u32 reg) { - return (reg =3D=3D SYS_MIDR_EL1); + return (reg =3D=3D SYS_MIDR_EL1) || + (reg =3D=3D SYS_REVIDR_EL1); } =20 /* @@ -2521,6 +2523,7 @@ static bool access_mdcr(struct kvm_vcpu *vcpu, } =20 FUNCTION_RESET(midr_el1) +FUNCTION_RESET(revidr_el1) =20 =20 /* @@ -2574,6 +2577,8 @@ static const struct sys_reg_desc sys_reg_descs[] =3D { { ID_DESC(MIDR_EL1), .set_user =3D set_id_reg, .visibility =3D id_visibil= ity, .reset =3D reset_midr_el1, .val =3D (u32)-1 }, { SYS_DESC(SYS_MPIDR_EL1), NULL, reset_mpidr, MPIDR_EL1 }, + { ID_DESC(REVIDR_EL1), .set_user =3D set_id_reg, .visibility =3D id_visib= ility, + .reset =3D reset_revidr_el1, .val =3D -1ULL }, =20 /* * ID regs: all ID_SANITISED() entries here must have corresponding @@ -4625,12 +4630,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 --=20 2.42.0 From nobody Tue Dec 16 21:58:32 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 A828B241CBC 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=1739202606; cv=none; b=I1wGXdNw76UhWfB6YUf7GsHltljhNkbq91GOoNYTNXrTjXkMHD3XCxUetmSdLbKyInlMWjYRWBlzi9Tvue92OjPS7+IU4VrjwW7ecI2W4HTlWCTgNeuwlQbBm7ShhSt1/BGI8UPr9dB76nxFvAg7cQDBY7KP+5TSdKwvXbfS7R8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739202606; c=relaxed/simple; bh=NZOFfbRhsbRsC2hvzZDglWFLctXrjqBQJCBxNGafW7w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pKW9sYVQAfrZ1pYVJk8zAXd8esInxNJQAvqSORmseWEMC6OB/FlBj6s2f6lQ08cPiOuzr0zGuTSX4y7pleaT1tECHSRALmQZfwCIrELaxtfcrsHlkccw7e8wCsTwJnQ05O+TrN4NU8BGnk9MuJwR13b3FEEXI8JJA9rLanwnbj0= 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=fvHkORQg; 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="fvHkORQg" 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qZ5boF1+ov+a1CrxZW4hTB/OazVKXnCvFj7KGC76W04=; b=fvHkORQgQ+U0pAnMp94LvgCuKGGTv/So1748rlMtLcpqhu664YQTTUL5LzfW06njtjzaeI rsZpPHGFQh+sfjXcJ8kmCruSMEZ3QpT52tgGYefG9l/Nup2h50ksUqA3HaIuDoW25K3MsB rQT7WAVvOuD0d+uBxN4YZ3Gt//oA7VY= 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-599-IKCE4hVgPnO2XIp9T2OKaQ-1; Mon, 10 Feb 2025 10:50:00 -0500 X-MC-Unique: IKCE4hVgPnO2XIp9T2OKaQ-1 X-Mimecast-MFC-AGG-ID: IKCE4hVgPnO2XIp9T2OKaQ Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4392fc6bceaso11981565e9.2 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=qlHLIIa/2WGryuzSfx5ilpxG45Tpeew8NUzr/NvcpXjpMX+JxVA7zd/Hingojfrm4J PYkzr97K/V2VyYOx2XOe+MS7OcuoHQUPJEVqKEgG1wFzVK/IonUybEvWUg6O7Qr2NUYA PhuLMcm7u8jIq6iQVjSrjwstThvc7g/StgkiiuwooFH7elTnSEjquo+B7j0G2WAWk18s noYabpm0hWzE09kE9dAVWraaOU/LmN7ayrvZgP3NZl48rIE9MzYdNT6XQ9SP7BwZwNEc aLX5ZirAyyjBIIyBHvKD/Z9CagP2zPx8Sx++TlBJKip07cKA8Y84kKQW7Q3+G7J+ZEih a/mA== X-Forwarded-Encrypted: i=1; AJvYcCXMOU0gWv63BXh3ErFWqzRDtZVh/Ps87pWgI3YWSCLrdDhi5r0jd721kEpa2H3EFT8I2nNg3hoKlWevn18=@vger.kernel.org X-Gm-Message-State: AOJu0YxGEc7d+YIvR76YWAXzTRdXcpHZfGAaOoh08V2fviLD8ipZAMyU yt0Wg0VhvF2LGvudB5D9HaWyg/2xh/Spr+UtOONkZWPZYhoBuCB5k+cX0vTY25AhhxIBcB1KvTU 8Gt1GC5/dWlnG76oNjOkZOlx35/rmTn9lePq1DzfJf4oX3jNQn2JMJkvjV227MA== X-Gm-Gg: ASbGncu4cER4+HwEolQNu/sBaNI8z8uVQ35KRyj4fz4RxQ/kkBlrg/wsu9pt57Nd4VV A+M2/Vj6Z9EgDeI5TwHFXluEPSVnqAVcaSY65DfaUQn32Eug6dxGfF+phwl0B1Xo/nL9s1gxMNb 9J2pHDEmTb696PhtX5Vsrm0ZE7cgEqUg8ciLp3XHeiRVgV1DwzlLHHhtuqKe0YBu+Z/uNplon6k DBcWB//AtX2wXbBQP5cbF8a2t0PShT9iyHjubaNyka1zGC5klhv0q6xiURkzIWTWRBFOJ4t8/Sc sIFCVC5ih7pJtEFdwoZpQiHxmSByaNMy/1KoloESytvW2zKUjyjzdGUgUCScf68wAas= X-Received: by 2002:a05:600c:3b24:b0:42a:a6d2:3270 with SMTP id 5b1f17b1804b1-439249b04c5mr95485685e9.21.1739202599131; 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: 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. 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 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 =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 && @@ -2003,7 +2003,8 @@ static int get_id_reg(struct kvm_vcpu *vcpu, const st= ruct sys_reg_desc *rd, static bool skip_feature_check(u32 reg) { return (reg =3D=3D SYS_MIDR_EL1) || - (reg =3D=3D SYS_REVIDR_EL1); + (reg =3D=3D SYS_REVIDR_EL1) || + (reg =3D=3D SYS_AIDR_EL1); } =20 /* @@ -2524,6 +2525,7 @@ static bool access_mdcr(struct kvm_vcpu *vcpu, =20 FUNCTION_RESET(midr_el1) FUNCTION_RESET(revidr_el1) +FUNCTION_RESET(aidr_el1) =20 =20 /* @@ -2850,6 +2852,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, .visibility =3D id_visibil= ity, + .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 | @@ -4614,61 +4618,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; @@ -4750,15 +4699,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)); } @@ -4794,15 +4738,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)); } @@ -4891,23 +4830,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; @@ -5133,16 +5062,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 21:58:32 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 0C71C244195 for ; Mon, 10 Feb 2025 15:50:03 +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=1739202605; cv=none; b=MieJuUv3z8nMsYBEjWYGVHoF9UJe2H7YuLh++JmSOqwDN/EjqUq5RYHZ4p+6Wz3aSdgEtlvi4ijgstDHzHewv58LevOu6IC4YgOUK74GSV/7pzCabPW73rlX113RfGBi0T7qfjcYHEcSB4PVInkAKFrdqFflSacH7gejsk05t6U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739202605; c=relaxed/simple; bh=JwX0FTJ7E53zMSff4xw/NDJGkvTh/vf9GUmKygpIM2k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GA8gbAHNW0aDoD1za03EejhUVZ7MNotO73cZchBIf3ZMBTLm7NfJ/HIY3Vp2AdT5Y46aqUcZd0NzrGOmfqIP/P/pRW4reWz9MdjkCmimAngFeF17dfYbT+AF3BoR5uCoLgWUXKtYnlB9dyFdGvkJ8Za6jqa3uPFzuWcqNgLiSGE= 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=Z4QatZHs; 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="Z4QatZHs" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739202603; 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=BLF8Cf/xB+6V3hagRkehtOvA3nhCvcxfhJ41oAzlRW8=; b=Z4QatZHsJMFzfCANUHCc8vROaVBlw2Kb9UiQnZNnkq3IiNFpwfepfiHU71ilYZnaBriJ+q SzWZvlGeWW03emcV+WkwQ7OjRxRGuknjv9xld6rAupRQToQJgzjHgcwqd0xryoL5zrdzgf LaOukYPipYnDNLov5vjHrcNBpOFhOHM= 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-657-DvE2dkUWOr68L1uu22d8-Q-1; Mon, 10 Feb 2025 10:50:01 -0500 X-MC-Unique: DvE2dkUWOr68L1uu22d8-Q-1 X-Mimecast-MFC-AGG-ID: DvE2dkUWOr68L1uu22d8-Q Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4394b2c19ccso3938935e9.1 for ; Mon, 10 Feb 2025 07:50:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739202600; x=1739807400; 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=BLF8Cf/xB+6V3hagRkehtOvA3nhCvcxfhJ41oAzlRW8=; b=joomMHH2QkpJ4E1EgfJuEYsOtJQVHp68zFKCjUmTxgECiAZBEpzwFEcfE0PCE22Vne vROnUQ/DSNlPyxLx4r4j3Mz13jnYFEkKlfMi+O62PvEi+4Oti45IOwyOE8QF1GR9nmif EmyayRtGK8aYH4o9bG/ngn6d5XwI5szAcBHE4NHX3ujBRef8Xwa97tJQlye/sAzEvRvu UQaps5VEi0SbttIr5qLiRKnoQJb9bRMX2srbPvVc8GFPQOYs6E/ud0UgyiOtvV5yGiyV m7pMx6WeRRvcGRLkdqb1BTzULKIFACaTbCsYDIGA2N2G/gxYa3F5uhKhglIIilMEUV3q BZ1w== X-Forwarded-Encrypted: i=1; AJvYcCVEKaTsPg+ji8HEvFEGoXkh6LK4461XRXjwA7ETU6mwEFtzXK16FHxLDBV8IqzC98cUXofspl9H3ydTgTc=@vger.kernel.org X-Gm-Message-State: AOJu0YybEs+LPNFt0YBXDWZgCXe5VmEqSQ3FMokdMkzjGHBayL+gtd23 ljZtOIGihDwgUi4r8lMespxkPLzLCR9egmtJ8H0lVHJd3KHE+nKEPECuzopi2fvGsqpaGp9V9MY 4JNVdBEDD28ufX2b92wwHcHu6hvnGYGmObIhxyz7hPuJ3V6VyvxxpwgEADcUgtw== X-Gm-Gg: ASbGncvFfMabT+N8hm0BPIozee/nJd8pA3J5Z5Qkt26PVSCq6ZqDU1LniaLtZxivLnT OlA5O+NQreKwH8T2xQKnyXdLi4zDQw9DW4scvHyVBxojGcoRWTSVuuK874Zn0XWvT38YYJ5K/9o nDW6PhIglv1cXXBgW6p2kDh48JP2USSbd6mwQOTXAlcBoUkBZnZGWvCTGj3ttSfJOqpYgNnd+t2 zhmJ0TjLUC7ws09O9e226iVly5eKk9anhHngqP3D6bDHDykmoqU97WHuPKGYNmia0DYANBOgKdb N8OUATlppdTkkWUibGWC4dEPdYUWwWbJqL0TazQlyUBpCP1pMACj/uVYxOW3b9jhN4o= X-Received: by 2002:a05:600c:3d06:b0:436:2238:97f6 with SMTP id 5b1f17b1804b1-4392f1b8e78mr67201685e9.1.1739202600505; Mon, 10 Feb 2025 07:50:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IHO3zxKwhpNf5G9RIMWhyWsZJwinpmx8lRLWXcdVcXxH5R1Bp8BJUV0bb9Jd4M71qBY3iU3wQ== X-Received: by 2002:a05:600c:3d06:b0:436:2238:97f6 with SMTP id 5b1f17b1804b1-4392f1b8e78mr67201305e9.1.1739202600117; Mon, 10 Feb 2025 07:50:00 -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.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:49:59 -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 4/4] KVM: arm64: trap guest access for REVIDR_EL1 and AIDR_EL1 Date: Mon, 10 Feb 2025 16:49:53 +0100 Message-ID: <20250210154953.27002-5-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: 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" Setup a trap for guest access of REVIDR_EL1 and AIDR_EL1 when the VMs value differs from hardware. Signed-off-by: Sebastian Ott --- arch/arm64/kvm/sys_regs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 7d588fedb50a..2918872e3d2a 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -4910,6 +4910,10 @@ 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)= ) || + (kvm_read_vm_id_reg(kvm, SYS_AIDR_EL1) !=3D read_sysreg(AIDR_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