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 }, };