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 54E13C19F2A for ; Thu, 11 Aug 2022 17:10:20 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bIOot0tSoukOn5a3ZLGgzXsBBwp4cTT7QCTUvpCMjXo=; b=kSRgAnz+O3RmQq f09rTvveAmwDa6OzEcCiFpkHYbWnIcAuMTNSrS6kkeph+s38aYPW5UytNLIVTYvOHH1GhvJTKAatF UqNvX/O3vYyXJg1legzVPy2vJ+LYvv5yPyb+5dQPbUm3wx5x0fjV+eB96OoihmiRbRoBeXFEf+XHM PmBEDwEJPfCxO88PjOm5Fwa6wJqhu4oi1qNuUPySNJFL/pA9Jy12JyB+8H58hRX93b4CGr9uXuv5S yLodHo+86AIqx1El+VPyBoKakGW1WBaGtxqkczQINp7a4ZVrQrGkfzZ9T5dtOOoIK3DUStltNb7yf FS9WJziWPydjutHEuSyw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oMBg7-00Fg64-47; Thu, 11 Aug 2022 17:09:03 +0000 Received: from out2.migadu.com ([2001:41d0:2:aacc::]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oMBg3-00Fg0q-I3 for linux-arm-kernel@lists.infradead.org; Thu, 11 Aug 2022 17:09:01 +0000 Date: Thu, 11 Aug 2022 17:08:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1660237737; 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: in-reply-to:in-reply-to:references:references; bh=pSXXX5nUGBzBxyOtlQFRi2au12HwbHuAwUkay+JOhFk=; b=i8ID265G5LbPTSjgsik7VQaFZdYZbVXju5Oj0XcCUmwZMahpvigNTk/+KzCJ+DowsgN8s9 BOOU7sh2sc93Qvd1xHPdTU2rRUViOh/XxNwsn4lzy9ELSha6148xQNR5NrKms4cCmKs5fC YtHtXzAcd7QXRFnE7g/u6ik5kElABlw= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Oliver Upton To: kvmarm@lists.cs.columbia.edu Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, maz@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, will@kernel.org Subject: Re: [PATCH 1/2] KVM: arm64: Treat PMCR_EL1.LC as RES1 on asymmetric systems Message-ID: References: <20220811170221.3771048-1-oliver.upton@linux.dev> <20220811170221.3771048-2-oliver.upton@linux.dev> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220811170221.3771048-2-oliver.upton@linux.dev> X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220811_100859_772626_960CFDB9 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 On Thu, Aug 11, 2022 at 05:02:20PM +0000, Oliver Upton wrote: > KVM does not support AArch32 on asymmetric systems. To that end, enforce > AArch64-only behavior on PMCR_EL1.LC when on an asymmetric system. > > Fixes: 2122a833316f ("arm64: Allow mismatched 32-bit EL0 support") > Signed-off-by: Oliver Upton > --- > arch/arm64/include/asm/kvm_host.h | 4 ++++ > arch/arm64/kvm/arm.c | 3 +-- > arch/arm64/kvm/sys_regs.c | 4 ++-- > 3 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index f38ef299f13b..e9c9388ccc02 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -929,6 +929,10 @@ bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu); > (system_supports_mte() && \ > test_bit(KVM_ARCH_FLAG_MTE_ENABLED, &(kvm)->arch.flags)) > > +#define kvm_supports_32bit_el0() \ > + (system_supports_32bit_el0() && \ > + !static_branch_unlikely(&arm64_mismatched_32bit_el0)) > + > int kvm_trng_call(struct kvm_vcpu *vcpu); > #ifdef CONFIG_KVM > extern phys_addr_t hyp_mem_base; > diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c > index 986cee6fbc7f..bef3849c564f 100644 > --- a/arch/arm64/kvm/arm.c > +++ b/arch/arm64/kvm/arm.c > @@ -757,8 +757,7 @@ static bool vcpu_mode_is_bad_32bit(struct kvm_vcpu *vcpu) > if (likely(!vcpu_mode_is_32bit(vcpu))) > return false; > > - return !system_supports_32bit_el0() || > - static_branch_unlikely(&arm64_mismatched_32bit_el0); > + return kvm_supports_32bit_el0(); Lol, promised this was lightly tested :) Read the patch once more, this will need to be: return !kvm_supports_32bit_el0(); I'll fix it in v2 but will wait a bit for folks to review. -- Thanks, Oliver > } > > /** > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index c059b259aea6..3234f50b8c4b 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -652,7 +652,7 @@ static void reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r) > */ > val = ((pmcr & ~ARMV8_PMU_PMCR_MASK) > | (ARMV8_PMU_PMCR_MASK & 0xdecafbad)) & (~ARMV8_PMU_PMCR_E); > - if (!system_supports_32bit_el0()) > + if (!kvm_supports_32bit_el0()) > val |= ARMV8_PMU_PMCR_LC; > __vcpu_sys_reg(vcpu, r->reg) = val; > } > @@ -701,7 +701,7 @@ static bool access_pmcr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, > val = __vcpu_sys_reg(vcpu, PMCR_EL0); > val &= ~ARMV8_PMU_PMCR_MASK; > val |= p->regval & ARMV8_PMU_PMCR_MASK; > - if (!system_supports_32bit_el0()) > + if (!kvm_supports_32bit_el0()) > val |= ARMV8_PMU_PMCR_LC; > __vcpu_sys_reg(vcpu, PMCR_EL0) = val; > kvm_pmu_handle_pmcr(vcpu, val); > -- > 2.37.1.559.g78731f0fdb-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel