From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794909496; b=vD31GfbdlC8EHU2uSzYv9W+zbT3YdXaw5SDaDiph/RT9VX1Dw5ewyx/70O6SNbUtGglN w25yUtzVL/E8CMM7vQ7HTo7iQAc4nJPxpkGBvmmNVYdBu3QdMAReSj80vNwIOQfxh4Zfr Xs7Id6HI90Tmvxs4oGg4TZNbAweDUR+nQZwsIobNMpk2aw8H9m8eLz14XdciHrxBv3byt Dm5UBe4GlUZyUUlFu9amx/aNWHtA5H2k2cvvsDYURj3Kg2WE7tMKtiDnf1fCvHjxmdVbU eLhNLAcnjhme5fCN4XvL6gktAe1VIT3cYYWZCOiShisKrWswayGBjTmGMk782vhfJsg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794909496; h=Received:DKIM-Signature:Message-ID:Date:MIME-Version:User-Agent: Subject:To:Cc:References:From:Content-Language:Autocrypt:In-Reply-To: Content-Type:Content-Transfer-Encoding; bh=3LgsglAFrX/+u6sq+JUPf5c5+f8fmRKk1XVeo+aF5S0=; b=aK3pfV8hRowHwQ0uoBBYxs1ytsZyG5EQnT4bNt9erqlagd0IpVEOZOgWw5UqwmRCpseH Z04sfg1HnUH5EqkbJ3aNSybegIBvzM71tfmNum1bkWu1eFWqhjaJ/vwa2rFsKqrhz0i3D /ZrtoHuBlhn0mbuD4tj7/7BKM4JLbl5Nhc5VSq6DGFgr/hRe4C+XtE5+Lc0R3lpoMVlzb 3+76Yegw/AI6pUUYHBIjcgj6LbrDQdtrtZC26IkfxthaP/x2ONtycTcZSOh3fhX2odMK9 wQk6gZelKo2Z0vbU/3kh/jQWlJqL3IHu0RDpv1hqGJzPYu3oqConoGn/i1G/pJESbyQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=PKTIhaGa; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E2D0606A31C; Tue, 17 Nov 2026 09:58:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=PKTIhaGa Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD77F1F000C5; Tue, 17 Nov 2026 09:58:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794909495; bh=3LgsglAFrX/+u6sq+JUPf5c5+f8fmRKk1XVeo+aF5S0=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=PKTIhaGaFJjS8CEuxmoycngekpxqyTVDnR+ZbXMPkZLRz4ltzKBzyYbM81DD7kjQp dJko9j4wHxkttt7vMNmlyiiUPmk6J0+SNRfMMI43e00Q26u/3Zs4SU9IDyENJJCN27 0y6HGdbRJ/Pgc8qqTqPRtz/M9tbjAqGvfP3adIBD8UGiRZrpj8LwM74cWF9bM9Ga9G deU1O6u/09nFGfMVdsjWFGVDoE+32ZqEozAehWGjEOzwf3+SpXXWsWVQjmE54Nu9xy ZyDBWs2rwIBJJ63aMdREtpHzjfvEIv9d9d1TbHnsu6uvOD39NXSmHfWxu6C3eTTsn8 mhBQ1FxH7fAKQ== Message-ID: Date: Tue, 17 Nov 2026 10:58:00 +0100 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 8/9] mm/migrate_device: do not migrate a uffd-protected zero page To: Tal Zussman , Andrew Morton , Mike Rapoport , Peter Xu , James Houghton , Andrea Arcangeli , Suren Baghdasaryan , Balbir Singh , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn , Pedro Falcato , Michal Hocko , =?UTF-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , Andrei Vagin , Muhammad Usama Anjum , Stephen Rothwell , Arnd Bergmann , Zi Yan , Matthew Brost , Joshua Hahn , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Baolin Wang , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Usama Arif , Kiryl Shutsemau , Muchun Song , Oscar Salvador , =?UTF-8?Q?Miko=C5=82aj_Lenczewski?= Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, =?UTF-8?Q?Thomas_Hellstr=C3=B6m?= , Lyude Paul , Danilo Krummrich , Felix Kuehling , Jason Gunthorpe , Leon Romanovsky , dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, nouveau@lists.freedesktop.org, amd-gfx@lists.freedesktop.org References: <20261116-uffd-state-fixes-v2-0-4397a0196479@columbia.edu> <20261116-uffd-state-fixes-v2-8-4397a0196479@columbia.edu> <71aa028f-c753-40d5-a8e4-8daef5aea3aa@columbia.edu> From: "David Hildenbrand (Arm)" Content-Language: en-US Autocrypt: addr=david@kernel.org; keydata= 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 qIws/H2t In-Reply-To: <71aa028f-c753-40d5-a8e4-8daef5aea3aa@columbia.edu> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 11/17/26 00:06, Tal Zussman wrote: > On 11/16/26 3:45 PM, David Hildenbrand (Arm) wrote: >> On 11/16/26 21:02, Tal Zussman wrote: >>> Device migration replaces a PTE that maps the zero page with a new PTE >>> that is built only from the VMA flags, so its userfaultfd WP or RWP >>> protection is lost. The same applies to the huge zero PMD. Writes and >>> accesses to the page are then no longer reported to userfaultfd. >>> >>> To fix it, do not migrate a uffd-protected zero page. Skip it during >>> collection, and check again under the page table lock before inserting, >>> as another thread can protect the page after it was collected. >>> >>> The alternative would be to carry the uffd state over to the new entry, >>> but a uffd-protected zero page in a range that a driver migrates should >>> be rare. >>> >>> Fixes: 292924b26024 ("userfaultfd: wp: apply _PAGE_UFFD_WP bit") >>> Fixes: a30b48bf1b24 ("mm/migrate_device: implement THP migration of zone device pages") >>> Cc: Thomas Hellström >>> Cc: Lyude Paul >>> Cc: Danilo Krummrich >>> Cc: Felix Kuehling >>> Cc: Jason Gunthorpe >>> Cc: Leon Romanovsky >>> Cc: dri-devel@lists.freedesktop.org >>> Cc: intel-xe@lists.freedesktop.org >>> Cc: nouveau@lists.freedesktop.org >>> Cc: amd-gfx@lists.freedesktop.org >>> Reviewed-by: Alistair Popple >>> Signed-off-by: Tal Zussman >>> --- >>> mm/migrate_device.c | 23 +++++++++++++++++++++-- >>> 1 file changed, 21 insertions(+), 2 deletions(-) >>> >>> diff --git a/mm/migrate_device.c b/mm/migrate_device.c >>> index 9e19fadfa65c..140b99f72508 100644 >>> --- a/mm/migrate_device.c >>> +++ b/mm/migrate_device.c >>> @@ -159,7 +159,16 @@ static int migrate_vma_collect_huge_pmd(pmd_t *pmdp, unsigned long start, >>> >>> folio = pmd_folio(*pmdp); >>> if (is_huge_zero_folio(folio)) { >>> + /* >>> + * Nothing carries the uffd state of the zero page >>> + * over, so skip it if its uffd bit is set. >>> + */ >>> + bool protected = userfaultfd_protected(walk->vma) && >>> + pmd_uffd(*pmdp); >> >> Now that I read it 3 times in a row below, these needs a helper. >> >> userfaultfd_pte_protected() ? userfaultfd_pte? >> >> That might help you to get rid of the local variable (that should have been >> called something that includes uffd and should have been const) >> >> >> Maybe just add a simple helper for the pmd as well and use it below. >> > > Will do. I'll do userfaultfd_pte_protected() and userfaultfd_huge_pmd_protected() > to match the existing wp and rwp helpers. > > Re: the local variable, I'll rid of it and just call spin_unlock() in > both branches, which is a little ugly. The clean thing to do would be to read the pmd once using pmdp_get() :) -- Cheers, David