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 BB587CA5FD4 for ; Fri, 2 Oct 2026 12:57:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: References:In-Reply-To:Subject:Cc:To:From:Message-ID:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=0UtDxCzSxsK2ku+CA7l+bjB6RPxfD160Qjz44ZIDIe0=; b=ROpkvL3dkALsbZGprg9AFkBuSz uN/ikUKK7rCwOT9NyiGuguAcrsyl0bH340SIkPyGXOrwdk8L5smcgfDIlmqpN1kHUJV1S4cFxG/tB Aw8YqA9CesqJ6r4V41sbufyRzm2v0/XwixEOVsP/OJ1RKbNFSdC9an50LdClfO1609FqvZsN4YEBS V749spw85YUz1FvkenXf/HAU0MYiu92cTDTqM6FIXx4pehzK/dBXzJs/EJ54EpcFWyxmAMJda5dI6 keXSd5FzltYMYs5T0zlCsriu1I0KO2sC7gW1lV+AloWxzArj+p6fyG9MgeKhgLHHmf1Ki5onF1veX EEHXZrzQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xCcpA-0000000BcfC-3S1Q; Fri, 02 Oct 2026 12:57:16 +0000 Received: from tor.source.kernel.org ([172.105.4.254]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xCcp9-0000000Bcf2-29gg for linux-arm-kernel@lists.infradead.org; Fri, 02 Oct 2026 12:57:15 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 9D4E160A70; Fri, 2 Oct 2026 12:57:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 501261F000FF; Fri, 2 Oct 2026 12:57:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1790945834; bh=0UtDxCzSxsK2ku+CA7l+bjB6RPxfD160Qjz44ZIDIe0=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=WF9LZxrcVvHu6PW+XOYclk0VVBOQPLtinnNi/jt6r7uTb/njR6uIWn3UAt0/bYaZ0 Q9NbBQDrNX+jztOzQI/FzXzQ60Y3j0ytpRMGVwX6QHBl2Cfn6lwrrSI9kJPHT+wXfy FOuHQou7kYr7Ik6dI3pg9Yb3gUEOc5G8JTCe0zYFCF6obms2czMWJdCUDjHFQFs3Sx mhQNBI1a58YE6LNEHKPfFB3iAsFpD4GshDO648dfYfbM0OVVYsIEExWYMBUUXKsG+b z44pEb8aEHodxNdBXtPqA4CKips1YXXhtTZKdFFgQiq71qwlKk2BL6mOAL2Lbf7gE4 +Mmvv1dpREhiQ== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1xCcp5-0000000GE4t-48QV; Fri, 02 Oct 2026 12:57:12 +0000 Date: Fri, 02 Oct 2026 13:57:11 +0100 Message-ID: <86se2o2rbs.wl-maz@kernel.org> From: Marc Zyngier To: Fuad Tabba Cc: Suzuki K Poulose , kvm@vger.kernel.org, kvmarm@lists.linux.dev, will@kernel.org, catalin.marinas@arm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, steven.price@arm.com, aneesh.kumar@kernel.org, oupton@kernel.org, gshan@redhat.com, joey.gouly@arm.com, yuzenghui@huawei.com, linux-coco@lists.linux.dev, gankulkarni@os.amperecomputing.com, sdonthineni@nvidia.com, alpergun@google.com, fj0570is@fujitsu.com, WeiLin.Chang@arm.com, lpieralisi@kernel.org, enju.kohei@fujitsu.com, sudeep.holla@arm.com, jonathan.cameron@oss.qualcomm.com Subject: Re: [PATCH v21 05/23] KVM: arm64: Track the type of VM in kvm_arch In-Reply-To: References: <20261001210703.1597150-1-suzuki.poulose@arm.com> <20261001210703.1597150-6-suzuki.poulose@arm.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/30.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: tabba@google.com, suzuki.poulose@arm.com, kvm@vger.kernel.org, kvmarm@lists.linux.dev, will@kernel.org, catalin.marinas@arm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, steven.price@arm.com, aneesh.kumar@kernel.org, oupton@kernel.org, gshan@redhat.com, joey.gouly@arm.com, yuzenghui@huawei.com, linux-coco@lists.linux.dev, gankulkarni@os.amperecomputing.com, sdonthineni@nvidia.com, alpergun@google.com, fj0570is@fujitsu.com, WeiLin.Chang@arm.com, lpieralisi@kernel.org, enju.kohei@fujitsu.com, sudeep.holla@arm.com, jonathan.cameron@oss.qualcomm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, 02 Oct 2026 11:06:52 +0100, Fuad Tabba wrote: > > Hi Suzuki, > > On Thu, 01 Oct 2026 22:06:45 +0100, Suzuki K Poulose > wrote: > [...] > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > [...] > > +#define vcpu_is_protected(vcpu) \ > [...] > > + if (is_nvhe_hyp_code() && \ > > + !is_protected_kvm_enabled()) \ > > + __kvm = kern_hyp_va(__kvm); \ > > On a non-pKVM nVHE host, the hyp callers of this in switch.c and > timer-sr.c now translate vcpu->kvm and load vm_flavor on every guest > entry and exit, where the is_protected_kvm_enabled() check used to > short-circuit. Could they use vcpu_is_protected_pkvm(), and drop the > kern_hyp_va() here? Just to make sure. Is that what you had in mind? diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c index 7318e3e6a5f36..2a3e6d83682d5 100644 --- a/arch/arm64/kvm/hyp/nvhe/switch.c +++ b/arch/arm64/kvm/hyp/nvhe/switch.c @@ -217,7 +217,7 @@ static const exit_handler_fn pvm_exit_handlers[] = { static const exit_handler_fn *kvm_get_exit_handler_array(struct kvm_vcpu *vcpu) { - if (unlikely(vcpu_is_protected(vcpu))) + if (unlikely(vcpu_is_protected_pkvm(vcpu))) return pvm_exit_handlers; return hyp_exit_handlers; @@ -238,7 +238,7 @@ static inline bool fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) * it. The check below is based on the one in * kvm_arch_vcpu_ioctl_run(). */ - if (unlikely(vcpu_is_protected(vcpu) && vcpu_mode_is_32bit(vcpu))) { + if (unlikely(vcpu_is_protected_pkvm(vcpu) && vcpu_mode_is_32bit(vcpu))) { /* * As we have caught the guest red-handed, decide that it isn't * fit for purpose anymore by making the vcpu invalid. The VMM diff --git a/arch/arm64/kvm/hyp/nvhe/timer-sr.c b/arch/arm64/kvm/hyp/nvhe/timer-sr.c index 9930657169133..17bd1ff621ab6 100644 --- a/arch/arm64/kvm/hyp/nvhe/timer-sr.c +++ b/arch/arm64/kvm/hyp/nvhe/timer-sr.c @@ -48,7 +48,7 @@ void __timer_enable_traps(struct kvm_vcpu *vcpu) * or running a protected VM (we don't offset anything in this case). */ clr = CNTHCTL_EL1PCEN; - if (vcpu_is_protected(vcpu) || + if (vcpu_is_protected_pkvm(vcpu) || !timer_get_offset(vcpu_ptimer(vcpu))) set |= CNTHCTL_EL1PCTEN; else M. -- Without deviation from the norm, progress is not possible.