From patchwork Tue Feb 11 14:39:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13970089 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 191F6C0219B for ; Tue, 11 Feb 2025 14:43:15 +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=dxQC5OSA8UNrYi2FsJ8qImpmh+po7bw6P6uEsaW3lFQ=; b=4QAsry1guDAXtoq74cJNUOyZLt MiagFkAs3P00VVe+wPlatBYi1rWpAU3tK4XmBblWcoaW1iHB1ig7KsqyeOVz4BdAswBVwPgrx8sgA JCwbecXaVXzLzRhj/YRKK5dV/CscrRXF6yLJCNAr0kSRXp+9zCDjAFPhX82Jbz/cO2jRQXFe1t2Kn 4hKKAD8wNcNm9FooaeUk+abvW860re0AosOgyNt8YuEGebkXkSZ68qxwAKljqJJw1y1V5Q0HE72JY kh5OMYjxMfNGPazl/Y9qSayqM1FsKXHOoXzsG2NDnN4w8TP3NmXAYog8XFkUr4FKup1I8FhpluiXA TWvQIEWw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1thrTb-00000004AKU-1zUb; Tue, 11 Feb 2025 14:43:03 +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 1thrPz-000000049Y2-3YOJ for linux-arm-kernel@lists.infradead.org; Tue, 11 Feb 2025 14:39:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739284759; 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=dxQC5OSA8UNrYi2FsJ8qImpmh+po7bw6P6uEsaW3lFQ=; b=bVvhfLt1f49pd1hMGsaMLnGmJtcRY25hYihVCNhthfNHK2DymbgcrMcRvlO3phVpz/kWWQ enXE4yc3jfDRV/grvOPV72i2GNjhGuJ/eZRbHIjqr+FlsPzU/5IJi4/UeyOZ1ZDcX7V4wL YLO5L6qXBXAaXxUwMnlfauFRvH+5ZQA= 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-44-P5u2FNiwPS6lv553iqgmUA-1; Tue, 11 Feb 2025 09:39:16 -0500 X-MC-Unique: P5u2FNiwPS6lv553iqgmUA-1 X-Mimecast-MFC-AGG-ID: P5u2FNiwPS6lv553iqgmUA_1739284754 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-43933b8d9b1so17443095e9.3 for ; Tue, 11 Feb 2025 06:39:15 -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=MtmS0Os1B6b6KECMFdh7nso+FT/jU7fIqRaO19u5mSpxTqPSc/WArC6A1GnAJjDTPY 75yEPxkeseWFEzzuCQzmUoQHIJn61CazrlVAVYyLqGmIFVzacLmIXZ2yI6jkqTO5PHE6 wydxLZBLQxhOlWWIAAEFHNE9k9dZyGnH+mR6Bkn7OuqS5IH+iyM9JfuDgvaXRdmBhI2g 4wvuN0+X/N7oeDzqDCQMffcCcgu3BSHyqQUOkb9K+LHHsFB8gaQo5Px2o4k7yegO1HQh OcRivTiPN3OxR+4zXVn5OtoUF34CYBJKgek/AOtPhlHE4d1myux8v+9clSgHa2om4ZDb wkCA== X-Forwarded-Encrypted: i=1; AJvYcCXxklAWF94LirrjtxC0Ndp/jwlkuV5Shw1cFMeRtraHeEKDsc3p7QeRwhc7CpjwfEtlsqCByvO078J3/vhTz5D/@lists.infradead.org X-Gm-Message-State: AOJu0YxmY+BXbsWRucp71lduS5DS3p2vSuXjgqmb89SpQG05tyrjn191 7xSg60XOc2077Y9VdH48flsIiAGgQCPtF5MtZcAm/mf/P1QA18AKqjwsYVpGf4IjRYKMwbg15yi u1CH5XFCMM40LYV6yiIFGc2w1UdS3dUkvRImfO+11SC+geDEmRI4N8lHBvx9u5EJKvp6p/Eny0C nQnoOZ X-Gm-Gg: ASbGncslcyCOt1DE50adN4fkcFIrlGSGyNDs7OyqRfJ0pnUAuAg/MltlKRWEC3cQAmt ggAWAXIRdVMLRDjBP+XSrPmlxPlREs5YVcp2AzttKP6wf3lmJHO65CbmPpk98eSZwiIURysvWI3 Qzk049OTbuH2hEQRtoxxnGPLuHyzIyk1sPz6I0tomlmRUkz01WExlwSgos+fZ90pUUoHhQCZB+f eYSvxRNm2609BRY6yUZLc5TIDfjszUXwy5vloEswOmjDYd9L0JcGzw0iZnd8/QQFszarCHkr0yX E5MbM9LJZ4yUeLa1gqqOnuZ+ey45lux9xj4q7RNsHDj4uVIuKxW9UNDJqF+QJjTsWJw= X-Received: by 2002:a05:600c:190c:b0:439:42c6:f11f with SMTP id 5b1f17b1804b1-43942c6f5eemr83106995e9.4.1739284753677; 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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: fzP2ghBQFvWGmqRRVhJxBlF7tUxx3DVDZdOuF3zcKW0_1739284754 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-20250211_063919_958566_E657AE35 X-CRM114-Status: GOOD ( 21.58 ) 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. 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]; + 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..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 == 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,47 @@ static int get_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, return 0; } +static int set_id_reg_non_ftr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, + u64 val) +{ + u32 id = 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 != read_id_reg(vcpu, rd)) + ret = -EBUSY; + else + ret = 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) != 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 == 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; } +#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 +2592,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_non_ftr, .visibility = id_visibility, + .reset = reset_midr_el1, .val = GENMASK_ULL(31, 0) }, { SYS_DESC(SYS_MPIDR_EL1), NULL, reset_mpidr, MPIDR_EL1 }, /* @@ -4594,13 +4646,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 Tue Feb 11 14:39:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13970088 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 6F20DC0219B for ; Tue, 11 Feb 2025 14:41:48 +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=wSVu+15UXFfSOFL1ip9ZLwAcn38zQdv9iDAl5Qkapx0=; b=W8CnEY/WoRzqG1QXdvYLAaCeVj Q1eZeWsTmV83XRy18vNDGK6Gb07hD7nijMwmEVCsuhIh/UOL2wWDEqSz4yWfBw0XHdK82OZLOFS/w Wn71kw+jX9TE2/QYtlTqG3Cs9itKQBOBjuxLFWrSFOb19aCfaJL9+aontxDeemOajNtER1oCxboPf hY8fdhrUYZy0/BGGn91bD0Fyjqmnxocngjnm71Vv8XcilJy12FXyvhHH0In7SLrRSQrGwq2FhNkzc 3SGazZYzYKpHLOQEXIe0AfVnE3MVwr+JulZKPexRcjpvBL5VGPTzD5H/xmPb5QlWkuGdxYGTn5TJb gpHx4UZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1thrSD-00000004A8R-34XN; Tue, 11 Feb 2025 14:41:37 +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 1thrPy-000000049Xj-2bgA for linux-arm-kernel@lists.infradead.org; Tue, 11 Feb 2025 14:39:19 +0000 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-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wSVu+15UXFfSOFL1ip9ZLwAcn38zQdv9iDAl5Qkapx0=; b=Mm0FYP+F5HQN7S+k3XUh7rGU7aVtGWhytFxat4uPI0+hC/svTZprYXxeIhZzhl4Exir9Js qudIfF66BJdi/3biSrkyY7z2w2WX1hVCfEujuBLtN1oR4xbx80i6pIpwblDJTM/nDTeAhX SarP8tHK8EXH7i6raE+OgZNXw0lKIe4= 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-324-G4k5490hPvm-oyy2cZ31VA-1; Tue, 11 Feb 2025 09:39:16 -0500 X-MC-Unique: G4k5490hPvm-oyy2cZ31VA-1 X-Mimecast-MFC-AGG-ID: G4k5490hPvm-oyy2cZ31VA Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-38dca55788eso2450492f8f.1 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=f1uLvq5s2dhIbjtyYByQCoHcIY7bHULFs894l0hMch5wPY7F0HfgdkumRhn3KBCLI2 octne+O8CZQTCIibvrd1cvh99iwjT3iuMKl6XCF0O25cYQ3HrACFQCK6GeVM94IjUNbo BCqKzlGN/ki7eTsGOxn2O7AW7nnPQEChKZnGfmnyhlvWi2Nmau9/YkpeP8zfl7Hd6hLM 2ojRI2arm7H+DmYn+sRppbRGMnG8ldosuwfKr6Y9yI5ASoW1prWy2EywzyF3qvAEN51S 4CUL/YhRIXerC38TPHsOVqG6Q8GRXMZyr8/htgSFBbPxDE/ZnIPb2y2D0Hr1oKeKcQcG s5Uw== X-Forwarded-Encrypted: i=1; AJvYcCXMj21jMTnNaetBxrm9X2K/eUICanPkO0NzctjAeuoXct7XjE/xnsY2WeOhj3bPq0j6BpdV8f/DDA1EYTF3AYEK@lists.infradead.org X-Gm-Message-State: AOJu0YwLx6v+krdHftzvJhTDQ07DlRMFq8FJzCSnC4g3Cs/hwOXPyVHJ 7f3wFhHrGkHmYkTG7bQyn1m3AbsqNbDnS3pcSH00m6BNH1LGM3+SNtbWNxpZvzhtdROl3ltxxS7 FWeOoeWKOHCC4pIwuqdaLV7ok/EgnhmDHZiEHuQr2WngPjqRDEecJ/0RBC/Zwuhx2Fc15aRYr X-Gm-Gg: ASbGncsmY4jUsLBAsaNazaa0Be00qiNCC//UouePuMM7pHTeR6mreo+ZJQaiivf8Uiz XixgV6QiRiIRRkRk091UdQF/sy8fB4Qwea3dn/iR4u74Bp/kFRVv6UX2CJlrXh9ORNLhOAe6PSP PzRTkkw46ErgaUYXN8hqKnOst8gzF9fuztmQ+tvZuLMonDUfiAg7XmuME3a0OM/6T+gMsQFDeH7 St1qS6/UpZK3qEvy5YKtVUvm+h9utPxthNbfNdLmfMFMshCvQZFhlS8ZNhmn2srFAGm2ctlJRdA LVgU0/UTlxPWs2bLFa2coxu0TKHIa7QOhS6r2s3/F15fiQBOJeY8sraZ6BWlSbE07E8= X-Received: by 2002:adf:ef4c:0:b0:38d:bec9:c8d with SMTP id ffacd0b85a97d-38dc936545bmr10411283f8f.53.1739284754974; 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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: bBrtP1_Gyya9toV1MTNiyxb8Q96Xd64gypK569x2exM_1739284755 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-20250211_063918_731886_62DE2589 X-CRM114-Status: GOOD ( 15.73 ) 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. 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]; 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 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 == 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 && @@ -2542,6 +2543,7 @@ static bool access_mdcr(struct kvm_vcpu *vcpu, } FUNCTION_RESET(midr_el1) +FUNCTION_RESET(revidr_el1) /* @@ -2595,6 +2597,8 @@ static const struct sys_reg_desc sys_reg_descs[] = { { ID_DESC(MIDR_EL1), .set_user = set_id_reg_non_ftr, .visibility = id_visibility, .reset = reset_midr_el1, .val = GENMASK_ULL(31, 0) }, { SYS_DESC(SYS_MPIDR_EL1), NULL, reset_mpidr, MPIDR_EL1 }, + { ID_DESC(REVIDR_EL1), .set_user = set_id_reg_non_ftr, .visibility = id_visibility, + .reset = reset_revidr_el1, .val = -1ULL }, /* * 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; \ } -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 }, }; @@ -4999,6 +5001,9 @@ 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)) + vcpu->arch.hcr_el2 |= HCR_TID1; + if (vcpu_el1_is_32bit(vcpu)) vcpu->arch.hcr_el2 &= ~HCR_RW; From patchwork Tue Feb 11 14:39:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13970090 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 57BF2C0219B for ; Tue, 11 Feb 2025 14:44:41 +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=XPf5dvcDVGeFg4rp8rzaEx8TRiTLHtjfNYmtCjoBL30=; b=ScI9/fx3BxIbNa22hs26I2aZpf 5jqok4Sc3LyqssTOSsUZ/0PnbGfmPyj/yNAKEAYulWM868MGMu8J0YSL5nuNcEB49kqneTVUHyyRM /tBhJyYllHU4y3GIMbV1DBZfgggmJPRb1lqXj5qEkypFS5V4N6Xw48acVM1AWg3MZmOQqXQ12KYfH 543icxH6VaXrMc/+stB3JhC6lzMBqdXzllHYhR5X5KE3C7GxKlGi+1Aw4oPQe+2L9/Gw784GoxcUR mG+fjBn9OMNwuZGxWmYEpcMVacnEjv4jaduiRR5e5obxCNRww26kSrCdSt0Ksnx2TzFr8b4Q1F1t2 h+ZvItrQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1thrUz-00000004Aed-0V4G; Tue, 11 Feb 2025 14:44:29 +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 1thrQ0-000000049Ya-34S5 for linux-arm-kernel@lists.infradead.org; Tue, 11 Feb 2025 14:39:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739284759; 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=XPf5dvcDVGeFg4rp8rzaEx8TRiTLHtjfNYmtCjoBL30=; b=VN5ArUzI9a0/QpTpLfI+Cw4xV42esUIhvx4RmrLSh7VdCaBUTr++5bocdmArAyQzPtluZA K0FvFxdNBpqEJtx/N1PgW1HU1T31w4G/bT1+JROZ5NzURX9Fm67lbht8dqB4AN7GJPGqly w6k0UtIh/eC/WEUEY7y3/D5y635y+9k= 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-661-laJbqrLLMGiT0AgnJ5oUdg-1; Tue, 11 Feb 2025 09:39:17 -0500 X-MC-Unique: laJbqrLLMGiT0AgnJ5oUdg-1 X-Mimecast-MFC-AGG-ID: laJbqrLLMGiT0AgnJ5oUdg Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-38dd8d11139so117176f8f.1 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=kkLTbti99ydeFQQ9vYYX6GOZvnSfEqIn+Tdf73MD/c8nCuNvYPu4gGwew2bcYWtIzl z22Wg0i7JER8WxIOB6AtmMgOXreBg5ovGHOtZFicDd1MiTDYJMxKCOSJ3yC5Vj41jkb0 391rsSIeGMnbBkEaj6lepvRh8v+4An3hWnYboXuSsNl+guE+7vE/KjZrp7b1ZcSOKy99 6cC86nDpeW+tiaa05ZSpqN7e38w95aF5L+tSpugcpisLDf4bEaepO8f85n4lLnI+aqs4 QJlLmI9+Epca+DVUG9LyfthSAv8aDThE+xs1WlGQMvC9zMMeBIVX/+VK/O6vRrp7NnII FD/w== X-Forwarded-Encrypted: i=1; AJvYcCXYc9Em1K6reZEut/s7pqntfH39bG606zyE4L19dgQ+rVMOpxGIURu/GwBtk2RFxcnoxJv2+JycLwRFHZQHz/YQ@lists.infradead.org X-Gm-Message-State: AOJu0YxImGQNu+d2YHsGOijP4G6lnadWFPffMpB8uu8U5Z4Ea7T2s4/x zbN6sVgIN81hbv7IcFs18oSbB7XTfLEVXrzOmDZza4WksRtM4u61l0DOmO+V/eNjwBCXggUnEW/ GF2FWO5kJiHSt7yspdMjtzCD5WsUTc7UdwuWzLTMe29inxJ3EFox5bBzy16vlsTBmXlnEzjkr X-Gm-Gg: ASbGnct3hFGUHu7gYMjh0A8Xk+neyRmvfWpmp9inF2zBU8CfliSrUOdpR2gb/lAvdkF +SxNTLVvQpEB3FVEytW8nMbrdCBsjuL4fhFEJ36iQxC8/+pk/1TQf2W+MMIJt6b/UM17q9/Z0zH MgDs8SywMv+eImQ9jb+N9DxreUavGMokhuT7coDFBd2Mc7xY9uOZU/wslZDZ19HX91hRvbBJ2jy d0Uk25eraPHzTPUL7yfANwHOjYz7jaCdGmi7y8tAUswA/s36/y9LvfS7CrusPtukqtnyBt9eOxf sKpcTowzOlGAIr/ocPZYXlQf3XZcxnjtR7cwU+tRTz6m6z84mn+YYmkT1ch5+NVpnMs= X-Received: by 2002:a05:6000:1548:b0:38d:d3e2:db40 with SMTP id ffacd0b85a97d-38dd3e2dc3amr7819783f8f.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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Xce9vaDhiUfrTzKDWn7PXSlhXQFWlQI8MN7g07Kv7Gg_1739284756 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-20250211_063920_844428_884F1073 X-CRM114-Status: GOOD ( 21.70 ) 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. 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 { 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 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 == 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 && @@ -2544,6 +2544,7 @@ static bool access_mdcr(struct kvm_vcpu *vcpu, FUNCTION_RESET(midr_el1) FUNCTION_RESET(revidr_el1) +FUNCTION_RESET(aidr_el1) /* @@ -2870,6 +2871,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_non_ftr, .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 | @@ -4634,61 +4637,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; @@ -4770,15 +4718,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)); } @@ -4814,15 +4757,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)); } @@ -4911,23 +4849,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; @@ -5001,7 +4929,8 @@ 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)) + 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)) @@ -5156,16 +5085,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 Tue Feb 11 14:39:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13970092 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 2C6CCC0219B for ; Tue, 11 Feb 2025 14:47:31 +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=RdghYHu234rwHRoSlAkfrkrUKfnT4YJfki186RS5/GU=; b=MnUeMIO8pPGpqn3N+q69Uo84aj 0pS7SYb8cS0YlI8rN6nx6iKKBMYmzTCt/aJS+PdRZjGV9pqc5+M/Zq9lF3P4m2Ujwg1T6iAVvh4u6 a4dHQKGwi7ovrnBIDg9Xpgu1FyZMbITY1O8FAqB1UAFQ1SdOBzSaiffYO3wd6Ehw7EkRFNpEzhGzU IgDf9yGITpj6dKChy4s1hhec/B6GC9/gcLfYoZRx62+1/F36zI5K/77Smw4zlV+4pvay+Sgy5AjuB iCTDZ/9d8BTG1Q0A/DJ5gsYmecTpkz251/lezeZ7Gr2TTRSkshM6NdnGUbyE3uNk0dvn5Pq5morXt UEpNJgOA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1thrXk-00000004B9v-1ru7; Tue, 11 Feb 2025 14:47:20 +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 1thrQ1-000000049Yi-1Jbv for linux-arm-kernel@lists.infradead.org; Tue, 11 Feb 2025 14:39:22 +0000 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-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RdghYHu234rwHRoSlAkfrkrUKfnT4YJfki186RS5/GU=; b=fCaj9jyUZN5lXpUm3DBY+R/LxdTx7XBoTw9fj7BLaYn9aJek+4Hsq2C+s4u2sNWhSbxrsg bX2RJs7atVkMbtb3u9GQXc8khxjN6KHQahnXNTShGiQbNaDhXdApeQBB0kcXMKBo15gL2J pZygIREgdrqRzNDzFVohBWyOU36V4TA= 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-455-Lq-NBZUbMT-JVuy_W5_uaw-1; Tue, 11 Feb 2025 09:39:19 -0500 X-MC-Unique: Lq-NBZUbMT-JVuy_W5_uaw-1 X-Mimecast-MFC-AGG-ID: Lq-NBZUbMT-JVuy_W5_uaw Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-38dc6aad9f8so2232503f8f.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=b/CTV1W8HDKFVXlXoO1yKaVuiS/CPZZcwCjO0Y8sqw5NhrfwtI6StNStD54Buqpxjb DN7QOomP+7U90jIRVIf+Lqv0QweX7mGbiFCCEw+BT2F71xts6OxB9NRToquTb0cGzf5u ta6DKU/6MX0gP5AYgNrzkJXFuTaHkJpO/SiJ+EQN4AF6MKiOxE9FFP6DIpjS/E52We4K GDnbzCI37UxiR2OeRV/zR+pI5vvBBhyBF17zFfMRf5Fv7JGxiJfhRlqpt46aXNUU2Yto /5BPT5ZTtSjwMyVtlEEvkcfSHECAB1VBucmFHaBK9iHG6rvOCTya/2RaNofm1Et7ixid f3Nw== X-Forwarded-Encrypted: i=1; AJvYcCWzODg1LsR+Nr36fTKCcl7CEOGynHMyErN4SK5oo/a7dTYJfvWTl80d+OQFuiG9+/Ewqi7eZ1Mf/3Xb57QarfX6@lists.infradead.org X-Gm-Message-State: AOJu0Yxzv/ptriktr9Gkz3PYTeUnB+19lTxROb9q+gy49Dwe0X71Ta37 Sex2qImTzjgUo8shy0AV+O9+MioELEAsLPhiJB+HKwn6jAHvunKbQsibkA6wdWX/i6gKWL6js+m 6efmRGVejj2cyXjUP+3pKWtwi/nvwNGnh61PjGyTT01Urzre53gl2yd3HBwQYawbbSW20w2xn X-Gm-Gg: ASbGnct2T2GqTIaurWTohOX8ryFsyYqHVwf95TT3O4Ie1bUai3G7EWQO2Jqc0SgfJxl xqDOvIldeRS7UMMictZYGN3elbNpBNtWrqyVZuHiFQIbaX3Tvhe0Q5FzcE+xHUx4Y3dI3skeTZ7 e3mb7ewDB5etry6fn/ev5GoMhgpOQTGgF5kWgpUKmtSmz9YNXezHVB2PvDgGYHlFw6Ishu7EN0/ FOfMOXMfwtFVIe8tvHk1lyyXQLHf7+1xiSeBoxSGITmUcmHPYDD94+6619B+meKUn0HxTe+ab89 ntmLA5oVOj1HUYi7B5qFsL+lutCY151zrYr5yxmCCRWKo3THtX7J6rXyuq6OYv4bamY= X-Received: by 2002:a5d:648b:0:b0:38d:e259:4d10 with SMTP id ffacd0b85a97d-38de43aa5cfmr3602451f8f.13.1739284757119; 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> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: jsPNj2hHEUu3S7SZGeLCeF58wOntt9ujEDeqk2soxWg_1739284757 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-20250211_063921_427603_1AABF99C X-CRM114-Status: GOOD ( 12.17 ) 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 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/testing/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); GUEST_DONE(); } @@ -609,18 +612,31 @@ static void test_ctr(struct kvm_vcpu *vcpu) test_reg_vals[encoding_to_range_idx(SYS_CTR_EL0)] = ctr; } -static void test_vcpu_ftr_id_regs(struct kvm_vcpu *vcpu) +static void test_id_reg(struct kvm_vcpu *vcpu, u32 id) { u64 val; + val = 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)] = val; +} + +static void test_vcpu_ftr_id_regs(struct kvm_vcpu *vcpu) +{ test_clidr(vcpu); test_ctr(vcpu); - val = 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); - test_reg_vals[encoding_to_range_idx(SYS_MPIDR_EL1)] = val; ksft_test_result_pass("%s\n", __func__); } @@ -647,6 +663,9 @@ static void test_reset_preserves_id_regs(struct kvm_vcpu *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); 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; ksft_set_plan(test_cnt); 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); test_guest_reg_read(vcpu);