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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 39633E83F1C for ; Wed, 4 Feb 2026 13:58:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A2DA910E64C; Wed, 4 Feb 2026 13:58:45 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=collabora.com header.i=@collabora.com header.b="TzHv6l84"; dkim-atps=neutral Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6695D10E133 for ; Wed, 4 Feb 2026 13:58:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1770213521; bh=k5UMXWgwFCcfrE3dxMlUTv7lURRvMh1vxVEAuRt2VgA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=TzHv6l84ETnKx77sOQfP3C3p+0DEvzf0uI9mXUiO7YSl3w1FLFLvDz0IuvB5U+DMo sdUrTp2ykoSXEIpOtVJ+KQzZS2Aqgt61+uy53TvsLfkP9xrUmYydC6lZSA62FoRKA7 8mCAbwxqMmAM/WdWLvrCuusWXhv63dBgAd67KU03aL/sPT1RXZkqTu7LVEq06zQ3dl TLilyt4k2t8pZrrSDUwWGbCHTCYYssFyhodIXA/mXvMYOHo3rogBLGi+vZpdc/zzSP XoemwdNDnx36fXM3P0XKWmzVFFgAFM0t14NsfMqkuwy4p2MpPJI+ioaWW+qI/TyKGB 8ulU6EQCuYkcA== Received: from fedora (unknown [IPv6:2a01:e0a:2c:6930:d919:a6e:5ea1:8a9f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: bbrezillon) by bali.collaboradmins.com (Postfix) with ESMTPSA id 6EBDA17E13D3; Wed, 4 Feb 2026 14:58:41 +0100 (CET) Date: Wed, 4 Feb 2026 14:58:35 +0100 From: Boris Brezillon To: Thomas Zimmermann Cc: loic.molinari@collabora.com, willy@infradead.org, frank.binns@imgtec.com, matt.coster@imgtec.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@gmail.com, simona@ffwll.ch, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Subject: Re: [PATCH v2 1/4] drm/gem-shmem: Return vm_fault_t from drm_gem_shmem_try_map_pmd() Message-ID: <20260204145835.2e98630c@fedora> In-Reply-To: <20260204114341.195143-2-tzimmermann@suse.de> References: <20260204114341.195143-1-tzimmermann@suse.de> <20260204114341.195143-2-tzimmermann@suse.de> Organization: Collabora X-Mailer: Claws Mail 4.3.1 (GTK 3.24.51; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, 4 Feb 2026 12:39:29 +0100 Thomas Zimmermann wrote: > Return the exact VM_FAULT_ mask from drm_gem_shmem_try_map_pmd(). Gives > the caller better insight into the result. Return 0 if nothing was done. > > If the caller sees VM_FAULT_NOPAGE, drm_gem_shmem_try_map_pmd() added a > PMD entry to the page table. As before, return early from the page-fault > handler in that case. > > Signed-off-by: Thomas Zimmermann > Suggested-by: Matthew Wilcox Reviewed-by: Boris Brezillon > --- > drivers/gpu/drm/drm_gem_shmem_helper.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c > index 3871a6d92f77..e7316dc7e921 100644 > --- a/drivers/gpu/drm/drm_gem_shmem_helper.c > +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c > @@ -550,8 +550,8 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev, > } > EXPORT_SYMBOL_GPL(drm_gem_shmem_dumb_create); > > -static bool drm_gem_shmem_try_map_pmd(struct vm_fault *vmf, unsigned long addr, > - struct page *page) > +static vm_fault_t drm_gem_shmem_try_map_pmd(struct vm_fault *vmf, unsigned long addr, > + struct page *page) > { > #ifdef CONFIG_ARCH_SUPPORTS_PMD_PFNMAP > unsigned long pfn = page_to_pfn(page); > @@ -562,12 +562,11 @@ static bool drm_gem_shmem_try_map_pmd(struct vm_fault *vmf, unsigned long addr, > pmd_none(*vmf->pmd) && > folio_test_pmd_mappable(page_folio(page))) { > pfn &= PMD_MASK >> PAGE_SHIFT; > - if (vmf_insert_pfn_pmd(vmf, pfn, false) == VM_FAULT_NOPAGE) > - return true; > + return vmf_insert_pfn_pmd(vmf, pfn, false); > } > #endif > > - return false; > + return 0; > } > > static vm_fault_t drm_gem_shmem_fault(struct vm_fault *vmf) > @@ -593,10 +592,9 @@ static vm_fault_t drm_gem_shmem_fault(struct vm_fault *vmf) > goto out; > } > > - if (drm_gem_shmem_try_map_pmd(vmf, vmf->address, pages[page_offset])) { > - ret = VM_FAULT_NOPAGE; > + ret = drm_gem_shmem_try_map_pmd(vmf, vmf->address, pages[page_offset]); > + if (ret == VM_FAULT_NOPAGE) > goto out; > - } > > pfn = page_to_pfn(pages[page_offset]); > ret = vmf_insert_pfn(vma, vmf->address, pfn);