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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70F50C7115A for ; Wed, 18 Jun 2025 15:46:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C052B6B0088; Wed, 18 Jun 2025 11:46:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BDCF86B0089; Wed, 18 Jun 2025 11:46:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B1A496B008A; Wed, 18 Jun 2025 11:46:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id A278F6B0088 for ; Wed, 18 Jun 2025 11:46:36 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 316E2589BD for ; Wed, 18 Jun 2025 15:46:36 +0000 (UTC) X-FDA: 83568948792.30.EE0F854 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf25.hostedemail.com (Postfix) with ESMTP id 237B3A000F for ; Wed, 18 Jun 2025 15:46:33 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf25.hostedemail.com: domain of cmarinas@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=cmarinas@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750261594; a=rsa-sha256; cv=none; b=7qfzdkhoHwBiOCbFwdJ7z6eoqv2Gr2Gz6lI2cuyrh12cRhVDwtXLc0V3G6eVOw/ZAP3jck wlmkWlwe9IyrJHAfk0DcjHNXaBbC3qGB+Gz4YeOmLyti0W45ekVc7E/bcF4BLmNcdtJUa9 nfbQdbZNGHnGoMvXDOM96rNqsCf58vk= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf25.hostedemail.com: domain of cmarinas@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=cmarinas@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750261594; h=from:from:sender: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: in-reply-to:in-reply-to:references:references; bh=DlKToSvBEFSPLKLKXZShMG6gUEw7CnMhATxHiMXR5Uc=; b=DKiwnqRHKVwtIeu4WktyAqo7h1R/NJWPAi0vPmzA0srDTPZFssLF4pXGwlNM6kljktDZLb 76/uQ8SfZhnC0/8GXB6ODOG3Mq5E7kY6v2LdLIQF7raLAiNF6Al2wiJyDM7bzRLYUDcQw/ 6ecrTMosYKalu7DLdWO1Et6DN+eGzik= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id A7C714401E; Wed, 18 Jun 2025 15:46:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87CFAC4CEE7; Wed, 18 Jun 2025 15:46:25 +0000 (UTC) Date: Wed, 18 Jun 2025 16:46:23 +0100 From: Catalin Marinas To: ankita@nvidia.com Cc: jgg@nvidia.com, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, will@kernel.org, ryan.roberts@arm.com, shahuang@redhat.com, lpieralisi@kernel.org, david@redhat.com, ddutile@redhat.com, seanjc@google.com, aniketa@nvidia.com, cjia@nvidia.com, kwankhede@nvidia.com, kjaju@nvidia.com, targupta@nvidia.com, vsethi@nvidia.com, acurrid@nvidia.com, apopple@nvidia.com, jhubbard@nvidia.com, danw@nvidia.com, zhiw@nvidia.com, mochs@nvidia.com, udhoke@nvidia.com, dnigam@nvidia.com, alex.williamson@redhat.com, sebastianene@google.com, coltonlewis@google.com, kevin.tian@intel.com, yi.l.liu@intel.com, ardb@kernel.org, akpm@linux-foundation.org, gshan@redhat.com, linux-mm@kvack.org, tabba@google.com, qperret@google.com, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, maobibo@loongson.cn Subject: Re: [PATCH v7 2/5] KVM: arm64: Block cacheable PFNMAP mapping Message-ID: References: <20250618065541.50049-1-ankita@nvidia.com> <20250618065541.50049-3-ankita@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250618065541.50049-3-ankita@nvidia.com> X-Rspam-User: X-Rspamd-Queue-Id: 237B3A000F X-Rspamd-Server: rspam10 X-Stat-Signature: 8srpifxuwastbzz65jop1mmjs995fes8 X-HE-Tag: 1750261593-534021 X-HE-Meta: U2FsdGVkX184CuGr30eAxvyoMAkNkpEZ8rTX8KgbLDazZwSjJGRUJvnJgwhTouV4aGUV55ZSHovqHAjEUhqUDSW8OqtjGxM7j034iUDOgX2Xpm3Pag04U6cnTyydwFbQdW/s/pymGazXOt5EvRStuSgUhXplrWhi038I0SW3ULdmkbWdkru6kdZyCMZJCwQ1aZWD5MdUpc6RC95WFLJIQLnBLtY7RC9LUbeqH8BQQhl9XwScgxpWfTUUAta7g908sMYMeUG14ps3HQVJ2/qCZV+7/4N0jo5CpLyvvcvCed6z0PbaWR80WtnPSuhPI7wwTn7fGyAvUuiJ//IMSGKMDkQapX+mHuIeg9cE6V+LFFDw3/VOBvH9eC9nztJP3ebxMjzSGFU6q0/wR1qgEE4Qwosom/RXbdfZIdlbajMwE7KJS7hFC6NG6pdG1qgW7MgWM8EdaTb9yuitephf4tuIXt5tvnGCf/eURooiM88L9GHhFoVkBop3OpFE6dhEReXkXNpMgrUJIGKGrZuLCsZDZkAwQUPGsT+R9OzpNKGchnCuF4LYinFbaU0I7BLPw4jlzCL0DRfWFZdxfbrJ0vE8NFW6fQmFgcRfv/BdkUccLpt3oUbyo+unUd9/u+wDtvCnmB1t8dosamzGXvanIimB2304w5ikJTwh7t+tT/vJy5SysK18/BswBOQB8B3Tl3/S9CUwbEPzWKHVRGcB/W1rQizM/lP89UYeYejCYwawe4mpo2oA5Ed2D70uIkZ0Zu8AUXKUW0BmMh4IKLdg87KDTYDbsfIgl6jv1a6KqzLD5Jo8sqqz8/pmUro31WzCdurbddzItmk0xXYpJNcnMzVsYwWxk5LRfOGcNN2LfloYOyX/lvS3yg+504uM33PkSl0NhZLVwdovbHSjNikST+1vBcPetRFtJAReoJJhstkbfwsniJQ6TCF7B8q2XFbLn2MmWGKlrggMQEDrQpIK5ny HYArp3yJ 67I10/1YMCVGYAXfW5F/AWyAfhDjTcrOQGCtV56NaTV2zvh7EStoNGPmfZar5afWJ4kUEKLFWhZk8oa5FCMb76psN39XOtvyg8fzZWYkxQ3Nu7Hrqo8SSznr7t4mqyy7WwTHrIwZUVDcUFLIhLqAY6U6jzUzJIaqX5QHdY8eoTMmKjmf3wrmHvcpRuGCQE3r+o+an3pPcNLNAQo2ARic9yVYazdHDy79ks1uewGGtb3AHtK46uGDiOHuGq3a1EfYws7pGD4jYMiyChdYrqOYgybJA3EqOfPDzPhOi+ib3m7PD20wKSQ2T7T/y/cTDPCIw9BBzfCYGGrS0AJ0W8RrjU6byVNtbmU0SjmknhfNgc3dx4oJcOFCdaEIH0A== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Wed, Jun 18, 2025 at 06:55:38AM +0000, ankita@nvidia.com wrote: > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index 3d77a278fc4f..d6e0d5f46b45 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -1470,6 +1470,22 @@ static bool kvm_vma_mte_allowed(struct vm_area_struct *vma) > return vma->vm_flags & VM_MTE_ALLOWED; > } > > +/* > + * Determine the memory region cacheability from VMA's pgprot. This > + * is used to set the stage 2 PTEs. > + */ > +static bool kvm_vma_is_cacheable(struct vm_area_struct *vma) > +{ > + switch (FIELD_GET(PTE_ATTRINDX_MASK, pgprot_val(vma->vm_page_prot))) { > + case MT_NORMAL_NC: > + case MT_DEVICE_nGnRnE: > + case MT_DEVICE_nGnRE: > + return false; > + default: > + return true; > + } > +} > + > static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > struct kvm_s2_trans *nested, > struct kvm_memory_slot *memslot, unsigned long hva, > @@ -1477,7 +1493,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > { > int ret = 0; > bool write_fault, writable, force_pte = false; > - bool exec_fault, mte_allowed; > + bool exec_fault, mte_allowed, is_vma_cacheable = false; Nit: do we need to initialise is_vma_cacheable here? It did not seem used until the kvm_vma_is_cacheable() call. Anyway, it's harmless. > bool disable_cmo = false, vfio_allow_any_uc = false; > unsigned long mmu_seq; > phys_addr_t ipa = fault_ipa; > @@ -1619,6 +1635,8 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > > vfio_allow_any_uc = vma->vm_flags & VM_ALLOW_ANY_UNCACHED; > > + is_vma_cacheable = kvm_vma_is_cacheable(vma); > + > /* Don't use the VMA after the unlock -- it may have vanished */ > vma = NULL; > > @@ -1643,6 +1661,9 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > return -EFAULT; > > if (!kvm_can_use_cmo_pfn(pfn)) { > + if (is_vma_cacheable) > + return -EINVAL; > + > /* > * If the page was identified as device early by looking at > * the VMA flags, vma_pagesize is already representing the This block also sets 'disable_cmo' (originally 'device') to true. > @@ -1726,6 +1747,11 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > prot |= KVM_PGTABLE_PROT_X; > > if (disable_cmo) { > + if (is_vma_cacheable) { > + ret = -EINVAL; > + goto out_unlock; > + } so, is there anything else changing 'disable_cmo' up to this point? If not, I'd drop the second is_vma_cacheable check. -- Catalin