From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9D0116D321 for ; Fri, 5 Apr 2024 12:01:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712318489; cv=none; b=EMrR/6qoSJKyYSOxdWsReMHIihgBnRJXfigg4ksqp+LTVjD+tvHeL1Rnl7g1x+dzukjuVvsNqmzXM1kjVzc3MUfWThOkrcGLPY8q2qkPi8dGtBNlMuUv2FUsFIgVGtGBKN5Amdpa41TVmRNp7unsOs7UPEYKXi82w4+OUELZODI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712318489; c=relaxed/simple; bh=jqn2XCZxEDbBltMtM+7J9+MGFZAyGlmvapHglxRoTiA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uB2pbA93RbkIeaLkTGVlZPcHA8fCgiDKHnEWSwmURBzbHbu1tfb9JbAwxEBaiNKU62/I/jFSE158X2pRuxXbigCw615AgVwGGmqurVcfty4m3Jzb0qTfOaGlqZgn03nf2OtLVfWXj4pkTOvMeOkISt116KkRI7fgsxlLS0eG2tU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=HsthaNJE; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HsthaNJE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712318487; 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=HsthaNJEQAsZmcRcMYhRGOIYT/H7WLuRsLsysPqLAWELtE2suN1P0MlgL2R1WSQrX8xuEu 2tQpUcCsJxxAx54AlWxknmeMK0opEXfCC9nFS/x9ZZsRtVf869N7auk8PA1G4f6bL6qMyE R3SrgK9Mn749PLnZNysG0lpMvM02FxI= 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-417-t8KZ5dKaNG2-OFXRSnfk_w-1; Fri, 05 Apr 2024 08:01:25 -0400 X-MC-Unique: t8KZ5dKaNG2-OFXRSnfk_w-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-430d9e76fe8so19205701cf.3 for ; Fri, 05 Apr 2024 05:01:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712318485; x=1712923285; 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=pRfPH5bd1a303iIFNn5PjDpzhDPJ1j5iEcp4llMccxp2VqVJyXMm+pglLRCRGXPxk5 Ii+AcZwcnc9ei++53Vk0wjDKT81b3udWmizkT7LwL/KRcj+2f1Jw+iM47o4df4MfzdFS r6J0UPRMjOc8T3qnFXfsBzHNGZVAlxJLD6o/1qxXmqyge0exASKD1JW2UsyqGy9gRPRn 6RTk3H2xPHPCEvGj+OX3OzZVOseRysgm+DGUE9ZlSzFDnuIYm54YgFOvmV6zA9qKMBTu AY/anzOMMbi6rjQ4/Nd9yko3JKftNbRqHW6meg1VsdN93a9QWO9MpOnGznQPOA3oBC2L 4hfg== X-Forwarded-Encrypted: i=1; AJvYcCWtmhbiyHPqc4lwmld17nQOLaPOSXuK9cec5O0iPsVEo1iql6V3S+awlipWRnVgeUTiTRchsPFRPbSGQf4QBsZhqzY0hd5f X-Gm-Message-State: AOJu0YyNaojcJbjmszACBofFoQUbQT8QthkUa0hb5Edgeikk6Y/9e6HB IKwuDUIcS/rg3g6en2QhgoFRpNJKHS+1EIr8pNXnP8MDqY6XvUHzn7BPXR0W+3tpcdx9U8eCtfP 49oErWPxzeZ96i4OTf8hqilKqYN0UAj8nH7VBfhqBmikNhsx5BF37DQ== X-Received: by 2002:a05:622a:40b:b0:434:3e7c:ff29 with SMTP id n11-20020a05622a040b00b004343e7cff29mr1054720qtx.8.1712318485061; Fri, 05 Apr 2024 05:01:25 -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> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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