From patchwork Mon Feb 10 15:49:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13968115 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6D165C02198 for ; Mon, 10 Feb 2025 15:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:content-type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=dWBLvh1vOG9Vtk8E5TaMoqin30xQfKHJVa4bPl7KdC4=; b=fspVKbIXC7KntVxSWCmmwyFR0w bgEWZStwRrYOExFPGq/BmVkL9ojD92//ZFS5sgEeuA4LIWH93V+QGjhQwPCjzY8/uGpCUyJp9jmtB a0Sv3RXgX/7HNsu8xS7jwAJsZuG0b1YlDZRbIRAbUNRCff0v8CQpH9AHzrKVbetWomeMcAOP++io/ jZ/fhc6duWE8Q9E+hwbIT8CxAI2/PnVyuWq5WtKd/6SLQ8Eob6HxcQTEj8mKSkH0F4qzQx0JSPyYo pzYn6avSkxiGMTeIugTjqX/P9V08ZIkZxLxUPpmWnWh5Ra6SKjCymCYfT5DNO/imk91VBkO6VlH5j gJ2Mluwg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1thW7X-00000000OKT-3EMG; Mon, 10 Feb 2025 15:54:51 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1thW2s-00000000NIB-32Sn for linux-arm-kernel@lists.infradead.org; Mon, 10 Feb 2025 15:50:03 +0000 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=dWBLvh1vOG9Vtk8E5TaMoqin30xQfKHJVa4bPl7KdC4=; b=N8VFcHRU+9EQWrkqJqSJfOwCIURtOl5BEwEtl83UZMYflqrNUk064ijl2FCoG9yM3hu/yD 1M/iH8jiczqFgqY/17iF7tkhQojYaLHAFE8CuQkgl2eER3/GqWrddQ9qwUE3tJJIVGvsSo vAuvCdWmU/ebPp/32EzglhRol17TN3I= 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-401-vyuLFJINP8uDFA1S19yHRg-1; Mon, 10 Feb 2025 10:49:57 -0500 X-MC-Unique: vyuLFJINP8uDFA1S19yHRg-1 X-Mimecast-MFC-AGG-ID: vyuLFJINP8uDFA1S19yHRg Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-38dd5031ee7so909812f8f.1 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=1739202596; x=1739807396; 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=UGGAyrGJ9tpbchSIx9sFw/H/7cxWe/Kn5wmaIgyKast2biCa7MkGM6UZNxVDAzjTAn xOE8AJCg+X9S1lHrKn+hydUtFstFf+zQmg4Ep5WuBfuLD5/Lz93D2df7pOyXY09y2Sm4 bYIGCibxowSi2OMkDLRyFa/fn6U411N2Ykm4USjt4dxKHg8pykSWNuoZe9NwvXQp/EA8 0Ozl1FDb1SBOUHB0kaDRhjzxQiZNGpKq3Dq22UjFOUH5JzboZEQj3tvx4/i+fgY20zhb 5ypWNW0TzthPzD8oc+gF5DW2Tbuyeb4yobhgbZDQ490zVeTL5ozJfabiLZnxIecY4Squ O1Hg== X-Forwarded-Encrypted: i=1; AJvYcCXA8obu6OsRSYAVTBo/dnTjCgvAnzHqJo3HdmJblHtsAQjfNMGomzobr5uPk8lPZCVncJBEGiQ/e3hlj8hsP9Gs@lists.infradead.org X-Gm-Message-State: AOJu0Ywk8PLeRBDfIdBLCsLheLQApBPJrhfv+tgqQUfC75Awzhd5QPrp uhQo9axPVc8lgD6/1XQ+3z4f/H/qJL3d3XM1+FIo3jWgLAFnI2iHVaKrHz4eM/0Fj9TSxX4W8qa trY0hJkpwS7gpl3lDuC6htdV+BL+11IOBMg8bYBU4kb0T89zFEfjKb+fu5PESWDB0ThWp9ToR X-Gm-Gg: ASbGncsZ8NwOE+lped/8SwX54rYw42CEMp9xh3BQrNbAwkXFdZW8f47HNG01vYqIJ4p AJqmqdEs4qGyygqZ+JgkDbtk6AiIwzYwjoAXqkJ4T/6xRW+Wzc/6I7/0Hz3v/QA+X/ArR8m5YWl syPsBH3NZPAggdomG3BytEKWIoB+6o043Mr4Opqzp06pORy8dFQjTl2l17ZEBNnx0vAHvBtEiuI mg+EhA+WQxkSzZthfHDbnJKQq3HSKkN4OONPIIpdrKQj6VOzBR8H+wTMlXrR1RzDyVd8kMQPG5c Tfri6dgenYxWrcpxIluv40pAl1wj8ePqQ7TG5N+0VJQj8SXvCBWzd47I7EXBU65qRC0= X-Received: by 2002:a05:6000:85:b0:38a:2b34:e13e with SMTP id ffacd0b85a97d-38dc8ddefdbmr7961781f8f.18.1739202596610; 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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: L37x8ZmooWIViKLke_PUUcEAKGH5leGgWooPIYJKooY_1739202597 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250210_075002_837952_A13041D7 X-CRM114-Status: GOOD ( 18.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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]; + u64 midr_el1; u64 ctr_el0; /* Masks for VNCR-backed and general EL2 sysregs */ @@ -1469,6 +1470,8 @@ static inline u64 *__vm_id_reg(struct kvm_arch *ka, u32 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 == SYS_CTR_EL0) + if (id == SYS_CTR_EL0 || id == SYS_MIDR_EL1) return true; return (sys_reg_Op0(id) == 3 && sys_reg_Op1(id) == 0 && @@ -1999,6 +1999,22 @@ static int get_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, return 0; } +static bool skip_feature_check(u32 reg) +{ + return (reg == 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) != 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 struct sys_reg_desc *rd, return ret; } - ret = arm64_check_features(vcpu, rd, val); + if (skip_feature_check(id)) + ret = arm64_check_mask(rd, val); + else + ret = arm64_check_features(vcpu, rd, val); + if (!ret) kvm_set_vm_id_reg(vcpu->kvm, id, val); @@ -2493,6 +2513,15 @@ static bool access_mdcr(struct kvm_vcpu *vcpu, return true; } +#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) + /* * Architected system registers. @@ -2542,6 +2571,8 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_DBGVCR32_EL2), undef_access, reset_val, DBGVCR32_EL2, 0 }, + { ID_DESC(MIDR_EL1), .set_user = set_id_reg, .visibility = id_visibility, + .reset = reset_midr_el1, .val = (u32)-1 }, { SYS_DESC(SYS_MPIDR_EL1), NULL, reset_mpidr, MPIDR_EL1 }, /* @@ -4594,13 +4625,11 @@ id_to_sys_reg_desc(struct kvm_vcpu *vcpu, u64 id, return ((struct sys_reg_desc *)r)->val; \ } -FUNCTION_INVARIANT(midr_el1) FUNCTION_INVARIANT(revidr_el1) 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_MIDR_EL1), NULL, reset_midr_el1 }, { SYS_DESC(SYS_REVIDR_EL1), NULL, reset_revidr_el1 }, { SYS_DESC(SYS_AIDR_EL1), NULL, reset_aidr_el1 }, }; From patchwork Mon Feb 10 15:49:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13968107 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 38AFBC02198 for ; Mon, 10 Feb 2025 15:53:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:content-type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=k5AYcip1WpOMZ4l8MYmRKzKUrzrFcQKu9wKzGyAJc4c=; b=UbJzn4TerzTnuaLB7M5xPIGAbF ZdfxHw0TH+F95yPiLFCxB0ecaJyjrYbdPN7UPcdfL63PGCf+hQvkKGEjluO3pWOqf5Wg8dge5PzPn /HQDlj7nOirLX8kEMeKbOnvKFvyQcnAzhZzIuTSe1jyzF7EWHXbyUiAdQo8I3qycgo8Q6sLO+05KC qjh8FaBJVAQJauEqZwpmBoU/m1LZGX/Qs+ApDHfiR9rVbe6bfA7QsG1jWmDS5WSuQFGGyXYmynQ10 56XwSLJPdXgmdoEFdPRheiZ6Y2kejpWuQ9C4Xbo1DYEq9x2l7iMlC73mLfsjHINCRLAc0/ckdqfgZ V3nDUn0w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1thW6A-00000000O3d-0WPY; Mon, 10 Feb 2025 15:53:26 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1thW2r-00000000NHN-19A7 for linux-arm-kernel@lists.infradead.org; Mon, 10 Feb 2025 15:50:02 +0000 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-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k5AYcip1WpOMZ4l8MYmRKzKUrzrFcQKu9wKzGyAJc4c=; b=O3flciJ5Yr6KOeZ+eJNJzWaR2Xh9DZ0baQuZ4wvAzfp+vHL/4U9g6RADl+u4T8tjkrTVhD 24mp8Rqb3nBsTuvBY10rjIlh9hQmj3+nJRIGX+2G7cY8wG5XUorlD+BcrsFlIHiedOleVg wbaiwYSNzXkHkm94BdBDh0vi6MXvW8k= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-496-VKrsFx9wPbaw7AFe8TgD9A-1; Mon, 10 Feb 2025 10:49:59 -0500 X-MC-Unique: VKrsFx9wPbaw7AFe8TgD9A-1 X-Mimecast-MFC-AGG-ID: VKrsFx9wPbaw7AFe8TgD9A Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-43935bcec74so10379485e9.3 for ; Mon, 10 Feb 2025 07:49:58 -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=ucxMAIyZTfbJ9uW9+l3v2kKoCptMD6KgA5/MvhBqo0nnzHWzc3xgqwb54y5alittgH b+qoPzWav93KVYP5MxQITC66gRwqzhiH2OnZ5MvWo6fy5k3oRDkSKbtZTpxoJIbbfu39 iAQ8INazC5dQ6oymeBIGc+t3g1qF12W2+SwcbaI9dg5t/5KVpYTWzHCYliT/mHTfCZ// ok99r0yXeKSrYgwlx0kwDDjVn0J5pMOgVRQP3Xao8qX05jzJJbpoPxv6TwD9RSaaFHmA oLXZNWyRLvcMdlIvnfLvu9mVGTd/T3NvgwWOJcMUqXBz9kn2MXKSVQcDo1tMPbpneWDt uRCA== X-Forwarded-Encrypted: i=1; AJvYcCXfpofiL2BX1Jn5IMuIa5KEgnjHoLkR4whoZ26OIGa0cDE5fxMnUddLie5KqSndbynsOBqDoj3U7aK3Z+K2yFZ/@lists.infradead.org X-Gm-Message-State: AOJu0YyE5wxbHNhIck5zwqLKMpvn45DthzU+dvd3UfQxQet7qxAjKM8L CI6SaAIXC9hw9TW4mt0F2JztQp8qVxJledGKMRG+2Qo03hO2BvT14VsN89J1PzsxpSeppkmgJ0s lx7xxyy+a9ugUVZxrD6Agl+lQRoHipdSBp6p89cCvb564aTMzWE3SrF58qtasgFtG1Z0ZuAyc X-Gm-Gg: ASbGncviuImWK46xuzZpnJ5Nwq2OJtDXvXqgzh/YsubLTp7oN7utsg3EnnNbjU1UV7H ctao3rPwefJAQ1yO7kHA8gOKfaClPTRNtJUNjm7RxsKeoHwOHsy5+2l8VgkHvE0XJQ+pZi6Xn9Y OGrrr8DN62wjjgO2cRXyF5WvVEiN5504MjRpD0sCptiQVqBsLtJjfA/+4SOCZGZdH3XL+DdFytj bXvkIXxRUG4arkDF9ZoV0c6AwQ4sS9FLYyOjov43iJrdyBHZTy+BGaHVmQXqnMF4riSF30dpDIY Rka2grOsdEXfyW7Axk/pkEqC8whdqumNIdr+qGuO32wC5VIeF+pC/F99l/IIeLTA9Nw= X-Received: by 2002:a05:600c:cce:b0:434:f131:1e64 with SMTP id 5b1f17b1804b1-4394c815898mr2835345e9.9.1739202597840; 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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 5CkKENxzbI_cpsXAy7mtjj7D4u4YPQIsq6o3voDXU0Q_1739202598 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250210_075001_386187_AFC74005 X-CRM114-Status: GOOD ( 15.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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]; u64 midr_el1; + u64 revidr_el1; u64 ctr_el0; /* Masks for VNCR-backed and general EL2 sysregs */ @@ -1472,6 +1473,8 @@ static inline u64 *__vm_id_reg(struct kvm_arch *ka, u32 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 == SYS_CTR_EL0 || id == SYS_MIDR_EL1) + if (id == SYS_CTR_EL0 || id == SYS_MIDR_EL1 || + id == SYS_REVIDR_EL1) return true; return (sys_reg_Op0(id) == 3 && sys_reg_Op1(id) == 0 && @@ -2001,7 +2002,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); + return (reg == SYS_MIDR_EL1) || + (reg == SYS_REVIDR_EL1); } /* @@ -2521,6 +2523,7 @@ static bool access_mdcr(struct kvm_vcpu *vcpu, } FUNCTION_RESET(midr_el1) +FUNCTION_RESET(revidr_el1) /* @@ -2574,6 +2577,8 @@ static const struct sys_reg_desc sys_reg_descs[] = { { ID_DESC(MIDR_EL1), .set_user = set_id_reg, .visibility = id_visibility, .reset = reset_midr_el1, .val = (u32)-1 }, { SYS_DESC(SYS_MPIDR_EL1), NULL, reset_mpidr, MPIDR_EL1 }, + { ID_DESC(REVIDR_EL1), .set_user = set_id_reg, .visibility = id_visibility, + .reset = reset_revidr_el1, .val = -1ULL }, /* * 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; \ } -FUNCTION_INVARIANT(revidr_el1) 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_REVIDR_EL1), NULL, reset_revidr_el1 }, { SYS_DESC(SYS_AIDR_EL1), NULL, reset_aidr_el1 }, }; From patchwork Mon Feb 10 15:49:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13968117 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1DF99C02198 for ; Mon, 10 Feb 2025 15:57:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:content-type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qZ5boF1+ov+a1CrxZW4hTB/OazVKXnCvFj7KGC76W04=; b=LyygH9y1z6RqStEkv06FEUSW1G B1AJE1GXWDgDxUU9bML1fm0JkWo66zeKEhTKruyYkIE3T3lhlk4UM+QlyO3d7lcx3vOT9AvhyAk7l gPRPkW8DARy8oNXZoZMEIFzcRrPlHqhGKSefEdHBKJsxixACc1iTrwLwms2P/OSFhvO0j90FSCmQ8 XFKTTcHQlOoane8OZN0mQ1SNji/U8/w6cuHC0fnHNKi4z30NkLgyYHL3smmk0ZJhlDjP/dgTeexDt OkkwIg5lru9PLT80ACSBkBkGTK12NhQP2SdzxzXPlW+bhExk4F5YdIYyleeRRIjUGQ9Dvok3eNSbg q2w08x+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1thWAH-00000000Ot1-0VFg; Mon, 10 Feb 2025 15:57:41 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1thW2u-00000000NJ3-2IJ4 for linux-arm-kernel@lists.infradead.org; Mon, 10 Feb 2025 15:50:05 +0000 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-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qZ5boF1+ov+a1CrxZW4hTB/OazVKXnCvFj7KGC76W04=; b=gJ8h8NyibTlAD/dzAiVc6IwW0cfYg6akEKR0YFmCejo3N+cB8dBUVm+namwPAHAvRlNC58 3Xhmk2d+zQcldgv/4sS/knzPPOOv1Ja8HOgQLhZKOefJ2ggEyaMI8pWM/TLoO2uNC0XqQB 3mEasrXLXXZNuORURPb2JkAzPcUO8Zo= 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-553-pJFwmE8JORyIa8_1MrNOVg-1; Mon, 10 Feb 2025 10:50:00 -0500 X-MC-Unique: pJFwmE8JORyIa8_1MrNOVg-1 X-Mimecast-MFC-AGG-ID: pJFwmE8JORyIa8_1MrNOVg Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4393e89e910so8392915e9.0 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=ChEG+pgmT6gRCKcD0lX3s7uTAjnHomorj1Gx4+O99BJirazzUILoRx6N0LJ8gGoBEP H/97VrxlHGfwMIlnMkbddx46+kOxIu4JQlyAqppZPNL5nFq1/pQbCSECVgTmcS5PyF3s Y0JmGVtmB+Mt8eEgIae7Aexa4etl/qauc6MTjfH+vMyZCqMFOA1HnX5WMsM5hRpsuwHo W7Xv5znb9sP/ZagTN28JCANOYnWc3PnBtFsOSFUa3LKGKdKaBB/LqGd6C+oeqIjA0eEF GzP3StcmjdsRCd6OiO+AsRjlyM7xETgD31HlREDZI99DBmZRVxIQ1FR+jJRUIYfNIPut Vw6A== X-Forwarded-Encrypted: i=1; AJvYcCVj5XvBxWfWWiFiWiFLltKG4WEGx8u+7oUCMV4F9EfsM1vRJVgh1BxdZ7kU7Yl8OegMz5LxwOGi0yc+VFA4+CEm@lists.infradead.org X-Gm-Message-State: AOJu0YzNVzmKRP8XhLoHA/ixZ2ERVTyQB3gSOU/ABnKy6bt1w5TiWWai yLiHzEmIBIMRkEoRaRWETFFlzX+WUuyk7QxEEXwiVb6n+ZLQUtWajJXhXDdvyyoCexIWqNGocjk lwOo9F9NOQc7sxR5rNjnR91LunAMyFPAjrfZBbLV5tjE7q5WVUT475BW3fB9XW9NvN9qFMt7S X-Gm-Gg: ASbGnct5c+/CPwlR60lEtBc1GD6yOlO3PKbGxItsQb8cqutsHjCw8iDt8krIRG6/NLB fmO4nIHld1bXiiE3mNJbQAydeNA0odaMAPKPe46iHESOIRACemRyiX0k2KLW41+T0+lcI0j9cyx dYeo7A66mXR0wgB4nPvTfTQSL2VjnENHzXSk06BK/L8fsuB+Uk6zJVrjwN2EF5q+dheZsIjdIlI Gh+RO5KUg9YI/vRp4wiNuVMIyCbDr3WDjGBcKVXiKx8i9E6d09ueZQX/FF9qS9mx2yG15Wut4hl h39IKf+q7h3ZzdAdMUfCRsXoFaRucgrVEGAJy1oyKYRg9shISwDYDjOw8/+5qgdrkiY= X-Received: by 2002:a05:600c:3b24:b0:42a:a6d2:3270 with SMTP id 5b1f17b1804b1-439249b04c5mr95485755e9.21.1739202599133; 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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: YHtXpI7_UKZqABmHU1K3yrfmQHH7Q_BCssydvg4Yyvc_1739202599 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250210_075004_660289_D8C2F649 X-CRM114-Status: GOOD ( 21.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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++) From patchwork Mon Feb 10 15:49:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13968116 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 57AD7C02198 for ; Mon, 10 Feb 2025 15:56:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:content-type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=BLF8Cf/xB+6V3hagRkehtOvA3nhCvcxfhJ41oAzlRW8=; b=2o2NRD/KVxxTbxeE94kfVq5t8H nQtIPQYKCMHpQhZBSHxmUnw1xoGh14jlR83Qcyf6EWt5lWdkMYJSPVyAI4TZ1QXWkA6t/B9S96GD/ DhwyKyttDF9DuuEG2kbhDjuXh0pcANS08HwTs2nA+AqpN2d0ic+cTiWxkE3nbsxji7UhUVLnZX42C w3Xv7pLRaj7+KEAGNTkWeyNmpAhLa56GeFOo11wXX36O1dro000rQtFaORcAvsQZnUph7OKao/O3K dNhCP9cMWEv2Mc8MRQFfDoUrOmRgl9sgi0kA76pfDNr1SxhZhDcvQcbmdC1ONUfXu2JeVCrh9UxB3 dvAWfTDg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1thW8u-00000000OWz-1zQR; Mon, 10 Feb 2025 15:56:16 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1thW2t-00000000NIi-2LNW for linux-arm-kernel@lists.infradead.org; Mon, 10 Feb 2025 15:50:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739202602; 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=BLF8Cf/xB+6V3hagRkehtOvA3nhCvcxfhJ41oAzlRW8=; b=EJEuodLJmqHABJOlJ51CC/+WNKsk3ulb8Szasi8NvECITCkCoXfLeCANefko8O4YZuKNds tD/FfDo19yrQECSnnT4CCl4039KQKnxE3Z0+Lsnut0TOLyipQopnv5d1KlA7/QjVKcE9cn CbXfTEkCeVZOfiUuJ484lLYCK6+IopI= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-222-Dt769quzOpOcs2Y-8AyoFw-1; Mon, 10 Feb 2025 10:50:01 -0500 X-MC-Unique: Dt769quzOpOcs2Y-8AyoFw-1 X-Mimecast-MFC-AGG-ID: Dt769quzOpOcs2Y-8AyoFw Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-43935bcec0aso15331815e9.3 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=gGutUjj+91BEsYkS1xxn7TfXU5TzL4XJRtGRfIAhkGjF8I6uco+HzlbB3mX1Bq9DHl hIeiGt7AU9Pk4VBVA9gtWCwx/nF0P60TuRv86UlGPuN5KXYmv5IKrvnO1p3QdA1gycxn xexs+aJVQoT57xhYfft7z0BHd16TCvqO2VCgqf1c4mtz1qLDZ34oDNVxjT8oa8vo/jWY T6UePH1a9MaK8gBzKJ5nRTXRX1nrIvCi3K5+gmgjTtkaDYqM49ivnbk2X1zAhc6ZX+vG fxwBCA4u8JT3v0cVG2ne80lDHQTt1FiBOms8L+y6EgqnrGm1bG8oOoPbvsYFHhiZ8DE7 Oh3g== X-Forwarded-Encrypted: i=1; AJvYcCV2DQu/W/smZT5t/BzYSgwS0+CY/eX+Vjk7YSlB3aTvm3PsZpy4FehKLZE7HS687oRAjjWnm+bwbMnHYIAdO9xN@lists.infradead.org X-Gm-Message-State: AOJu0YwOm9mbWAa/B3SjZsGTeYdr55r6Z8Tla9GsAqzInoNM4bdvEmaL 9+1xkukFwM0+7f22mfN3VCPZjOEuDKCyvEnEM7b4A5nXRWust7wZg1+r+Ae4QpLqkxcWg+t7Yy+ rknYn/Mn0VEMcPD8mYN0RiNQSplvRKS1AGYBEd4IMGSEWvFDMgwi4dabjxHptIzFl5gKyOuxx X-Gm-Gg: ASbGncuAjcDsuI0KAWTjOTE0wXrD1LVuzMdUzG1QZiPhOiY46SjG/cF0IiNjdmOO8wc ehoEpvvn8eS0Ur3cbnp98t8xOkmCxZZ1rndOl+WIujRMvAP2USmYotVeIMRCD23kNR64/pdYWNS OO8ji0yNe0c3fmHQICJL3MuvzRznR1kD3jUMtHkvb4RpkMFfI9ahmZJr11zh7WPn24Sl0xxjAOs 3FbL0yQn+6ye8VLE7DGI+IwHSKHNAs0phmToUwNQxl2Er02CwPtv2Ze/M/0OBJ5UU/ucDWElatp 2vGyDACDWSz6sOI/54xd6v98i53w6zILzPwOPujfvV2Lu/MxFozkYIzazhV+h5GBh+U= X-Received: by 2002:a05:600c:3d06:b0:436:2238:97f6 with SMTP id 5b1f17b1804b1-4392f1b8e78mr67201615e9.1.1739202600499; 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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: whyJg7974VYzqS4eZ-Rfgv3uXCMjDHUksniqvbE3M9Q_1739202600 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250210_075003_665395_8071B57D X-CRM114-Status: GOOD ( 10.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 |= HCR_TID2; + if ((kvm_read_vm_id_reg(kvm, SYS_REVIDR_EL1) != read_sysreg(REVIDR_EL1)) || + (kvm_read_vm_id_reg(kvm, SYS_AIDR_EL1) != read_sysreg(AIDR_EL1))) + vcpu->arch.hcr_el2 |= HCR_TID1; + if (vcpu_el1_is_32bit(vcpu)) vcpu->arch.hcr_el2 &= ~HCR_RW;