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 BCAD8CE79AB for ; Tue, 19 Sep 2023 17:51:54 +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:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ktohVVrUsPNYlM+vzeCspFs7JY7FD3gyWySxFzg8XRE=; b=uGrObXiGHmzxktTgTB3Lr8sqyy H2EoZtNHw3ZsX6z39DT1g0a8IP7BEAyqfTM6dOmJEjT+8ZcjQA6qaB00EshXsFK6cwS48nDpivfBQ 7ry/tpF4Prt1y8JUl/e9DmQG6Q7wtccZTpMVvXEq5zlsp34IEdxssv5pIOA84PHB0x0GE0p1oFANy E1i+gimr8CSFQrx3P06FobVIXHv3yyC+v7D9DlatrxDNQF48S5auzwiir6w1amO9nVppTJsDmFKWi guWgkRxeIMT3tvOn790tD9CWdf8Q5irQuIJHnMMnjlL5MzznVYkgDlL1cSEhEyozfVATNcT6WtpAJ sTCuRytg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qiesg-000zuE-32; Tue, 19 Sep 2023 17:51:26 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qierp-000zKR-02 for linux-arm-kernel@lists.infradead.org; Tue, 19 Sep 2023 17:50:35 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-59e758d6236so36179337b3.1 for ; Tue, 19 Sep 2023 10:50:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695145829; x=1695750629; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=+FfNGTxjW46m0vYg5JQZcFmeN0Q+crU/shufIChYdkI=; b=ZmwaNK27VuVKXzs5OakRfHE5lMHWd+yDQncqWWEWBSM84FknBxNWW89bxNvEmjl22N n1P1DztqbE/ZQZ2cMG+hzoMvumZBWIAkV67cTe74GhKqDYMMkaETvxAM/5uJXjEkZxtu lZ+XD3GZZ0DSV60YTN1O4hfHKqCldlk1UxrQ6/Nfrlj4JM7MreZz5pSdgkPxAGOeRb97 2GADi1yXM6L4yhSE9sQaTBNEkZRB9cGNG8STQhA65ChradM0ErNus5oR3+ouSg2ZaHz/ +S/Fq10WeUyhXUAnAik8m3xNiXar6HOPe//6Bw5Dm5JBs4CfGb9/+tIwyJH8gU/8ds2h d6+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695145829; x=1695750629; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+FfNGTxjW46m0vYg5JQZcFmeN0Q+crU/shufIChYdkI=; b=Wx+ikWzSaK3K+LBSeSSa6/3EslzeeZhYDz9rly1VWyDhHa6e9amsHRhByVohfB09wa UfVDV6AAKdQQVJGsmQbmN/6jqehNSYLGexSWBlvtz8Myqf8F2ydIed+AjtNwfTVMNzpC 6cePU0kOXjazVNppn8J9wlvyubUPVi92WnP+aCPAe0Y21+mHpgOWny6gEc7oigtlztpB FE8hDe6W+yV0oGdN6RtGYeT5EUgDmV+tnL536NGoIOYxVB2z0V03BWL6zHM1SXb8exCd V2YojHbZn0T8RpbFgQM8xnhU4mPz0f2T9tIhjJzlGYYQaPv21FcPs2ElggniJZVinYkc O5Eg== X-Gm-Message-State: AOJu0YwXos6t2Cep/d5o2HKg5Yj9slHEVS615DwlavlfogYYd07C72Vy Pom7rMq6l0WaeQX3aVLuxURCqi/Z3aVdtZVfcQ== X-Google-Smtp-Source: AGHT+IHzfDyzqT0qS3LWIHvfZz7RLjnCjuKsmPhD/Jh5rsxGnZ1+liEskGzE0UZSm4JarDPcCE5W4ld3r7CjK2ykmA== X-Received: from jgzg.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1acf]) (user=jingzhangos job=sendgmr) by 2002:a25:db07:0:b0:d81:78ec:c403 with SMTP id g7-20020a25db07000000b00d8178ecc403mr5069ybf.12.1695145829452; Tue, 19 Sep 2023 10:50:29 -0700 (PDT) Date: Tue, 19 Sep 2023 10:50:15 -0700 In-Reply-To: <20230919175017.538312-1-jingzhangos@google.com> Mime-Version: 1.0 References: <20230919175017.538312-1-jingzhangos@google.com> X-Mailer: git-send-email 2.42.0.459.ge4e396fd5e-goog Message-ID: <20230919175017.538312-4-jingzhangos@google.com> Subject: [PATCH v1 3/4] KVM: arm64: Use guest ID register values for the sake of emulation From: Jing Zhang To: KVM , KVMARM , ARMLinux , Marc Zyngier , Oliver Upton Cc: Will Deacon , Paolo Bonzini , James Morse , Alexandru Elisei , Suzuki K Poulose , Fuad Tabba , Suraj Jitindar Singh , Cornelia Huck , Shaoqin Huang , Jing Zhang X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230919_105033_091763_DB7BF411 X-CRM114-Status: GOOD ( 11.50 ) 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 Since KVM now supports per-VM ID registers, use per-VM ID register values for the sake of emulation for DBGDIDR and LORegion. Signed-off-by: Jing Zhang --- arch/arm64/kvm/sys_regs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index cdb9976d8091..4dcc9272fbb8 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -379,7 +379,7 @@ static bool trap_loregion(struct kvm_vcpu *vcpu, struct sys_reg_params *p, const struct sys_reg_desc *r) { - u64 val = read_sanitised_ftr_reg(SYS_ID_AA64MMFR1_EL1); + u64 val = IDREG(vcpu->kvm, SYS_ID_AA64MMFR1_EL1); u32 sr = reg_to_encoding(r); if (!(val & (0xfUL << ID_AA64MMFR1_EL1_LO_SHIFT))) { @@ -2445,8 +2445,8 @@ static bool trap_dbgdidr(struct kvm_vcpu *vcpu, if (p->is_write) { return ignore_write(vcpu, p); } else { - u64 dfr = read_sanitised_ftr_reg(SYS_ID_AA64DFR0_EL1); - u64 pfr = read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1); + u64 dfr = IDREG(vcpu->kvm, SYS_ID_AA64DFR0_EL1); + u64 pfr = IDREG(vcpu->kvm, SYS_ID_AA64PFR0_EL1); u32 el3 = !!cpuid_feature_extract_unsigned_field(pfr, ID_AA64PFR0_EL1_EL3_SHIFT); p->regval = ((((dfr >> ID_AA64DFR0_EL1_WRPs_SHIFT) & 0xf) << 28) | -- 2.42.0.459.ge4e396fd5e-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel