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 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: , 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 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; -- 2.42.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel