From mboxrd@z Thu Jan 1 00:00:00 1970 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 1C4BAC54E5D for ; Mon, 18 Mar 2024 11:18:51 +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=iVBVKij/2+A402is/lN5N32xqwnG1pqxXx2CKhp7C0Q=; b=gnxrLxUq5NA1QV 9j/Vzx2EAM1quwKrjTTFGW3IIty/Ug6UxLY7EAfoWRADGhwqohtRJnSsWuDemiZ5GsisyxvO38Vxf zULHmBuXzZxdu0gvzSifykR88dE9bpqOLoTpqRrX7kkbq0ycjL7kGB/DnX/5wQFHVGz1rc1l2mMkh lGVMAZiI5dgluKv2I2RprTqrWFjjv29YiFJS7xQeflaM+dpFWbo7BTnQ6EqyiS1g+Kzr44uF8gHW0 Ws2/5UJITXecANTx/Lm+rv1KCZyIDbxCX8hOQzYsdIWjUJ2CC1NMid0E9ZnzrzYQiUOkYzmkm5q6L 0oRxZr+v/O2rdfjBj3Ag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rmB0o-00000008K2F-2V6u; Mon, 18 Mar 2024 11:18:38 +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 1rmB0e-00000008JxT-0RMi for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2024 11:18:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710760704; 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=UD7ULDrAK99tmI4l8cQcJ4DRDPXTMtxzhW/T9hs2ZMw=; b=UW7TLRT/Hlldo0/YwWupVJxJTSTqMMBa461yUoAfnvFpDzoa9JEY8cUJGQh1+lw6ttdUS6 ZIRBnxNmgsHfdRH7orqKlBmYXfMlpP9iL66nZidmB5Dw7XNDIrMVWenZD1UUtZzhZDzDDy +HOV8v/PdIeOAKkun5G5Lsy7lhH1XHg= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-86-DSBZAKxhMyaVEtBToUeVrw-1; Mon, 18 Mar 2024 07:16:44 -0400 X-MC-Unique: DSBZAKxhMyaVEtBToUeVrw-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-69046d68828so54087596d6.2 for ; Mon, 18 Mar 2024 04:16:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710760603; x=1711365403; 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=UD7ULDrAK99tmI4l8cQcJ4DRDPXTMtxzhW/T9hs2ZMw=; b=dJbMafv+o3Z8SY/Ks+C1xoFmlFpEJvY6TIN5Edl4cv3EZNw/12Vkg3Q9MhawKMY83s KrBWdWCqGfd7gliI1iGwQ1MSGUwS06cZgL/EHF2PI0NPIzBYytv8lOjV32XFTYIoUCo2 1Ha8AxFMtiScVgN0MucBpDftICD7KlMMkP8Y6bQgIKiE5PA37rUuJtm/NtoRSIvqwA5S EFJgUmGgEwb6AwpOACFmXFDR2bniKTobpv58CVIvSG8/oh2F7inxWwiSjex1eQd1fqtC rclFSrzz664zxwWQ/l9kdIfmGyZNvLTIoAOQCUQ5PhdGyYfKbUmkgfpsKXeFi2ZGAHH3 3BUA== X-Gm-Message-State: AOJu0YwksvPZPYoAbFmbCDDBnvh/Hp51Z3of9tGKdYTNpJJXIX+bXalL 956MntIORzjJza8immGnWuNFq1UsqdQjNwMUrm84vFoVAKwzi/3S/6XPKIy2ZN7wkNiBt5EtOmI jkqSnWtayRs/T9S2k3pleiR4qayP3VCJKDVzbls8KZhNvU4oE21DQwGN8qZDeDgNmwmw04CGV/p y3zJhS9USBDcbRLdWfaLhQeiNLRKYIlXAnAzqPRjyBjn2V4Pkk67tePQ== X-Received: by 2002:a05:622a:298a:b0:42e:f738:e75a with SMTP id hd10-20020a05622a298a00b0042ef738e75amr12977524qtb.40.1710760603290; Mon, 18 Mar 2024 04:16:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHN438zlXAv5SeORQNaCX3oNBEgnK6BOWxbhoGTES3njDQ/BsO6NfFdje8OGwZrtVxDlRlJwQ== X-Received: by 2002:a05:622a:298a:b0:42e:f738:e75a with SMTP id hd10-20020a05622a298a00b0042ef738e75amr12977510qtb.40.1710760603008; Mon, 18 Mar 2024 04:16:43 -0700 (PDT) Received: from rh.redhat.com (p200300c93f079e00cac8703672d98936.dip0.t-ipconnect.de. [2003:c9:3f07:9e00:cac8:7036:72d9:8936]) by smtp.gmail.com with ESMTPSA id ew5-20020a05622a514500b00430c8b87b46sm1832001qtb.6.2024.03.18.04.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 04:16:42 -0700 (PDT) From: Sebastian Ott To: linux-arm-kernel@lists.infradead.org Cc: Marc Zyngier , Oliver Upton Subject: [PATCH 1/4] KVM: arm64: add emulation for CTR_EL0 register Date: Mon, 18 Mar 2024 12:16:33 +0100 Message-ID: <20240318111636.10613-2-sebott@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240318111636.10613-1-sebott@redhat.com> References: <20240318111636.10613-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-20240318_041829_543995_7F7854FB X-CRM114-Status: GOOD ( 15.08 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 and maintain a per vcpu value. The only thing that is allowed to be changed compared to the host value is to switch off the DIC bit which describes Icache invalidation requirements. Signed-off-by: Sebastian Ott --- arch/arm64/kvm/sys_regs.c | 44 +++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 30253bd19917..b2019faa9d73 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1871,10 +1871,42 @@ 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 = __vcpu_sys_reg(vcpu, r->reg); return true; } +static u64 reset_ctr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd) +{ + u64 val = read_sanitised_ftr_reg(SYS_CTR_EL0); + + __vcpu_sys_reg(vcpu, rd->reg) = val; + return __vcpu_sys_reg(vcpu, rd->reg); +} + +static int get_ctr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, + u64 *val) +{ + *val = __vcpu_sys_reg(vcpu, rd->reg); + return 0; +} + +static int set_ctr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, + u64 val) +{ + u64 ctr_el0 = read_sanitised_ftr_reg(SYS_CTR_EL0); + + if (kvm_vm_has_ran_once(vcpu->kvm) && + val != __vcpu_sys_reg(vcpu, rd->reg)) + return -EBUSY; + + if (((ctr_el0 & ~CTR_EL0_DIC_MASK) != (val & ~CTR_EL0_DIC_MASK)) || + ((ctr_el0 & CTR_EL0_DIC_MASK) < (val & CTR_EL0_DIC_MASK))) + return -EINVAL; + + __vcpu_sys_reg(vcpu, rd->reg) = val; + return 0; +} + static bool access_clidr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, const struct sys_reg_desc *r) { @@ -2461,7 +2493,8 @@ 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}, { SYS_DESC(SYS_SVCR), undef_access }, { PMU_SYS_REG(PMCR_EL0), .access = access_pmcr, .reset = reset_pmcr, @@ -3578,18 +3611,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) -- 2.42.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel