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 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 519EFF46445 for ; Mon, 16 Mar 2026 10:36:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A1AFC10E252; Mon, 16 Mar 2026 10:36:45 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=collabora.com header.i=@collabora.com header.b="BzbaEhdP"; dkim-atps=neutral Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) by gabe.freedesktop.org (Postfix) with ESMTPS id B40A010E252 for ; Mon, 16 Mar 2026 10:36:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1773657403; bh=eVt6F9ysICTFqDZVowFsKUa1CX+NqY9EvfoLuRRDj2g=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=BzbaEhdPFl1nercL2LPX/KBP7ChUMLmxhQCSj/VY6AaABaN/IwfYFwTbrpaILh8GX P12on44pBU1r2K9Lvb1cNLmGIyKRo0xQ8r3yMlGjbRVYTlt9jnVQsxfj61p9IZxrE5 OSkFQnAxBFJcVIkOU/Mwzj0PbSqo4o0Ik6aWznN3EgN5ZctmkRJ6oKLr0b+kqJHUQg JTlwu/CytfgN05ROQlwCKTOePzmiQaoTM1DgrlUibtc9e6MC7lCBG4aVOr6oMw3pr9 vTojriw0SjeLvafzKd+N+Omr/IzmzA3xGhZixRYicj33qcSjxry9XuT4y9nOJGs1IU tjk08IvmiO6ww== 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 13B7F17E0E4C; Mon, 16 Mar 2026 11:36:43 +0100 (CET) Date: Mon, 16 Mar 2026 11:36:37 +0100 From: Boris Brezillon To: Thomas Zimmermann Cc: Pedro Demarchi Gomes , Maarten Lankhorst , Maxime Ripard , David Airlie , Simona Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3] drm/shmem-helper: Fix Map huge page mapping in fault handler Message-ID: <20260316113637.63a5031a@fedora> In-Reply-To: <08112162-7939-48b8-be57-790a8686bc46@suse.de> References: <20260316002649.211819-1-pedrodemargomes@gmail.com> <20260316105043.115ba8a3@fedora> <08112162-7939-48b8-be57-790a8686bc46@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 Mon, 16 Mar 2026 11:14:40 +0100 Thomas Zimmermann wrote: > Am 16.03.26 um 10:50 schrieb Boris Brezillon: > > >> Avoid this race by adding a huge_fault callback to drm_gem_shmem_vm_ops so that > >> PMD-sized mappings are handled through the appropriate huge page fault path. > > This patch will conflict heavily with the folio-tracking patches that > has been merged into upstream DRM. How do we deal with that? We need a fix in drm-misc-fixes since it's a bug that exists in v7.0, and a conflict resolution recorded in drm-tip to deal with the drm-misc-fixes vs drm-misc-next conflicts (I don't remember the exact process, but it's documented in dim).