From patchwork Fri Apr 5 12:01:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13619053 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 7EFB3C67861 for ; Fri, 5 Apr 2024 13:05:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id: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=3YBN9BuX948gZTG36ckdYn3jsnpJNDHWoVmOAvIYvGg=; b=cWpT5QN0/rCRTB tRgQtx+L2wv+ouSWpuWaYiri0eVKtjcHLAOVJ+s8Jz4QTl+UE1zbq2FSLOytZbKpBMqwTD3H16Vow TsD/VwQWzaQ8rI8misER6b7kklbeimHY+ZHxeDW3UqqurR0ZNdABcSpTawygAKSk47cu52bNCZMio t3I4x8qrmXZm1juiYLKaaf7VsGw+fw+UUarTxnHF79uvq11OmQ2whcJFWyemuU5ETDd9ZtQMLa3u+ fH80QrHST1INe6YB233AQpMn+DzIgTNvpgrlrVO3AlBLYJ/l6Bm86LEDxJ1sScpkQtnZFJf6GPXM4 7emG3Xj5F59qgWphRyBg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsjFY-000000077gI-0c62; Fri, 05 Apr 2024 13:04:56 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsiGB-00000006nX1-33fq for linux-arm-kernel@lists.infradead.org; Fri, 05 Apr 2024 12:01:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712318479; 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=yv0f7+ZooceAuz8ErMSH+4jWIomyiUMNQo0xCMMDiy0=; b=D0dexOdKBC6jWCiRy8El20lKC0hvUVEPKHGa3YlskKLyFLm394fi0LVay/1Cl+TxOlJy6Q NiHPvXg8d8/VLoGLt2B3osg2lT+4+fP0Xb4ISMjCRmUx12AzsktpgPuV4mIL9KJFn0vNOv sFuzrQbj+kiwq343fVA0eG68+ren2pY= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-456-2RIkpDKoOtOnw_FRWnGzfg-1; Fri, 05 Apr 2024 08:01:18 -0400 X-MC-Unique: 2RIkpDKoOtOnw_FRWnGzfg-1 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-432f160f5d9so18838121cf.0 for ; Fri, 05 Apr 2024 05:01:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712318477; x=1712923277; 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=yv0f7+ZooceAuz8ErMSH+4jWIomyiUMNQo0xCMMDiy0=; b=aWD+U1AuiOs6Ztfizg1WONbDQ1CdLJsNG7dknmz0RQHGCnHvhRIWRsByES8yvR8Z5U N58lHF3NW+c1BrismYucGDgHN5m8zHk3FgZPTsB5LgljkuDk1vTntfmdLcbaZ+bcqi61 MygP1sE40CEVpYUAwZtsqpk7wkMJHIqtkZg7HdTwRXWxdqLFqiKth4NxSYT4XBtGZ072 kxYJjL6XPznHPdGWU+9UBJ950JRIZ7TMzdaoKequJsZGtxjMv/zrojs0taNnJfUylTca dlTUN3sc7d0kXpVqKGGmGNz2KWRHrmPH3d3TdEC2khJ3I1XEShz27QJUJ3vSvz+wbTIY BkvQ== X-Gm-Message-State: AOJu0YzishUW7eJIsRdkGcejMtXcdrWNnpAaVsp2Xkp72/jEjiHxxEp1 sfnOigBKMcs432JQvxjri7FupJCLu/hb8Ymyft8mAhm0i+yRdytDsCGQ26DnxPUkO5ELFbh9D7o 6s4jOeGdIgix5iPRLwK7sSvWsZ5MPgoXJik/ALCs5jAf7jGLakXQKH0K1hZNxnTjpXGbQhBNGcM f+40Zy+x7Bs+q19KBczQv5Znc37WDuL6/35QE4gR28tHtUZ0NEXIxsfw== X-Received: by 2002:ac8:5886:0:b0:434:516a:5486 with SMTP id t6-20020ac85886000000b00434516a5486mr976115qta.21.1712318477287; Fri, 05 Apr 2024 05:01:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFhQuEwy17Cph2Q2g7cvwJ6s/aiHUU0/VZ7nyNR44guIaL32ndi6+BiWQVeBBtgC3cEN4G/SQ== X-Received: by 2002:ac8:5886:0:b0:434:516a:5486 with SMTP id t6-20020ac85886000000b00434516a5486mr976080qta.21.1712318476646; Fri, 05 Apr 2024 05:01:16 -0700 (PDT) Received: from rh.redhat.com (p200300c93f4c24001316a1e598258370.dip0.t-ipconnect.de. [2003:c9:3f4c:2400:1316:a1e5:9825:8370]) by smtp.gmail.com with ESMTPSA id fb17-20020a05622a481100b00434383f2518sm679808qtb.87.2024.04.05.05.01.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Apr 2024 05:01:16 -0700 (PDT) From: Sebastian Ott To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Catalin Marinas , Will Deacon Subject: [PATCH 1/4] KVM: arm64: change return value in arm64_check_features() Date: Fri, 5 Apr 2024 14:01:05 +0200 Message-ID: <20240405120108.11844-2-sebott@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240405120108.11844-1-sebott@redhat.com> References: <20240405120108.11844-1-sebott@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240405_050132_370189_029D6DE3 X-CRM114-Status: GOOD ( 16.44 ) 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 arm64_check_features() returns -E2BIG to indicate the register's feature set is a superset of the maximally-allowed register value. The only caller of that function changes this to -EINVAL since that's what userspace expects for invalid register writes. In preparation of adding another caller for arm64_check_features() that would need to do the same conversion just return -EINVAL directly. Signed-off-by: Sebastian Ott --- arch/arm64/kvm/sys_regs.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index c9f4f387155f..131f5b0ca2b9 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1445,7 +1445,7 @@ static s64 kvm_arm64_ftr_safe_value(u32 id, const struct arm64_ftr_bits *ftrp, * considered the safe value regardless For register fields that are not in * writable, only the value in limit is considered the safe value. * - * Return: 0 if all the fields are safe. Otherwise, return negative errno. + * Return: 0 if all the fields are safe. Otherwise, return -EINVAL. */ static int arm64_check_features(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, @@ -1464,7 +1464,7 @@ static int arm64_check_features(struct kvm_vcpu *vcpu, * only safe value is 0. */ if (sysreg_visible_as_raz(vcpu, rd)) - return val ? -E2BIG : 0; + return val ? -EINVAL : 0; ftr_reg = get_arm64_ftr_reg(id); if (!ftr_reg) @@ -1490,12 +1490,12 @@ static int arm64_check_features(struct kvm_vcpu *vcpu, safe_val = kvm_arm64_ftr_safe_value(id, ftrp, f_val, f_lim); if (safe_val != f_val) - return -E2BIG; + return -EINVAL; } /* For fields that are not writable, values in limit are the safe values. */ if ((val & ~mask) != (limit & ~mask)) - return -E2BIG; + return -EINVAL; return 0; } @@ -1840,16 +1840,6 @@ static int set_id_reg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, IDREG(vcpu->kvm, id) = val; mutex_unlock(&vcpu->kvm->arch.config_lock); - - /* - * arm64_check_features() returns -E2BIG to indicate the register's - * feature set is a superset of the maximally-allowed register value. - * While it would be nice to precisely describe this to userspace, the - * existing UAPI for KVM_SET_ONE_REG has it that invalid register - * writes return -EINVAL. - */ - if (ret == -E2BIG) - ret = -EINVAL; return ret; } From patchwork Fri Apr 5 12:01:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13618965 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 25640CD11C2 for ; Fri, 5 Apr 2024 12:03:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id: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=Vw9qwA+CSQAOKy51gJy6K4WfDgh4BWKnJPvHIvOe/ks=; b=cNA2vLTFkcMagF 36eJKU/vbY3SZ9/Hd+TaQmhj+8LQ+dCIjzk4P7+1RpwB0QS+L9w1BZvQYqHQtzaOOQUbJKeHZDIpL uihY/VQo/UJd1D7CgEQomNYCeXscwO/BSBzd+uc3CAwtfoujp9NyobD76MHVMrXSuk+/vcIE+bTi5 2xXIf17/6QY2gm0QWn47l2/7pxAlalEXq/m+t4XgKvEmSzTR2STOO8OVuITsiZ16FQ8Jb/J586ktU trCiGO4ipHpBqrHrQXYb5F2rVSANqpraEgPp7KG1YrxTWItBv/SadEp0gbYybkFOXFA4XbXvpqL7M 2esySi1hydqrFPqDJCiQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsiHh-00000006o6u-1Bia; Fri, 05 Apr 2024 12:03:05 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsiHe-00000006o5d-0XRZ for linux-arm-kernel@lists.infradead.org; Fri, 05 Apr 2024 12:03:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712318581; 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=rsSFcUbsThM5IkqFm5UZmPp81ZNMKoAIhMlsT6uF7yg=; b=CJL2A4WSyyT5c/jQJ6KHasiEK/5eyOFqPPYzCKs305RIZsCu/v0xktNPgKT1AS16DmZRoJ yBvocAQB9NmngNFR7VEipidixh7fvZ8eMb56nM0k3RUGGeVkFEXGImFy5J0pPgpGudT65n N+3DrEqUPwUY3K2kWvqodcyr+9x9Mcc= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-34-P_IDlGY8NAulByTc7edwPQ-1; Fri, 05 Apr 2024 08:01:22 -0400 X-MC-Unique: P_IDlGY8NAulByTc7edwPQ-1 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-430ac211fbbso21535681cf.1 for ; Fri, 05 Apr 2024 05:01:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712318482; x=1712923282; 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=rsSFcUbsThM5IkqFm5UZmPp81ZNMKoAIhMlsT6uF7yg=; b=RAN3IBLcMC82orXdBowIJ8Fvkywomc1xuQyAgK5USvQ6wYulWW0Zy61WnWdvZvavEX +DSQrRacelyIJw5/LYQMhxeNa4FK/qKwCpzTmDgC7lIZEJdJfAZMepQWvFPx3HUwxon4 xf6/X0amgGnKSHDGQjKOARhc0QOUfHDiMWwh3ycmfGh+SkjsM5HeFzzSvACvygOZzw3a 3bUskQizd+S5BmFQI7QFc67w/eaFly8s7horIJkBM3kbG56k9THnccAGiipTly2S22Q8 Ii/jzd7Zt5NrYL/Eu/kcI3mWTo7cTw6xtnBEsHZLniNBsB6VtXZdl4oL2KuYXLaaa3A4 XH+Q== X-Gm-Message-State: AOJu0YwrMb6eHKKdffdkPZmGIKwjb8jLhRIZ33OzVdTrB8dkkgaoBkHs R0xQWWi8hfRytMnI+QwOUnIZCqo3oogeEOwlLjKO+3tKz37WZGM9kXr+Wnnw193QLxiEtNizmyy mdvAtHnJrHG2rej9d69zcItjPW4IOc0CPm1M66sYsLxezKP5ktnIJugIR0Vm5r1eAyys74MSIo+ 214lPOYXXHvakqeYIw/ZCNwIgvbvDUTor8X+gWZcx6QXAuEW5X/Shnog== X-Received: by 2002:a05:622a:298f:b0:434:6094:beaa with SMTP id hd15-20020a05622a298f00b004346094beaamr1267274qtb.39.1712318480615; Fri, 05 Apr 2024 05:01:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFnpiinNv2C2T+YikhgYDSg8DJI+6kCRzyHodV6nkO8b80TJOicClVWNFFNXPLtsSMcu3AVIQ== X-Received: by 2002:a05:622a:298f:b0:434:6094:beaa with SMTP id hd15-20020a05622a298f00b004346094beaamr1267234qtb.39.1712318480054; Fri, 05 Apr 2024 05:01:20 -0700 (PDT) Received: from rh.redhat.com (p200300c93f4c24001316a1e598258370.dip0.t-ipconnect.de. [2003:c9:3f4c:2400:1316:a1e5:9825:8370]) by smtp.gmail.com with ESMTPSA id fb17-20020a05622a481100b00434383f2518sm679808qtb.87.2024.04.05.05.01.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Apr 2024 05:01:19 -0700 (PDT) From: Sebastian Ott To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Catalin Marinas , Will Deacon Subject: [PATCH 2/4] KVM: arm64: maintain per VM value for CTR_EL0 Date: Fri, 5 Apr 2024 14:01:06 +0200 Message-ID: <20240405120108.11844-3-sebott@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240405120108.11844-1-sebott@redhat.com> References: <20240405120108.11844-1-sebott@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240405_050302_256916_0203ECB3 X-CRM114-Status: GOOD ( 16.07 ) 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 In preparation for CTR_EL0 emulation maintain a per VM for this register and use it where appropriate. Signed-off-by: Sebastian Ott --- arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/sys_regs.c | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 9e8a496fb284..481216febb46 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -318,6 +318,7 @@ struct kvm_arch { /* PMCR_EL0.N value for the guest */ u8 pmcr_n; + u64 ctr_el0; /* Iterator for idreg debugfs */ u8 idreg_debugfs_iter; diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 131f5b0ca2b9..4d29b1a0842d 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -215,13 +215,21 @@ void vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val, int reg) /* CSSELR values; used to index KVM_REG_ARM_DEMUX_ID_CCSIDR */ #define CSSELR_MAX 14 +static u64 kvm_get_ctr_el0(struct kvm *kvm) +{ + if (kvm->arch.ctr_el0) + return kvm->arch.ctr_el0; + + return read_sanitised_ftr_reg(SYS_CTR_EL0); +} + /* * Returns the minimum line size for the selected cache, expressed as * Log2(bytes). */ -static u8 get_min_cache_line_size(bool icache) +static u8 get_min_cache_line_size(struct kvm *kvm, bool icache) { - u64 ctr = read_sanitised_ftr_reg(SYS_CTR_EL0); + u64 ctr = kvm_get_ctr_el0(kvm); u8 field; if (icache) @@ -248,7 +256,7 @@ static u32 get_ccsidr(struct kvm_vcpu *vcpu, u32 csselr) if (vcpu->arch.ccsidr) return vcpu->arch.ccsidr[csselr]; - line_size = get_min_cache_line_size(csselr & CSSELR_EL1_InD); + line_size = get_min_cache_line_size(vcpu->kvm, csselr & CSSELR_EL1_InD); /* * Fabricate a CCSIDR value as the overriding value does not exist. @@ -283,7 +291,7 @@ static int set_ccsidr(struct kvm_vcpu *vcpu, u32 csselr, u32 val) u32 i; if ((val & CCSIDR_EL1_RES0) || - line_size < get_min_cache_line_size(csselr & CSSELR_EL1_InD)) + line_size < get_min_cache_line_size(vcpu->kvm, csselr & CSSELR_EL1_InD)) return -EINVAL; if (!ccsidr) { @@ -1862,7 +1870,7 @@ static bool access_ctr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, if (p->is_write) return write_to_read_only(vcpu, p, r); - p->regval = read_sanitised_ftr_reg(SYS_CTR_EL0); + p->regval = kvm_get_ctr_el0(vcpu->kvm); return true; } @@ -1882,7 +1890,7 @@ static bool access_clidr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, */ static u64 reset_clidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r) { - u64 ctr_el0 = read_sanitised_ftr_reg(SYS_CTR_EL0); + u64 ctr_el0 = kvm_get_ctr_el0(vcpu->kvm); u64 clidr; u8 loc; @@ -1935,7 +1943,7 @@ static u64 reset_clidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r) static int set_clidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, u64 val) { - u64 ctr_el0 = read_sanitised_ftr_reg(SYS_CTR_EL0); + u64 ctr_el0 = kvm_get_ctr_el0(vcpu->kvm); u64 idc = !CLIDR_LOC(val) || (!CLIDR_LOUIS(val) && !CLIDR_LOUU(val)); if ((val & CLIDR_EL1_RES0) || (!(ctr_el0 & CTR_EL0_IDC) && idc)) From patchwork Fri Apr 5 12:01:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13618967 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 E115DC67861 for ; Fri, 5 Apr 2024 12:03:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id: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=GF3Usric+R+E+DbRL9oOsmlvsuR/DRRFBRlIF36VHU4=; b=mR4MzxMH/siGMU D+KhzHaAg1suuy5hDcNAqRWIw3RRvazRzdYjogS1BdT9sfEZtaqt+eB6xqfGeqQtkecge3pOHm+uM KT0z4uZUoBSJz64VMMXepqTA8KgXftZzvBkwg+qDK7ehcEHmnAC9mPY/MrBRGWcNE5AbEtOw+4czY 3OYlUbfodqkwJ8zk92p3Q9Z+tlI6QujEFxr6t5wZKSg8BPmCmGO7mEIaA0Z8LY4fhDwJsVFp2q9AI OYBsjFn3xD/2kPl/wkZEoSLal7X9ALvYeuwpeAjpjQMkqRalDaBm+ebM+4ZxaUGW44i43ApQztUD+ pwV/10ooE1Hmfo4bvAFQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsiHq-00000006oAq-39MW; Fri, 05 Apr 2024 12:03:14 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsiHp-00000006o9m-1Cv1 for linux-arm-kernel@bombadil.infradead.org; Fri, 05 Apr 2024 12:03:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=Er4m6dF4CTJ/JTa0OQR3uPXdnB5OQd8nc24oiwvaXBk=; b=Ca+iuQ7/iZROErH4EZND0MXYFm Q1DpeIvI0WmWXijpw95ysFrCdj1Mqla7wRFE1f0QP7xp1nXupQ5NWpeFS3gsC5IZWMCh0PU97ik6G qO+ueYhJ9gYyH6gzX5s7YDm3j26euuZXfO65O9+UyvKgLv8orO2D3pH0bEin6lkrd8TbJtRv7F1Uu GoAAG+P23Vlr3rxZII2ySZQw06fcCZJ0nVZiBYX5kZrA6uwACy+rnMfR9e7SlI2Yq3ocUM7oGd6XB dImd84dtCIHCysGqyxsDEulllS2GapAQeVDKEeA+31OEf9Nmey8EZgFBUA8oIGyk62w5RFLe/ucJ3 jl72FjTQ==; Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsiHf-00000005aWt-1Qcb for linux-arm-kernel@lists.infradead.org; Fri, 05 Apr 2024 12:03:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712318580; 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=Er4m6dF4CTJ/JTa0OQR3uPXdnB5OQd8nc24oiwvaXBk=; b=dWJRKHOnGnZGfFVU7DV/wvfv7Wk+gVJadRQq5gvV33xQ/0mByM+L46yD5sPQ5Y0WYI7v7q QQ+5qLL8JrBRPjc1vOA8cTCx0JH6N8a22gqn87sc7p5Z8GGM6k08WeEmI9NetPDkJrEWRS TnZL2xuoAFp2fUBrs4qsks+rIWSeWHM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712318580; 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=Er4m6dF4CTJ/JTa0OQR3uPXdnB5OQd8nc24oiwvaXBk=; b=dWJRKHOnGnZGfFVU7DV/wvfv7Wk+gVJadRQq5gvV33xQ/0mByM+L46yD5sPQ5Y0WYI7v7q QQ+5qLL8JrBRPjc1vOA8cTCx0JH6N8a22gqn87sc7p5Z8GGM6k08WeEmI9NetPDkJrEWRS TnZL2xuoAFp2fUBrs4qsks+rIWSeWHM= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-124-6z_vSD2XNW-MTQLauSZIUg-1; Fri, 05 Apr 2024 08:01:29 -0400 X-MC-Unique: 6z_vSD2XNW-MTQLauSZIUg-1 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-4311b01a1ecso21591851cf.2 for ; Fri, 05 Apr 2024 05:01:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712318488; x=1712923288; 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=Er4m6dF4CTJ/JTa0OQR3uPXdnB5OQd8nc24oiwvaXBk=; b=lgcAi6i0zbmfURbdn8Q4oGd5CJ2/8w1t0BFTMQUZGJ5rKbZZoQnvuTJrG5zjKKwSvN Twal0wRRwLHyhTYfNWynyiZUVCNvBWhVsv/aU1KwMcYOQkVn7b7Sudrp/pqsynTCDyKf ieTE5QCGLC86WPBM1iTGs8ACj1B6cYLFWQxtOPsEoEiPgXRpZQ65QzJGZB7i9KHmcmz9 nxGSdb5NPgiLvQ645FIxzW9Ta0vi5IUPp5ya1QVxbXtZfDymqtmuOCpHExcnd4B22Z3B yxnowu9yU9g0FuH4L5OItChalFQMoKATSa2kthHT8lqhrdzTjePD88Hy8HiX7meVl5tt 72Sw== X-Gm-Message-State: AOJu0YxLTrGuLZiBfGb3Z8gigG82ZUgZ4FyGEIE3Z5H3CALKERaYXmLN XOuIwf+JwzgV0U/qIirtKnb245pIDfgwsDy3gs9TEYcbjHaLHrMDtLhwiphgVp8/vLUOGQLilJ3 wFkowh27DijRosKAeGV9X7vIjV43IllXY8M/4wBWFjADWpco6DTQHL4IKZf2JWyjhy+vIHbmYuP Wmu6RxCc14mjGCt/hQ4fFGiun7UuxQSfo8QMy2MrfMvFjdFim4QgxLKg== X-Received: by 2002:a05:622a:40b:b0:434:3e7c:ff29 with SMTP id n11-20020a05622a040b00b004343e7cff29mr1054897qtx.8.1712318488559; Fri, 05 Apr 2024 05:01:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFiyCyRJp19IZ/hMqBIxQeEde5V/OMaJJ5oWTE9Op1Wu8z9M5yrM5kFTCU5Bk+wY8/8Aog8fg== X-Received: by 2002:a05:622a:40b:b0:434:3e7c:ff29 with SMTP id n11-20020a05622a040b00b004343e7cff29mr1054631qtx.8.1712318483158; Fri, 05 Apr 2024 05:01:23 -0700 (PDT) Received: from rh.redhat.com (p200300c93f4c24001316a1e598258370.dip0.t-ipconnect.de. [2003:c9:3f4c:2400:1316:a1e5:9825:8370]) by smtp.gmail.com with ESMTPSA id fb17-20020a05622a481100b00434383f2518sm679808qtb.87.2024.04.05.05.01.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Apr 2024 05:01:22 -0700 (PDT) From: Sebastian Ott To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Catalin Marinas , Will Deacon Subject: [PATCH 3/4] KVM: arm64: add emulation for CTR_EL0 register Date: Fri, 5 Apr 2024 14:01:07 +0200 Message-ID: <20240405120108.11844-4-sebott@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240405120108.11844-1-sebott@redhat.com> References: <20240405120108.11844-1-sebott@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240405_130303_637962_776D15DE X-CRM114-Status: GOOD ( 17.18 ) 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 CTR_EL0 is currently handled as an invariant register, thus guests will be presented with the host value of that register. Add emulation for CTR_EL0 based on a per VM value. When CTR_EL0 is changed the reset function for CLIDR_EL1 is called to make sure we present the guest with consistent register values. Signed-off-by: Sebastian Ott --- arch/arm64/kvm/sys_regs.c | 72 ++++++++++++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 8 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 4d29b1a0842d..b0ba292259f9 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1874,6 +1874,55 @@ static bool access_ctr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, return true; } +static u64 reset_ctr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd) +{ + vcpu->kvm->arch.ctr_el0 = 0; + return kvm_get_ctr_el0(vcpu->kvm); +} + +static int get_ctr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, + u64 *val) +{ + *val = kvm_get_ctr_el0(vcpu->kvm); + return 0; +} + +static const struct sys_reg_desc *get_sys_reg_desc(u32 encoding); + +static int set_ctr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, + u64 val) +{ + u64 host_val = read_sanitised_ftr_reg(SYS_CTR_EL0); + u64 old_val = kvm_get_ctr_el0(vcpu->kvm); + const struct sys_reg_desc *clidr_el1; + int ret; + + if (val == old_val) + return 0; + + if (kvm_vm_has_ran_once(vcpu->kvm)) + return -EBUSY; + + mutex_lock(&vcpu->kvm->arch.config_lock); + ret = arm64_check_features(vcpu, rd, val); + if (ret) { + mutex_unlock(&vcpu->kvm->arch.config_lock); + return ret; + } + if (val != host_val) + vcpu->kvm->arch.ctr_el0 = val; + else + vcpu->kvm->arch.ctr_el0 = 0; + + mutex_unlock(&vcpu->kvm->arch.config_lock); + + clidr_el1 = get_sys_reg_desc(SYS_CLIDR_EL1); + if (clidr_el1) + clidr_el1->reset(vcpu, clidr_el1); + + return 0; +} + static bool access_clidr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, const struct sys_reg_desc *r) { @@ -2460,7 +2509,11 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_CCSIDR2_EL1), undef_access }, { SYS_DESC(SYS_SMIDR_EL1), undef_access }, { SYS_DESC(SYS_CSSELR_EL1), access_csselr, reset_unknown, CSSELR_EL1 }, - { SYS_DESC(SYS_CTR_EL0), access_ctr }, + { SYS_DESC(SYS_CTR_EL0), access_ctr, .reset = reset_ctr, + .get_user = get_ctr, .set_user = set_ctr, .val = (CTR_EL0_DIC_MASK | + CTR_EL0_IDC_MASK | + CTR_EL0_DminLine_MASK | + CTR_EL0_IminLine_MASK)}, { SYS_DESC(SYS_SVCR), undef_access }, { PMU_SYS_REG(PMCR_EL0), .access = access_pmcr, .reset = reset_pmcr, @@ -3623,6 +3676,13 @@ static bool index_to_params(u64 id, struct sys_reg_params *params) } } +static const struct sys_reg_desc *get_sys_reg_desc(u32 encoding) +{ + struct sys_reg_params params = encoding_to_params(encoding); + + return find_reg(¶ms, sys_reg_descs, ARRAY_SIZE(sys_reg_descs)); +} + const struct sys_reg_desc *get_reg_by_id(u64 id, const struct sys_reg_desc table[], unsigned int num) @@ -3676,18 +3736,11 @@ FUNCTION_INVARIANT(midr_el1) FUNCTION_INVARIANT(revidr_el1) FUNCTION_INVARIANT(aidr_el1) -static u64 get_ctr_el0(struct kvm_vcpu *v, const struct sys_reg_desc *r) -{ - ((struct sys_reg_desc *)r)->val = read_sanitised_ftr_reg(SYS_CTR_EL0); - return ((struct sys_reg_desc *)r)->val; -} - /* ->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, get_midr_el1 }, { SYS_DESC(SYS_REVIDR_EL1), NULL, get_revidr_el1 }, { SYS_DESC(SYS_AIDR_EL1), NULL, get_aidr_el1 }, - { SYS_DESC(SYS_CTR_EL0), NULL, get_ctr_el0 }, }; static int get_invariant_sys_reg(u64 id, u64 __user *uaddr) @@ -4049,6 +4102,9 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu) vcpu->arch.hcrx_el2 |= (HCRX_EL2_MSCEn | HCRX_EL2_MCE2); } + if (vcpu->kvm->arch.ctr_el0) + vcpu->arch.hcr_el2 |= HCR_TID2; + if (test_bit(KVM_ARCH_FLAG_FGU_INITIALIZED, &kvm->arch.flags)) goto out; From patchwork Fri Apr 5 12:01:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13618966 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 8F6DECD11C2 for ; Fri, 5 Apr 2024 12:03:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id: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=YO4liLqtTaQ8Okt2NHNt0B48NQfjKh3oSNuOmigvnZs=; b=uDxNq3FnWSfg6i w1TIlPkr7PJXj86fpdr9NVHyoaZ/G61L/lomVL0/KM1Ecc0/5+ar5hetSGSyGYsSIlBZTeD1Vd9Aq aha9Ksz0WjVAfAilWjAyEKdYqBNSrgtsQfZfyfVPYVdqpILAwPIyx8Fb8E0iS66QUQGUN2qddPGSY ZQ3LV/vgr8yMebUsxfrut83uNy96XREyMT16khlg3BuPmQWjWNcnRVdDYNE3SwhC0bkFGB3lOPz0o C7F88sRY7TTbwppNFvcWxk0qw5lhlZBB094c2WbinM1P1epYCKgF+MvIb4L5aVmqiITJjxP1ijp+g 4JyTLiwCzvD67iocmIVw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsiHk-00000006o82-0H7l; Fri, 05 Apr 2024 12:03:08 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsiHf-00000006o69-0yU5 for linux-arm-kernel@lists.infradead.org; Fri, 05 Apr 2024 12:03:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712318582; 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=rn4BMv+SOP2Xe0y3A99nPyLC4GfuU+9ShaoCAlDA424=; b=iLjaFwBnSqnxaAnNQ7Laq+ugdRnlN/7cWJjZeXtrcjqSuyMvtCB6vJpcU7kFqR/NIn5CfM /X581PV6XSJTp9EW97G2reJIzHg3/1RpOy281Atsvev85i0L5dDynUOjObbqbrwdosxO0e aOVqK5T9PdaooNFp+jsctBp0bIrEgGE= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-611-C0rAdxBsO9esW2T4uYYGGg-1; Fri, 05 Apr 2024 08:01:28 -0400 X-MC-Unique: C0rAdxBsO9esW2T4uYYGGg-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-430d9e76fe8so19205871cf.3 for ; Fri, 05 Apr 2024 05:01:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712318487; x=1712923287; 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=rn4BMv+SOP2Xe0y3A99nPyLC4GfuU+9ShaoCAlDA424=; b=bL7SBUcQ3p1xzaaZKCQC9aCWeJpn3d8R8lM8OkkJ/o4cj7aXaYoVlkXfPKPTxGwMLl k1qstsmZvMdERgbqgccERzP/YhBi2Wevw8jkW7Ptc10XgBWIyTDzfINLPzqCXkVQqcgg 9Y7aucKnKqDt7MevVRyaDIwBW/LyGBf9NCQ71z0ogFMCMdQxDqjWnNunoocqObvmSgFv UiyuuxRilyNGph9iVpOEkwfewGILtcKaYCfuXi2UG/l+iTV7mQVX6uOPcowxuli+F2hr lLDAtpevWmMKFx/U3i5t86FVM/teR7ju/g9bJsLoYkUjSmhDKOcab44dIVQTBNlHIOpT FJfg== X-Gm-Message-State: AOJu0YzN4hrKNokoITCTX+BOeyzSiROLt41Szmv7Rl6n6a59i6WezRWl AyrCb8+wabYJ6QwPTTB/oCNeFRaNn+uTPMFq52AF+9RWBSzENp2iKNG+stiJtGumC+oKSgijvZx ldor3Qc/Ot5TEgdd8I8MevFRFBTwTAH8V6u79tk5E9DSf7GM2/7lPRRcNrI/98HtVudO1I62Xot LMcytSCV/aRr/46qy7X5oZS24T6LD8evbehaE8ZCQ4mApGXDqyVPqK9Q== X-Received: by 2002:ac8:7d0a:0:b0:431:5fad:ddbd with SMTP id g10-20020ac87d0a000000b004315fadddbdmr1508868qtb.29.1712318486675; Fri, 05 Apr 2024 05:01:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFJoGGlIt1CxA4rAZezuA7q+tZShCN/ywwM2H1k89TmnzVpNOpAzo4NVsKSoiRJE7N6sIm0dg== X-Received: by 2002:ac8:7d0a:0:b0:431:5fad:ddbd with SMTP id g10-20020ac87d0a000000b004315fadddbdmr1508823qtb.29.1712318486257; Fri, 05 Apr 2024 05:01:26 -0700 (PDT) Received: from rh.redhat.com (p200300c93f4c24001316a1e598258370.dip0.t-ipconnect.de. [2003:c9:3f4c:2400:1316:a1e5:9825:8370]) by smtp.gmail.com with ESMTPSA id fb17-20020a05622a481100b00434383f2518sm679808qtb.87.2024.04.05.05.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Apr 2024 05:01:25 -0700 (PDT) From: Sebastian Ott To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Catalin Marinas , Will Deacon Subject: [PATCH 4/4] KVM: arm64: show writable masks for feature registers Date: Fri, 5 Apr 2024 14:01:08 +0200 Message-ID: <20240405120108.11844-5-sebott@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240405120108.11844-1-sebott@redhat.com> References: <20240405120108.11844-1-sebott@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240405_050303_628126_9BC2C5FF X-CRM114-Status: GOOD ( 14.89 ) 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 Instead of using ~0UL provide the actual writable mask for non-id feature registers in the output of the KVM_ARM_GET_REG_WRITABLE_MASKS ioctl. Explicitely set the mask for CLIDR_EL1 to make sure we present the same value to userspace than before. This changes the mask for the CTR_EL0 register in the output of the KVM_ARM_GET_REG_WRITABLE_MASKS ioctl. Signed-off-by: Sebastian Ott --- arch/arm64/kvm/sys_regs.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index b0ba292259f9..947aa9c0784f 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -2505,7 +2505,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_CCSIDR_EL1), access_ccsidr }, { SYS_DESC(SYS_CLIDR_EL1), access_clidr, reset_clidr, CLIDR_EL1, - .set_user = set_clidr }, + .set_user = set_clidr, .val = ~0UL }, { SYS_DESC(SYS_CCSIDR2_EL1), undef_access }, { SYS_DESC(SYS_SMIDR_EL1), undef_access }, { SYS_DESC(SYS_CSSELR_EL1), access_csselr, reset_unknown, CSSELR_EL1 }, @@ -4059,20 +4059,11 @@ int kvm_vm_ioctl_get_reg_writable_masks(struct kvm *kvm, struct reg_mask_range * if (!is_feature_id_reg(encoding) || !reg->set_user) continue; - /* - * For ID registers, we return the writable mask. Other feature - * registers return a full 64bit mask. That's not necessary - * compliant with a given revision of the architecture, but the - * RES0/RES1 definitions allow us to do that. - */ - if (is_id_reg(encoding)) { - if (!reg->val || - (is_aa32_id_reg(encoding) && !kvm_supports_32bit_el0())) - continue; - val = reg->val; - } else { - val = ~0UL; + if (!reg->val || + (is_aa32_id_reg(encoding) && !kvm_supports_32bit_el0())) { + continue; } + val = reg->val; if (put_user(val, (masks + KVM_ARM_FEATURE_ID_RANGE_INDEX(encoding)))) return -EFAULT;