From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=148.163.139.74 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794870409; b=qNib+Jt+AOUxKN7ub6UPBibF4QUGdSNiiYKeNVFUZFsdVMhzFkOI2AFpeFHB2pDZvkNx 3nbSQtEi2HvVfn/XyZLCT5NQRB4ycwdIrqgdn/xEvbzvQHajbErwi0Cj2ce1J1d17kRY7 sngIz9v/RyTIeK0rF0ybMBrlBTrKZtLUYXyIu+IhoiaDFtR5q1Wu13FHHC7FzzrXXO/Sm rZUEteB2NLVGJWIQ5Yxa2YmBgHqQK3KdXjiFKrlV0nf3Nhmv/RsuX5UcIoYUdd9nGyG7a yige1S7siiIwAolHB5nfKbuexVCUlkg3DIxwAaT9lv6trLwBoor/Qdaq9IhC2K6nwnQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794870409; h=DMARC-Filter:Received:DKIM-Signature:Received:Received: DKIM-Signature:X-Google-DKIM-Signature:X-Forwarded-Encrypted: X-Gm-Message-State:X-Gm-Gg:X-Received:X-Received:Received:Message-ID: Date:MIME-Version:User-Agent:Subject:To:Cc:References: Content-Language:From:In-Reply-To:Content-Type: Content-Transfer-Encoding:X-Proofpoint-GUID:X-Authority-Analysis: X-Proofpoint-Spam-Details-Enc:X-Proofpoint-Spam-Info: X-Proofpoint-ORIG-GUID:X-Proofpoint-Virus-Version: X-Proofpoint-Spam-Details; bh=shtRRPv4sO05cfKy9jDsVgauLpUzE/l0Te4xSbg74SE=; b=ud1zjORyOo/qg+qJHPCnAyggO1/HybBTSJt06ZQsj/Tev6eIb2dc93eHvPvrIie+u9PW VqFE14OkMcbKyf65xbDJ/JHy8Lcz7etzVR+O49Ic/UrYlH8myg63zUKBul0msmPeqEQJ4 5jKE5++6Jijq54l9vvwGQGiY/1ELwIlxZJkUrVv+C+qIO/18Ig8ZSujuixRODNoXiu4Xr PpriRi6xVWqy2CJ59xWxqesOg+H8EEXXqByDCLjTbN/JozDsXSUwQJdZSl5+OtgnT19tL 9kiH2SW0nZhnkWibfxpFuYrfmGE1Eng80FYgzpdDa4rGgplGEKLEfavsbVUrLT62/UQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=columbia.edu; spf=pass smtp.mailfrom=columbia.edu; dkim=pass header.d=columbia.edu header.i=@columbia.edu header.a=rsa-sha256 header.s=pps01 header.b=iYLVIb4e; dkim=pass header.d=columbia.edu header.i=@columbia.edu header.a=rsa-sha256 header.s=lionmail header.b=QmtsIiyT; arc=none smtp.remote-ip=148.163.139.74 Received: from mx0b-00364e01.pphosted.com (mx0b-00364e01.pphosted.com [148.163.139.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5BCAF606A8A9 for ; Mon, 16 Nov 2026 23:06:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 5BCAF606A8A9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=columbia.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.a=rsa-sha256 header.s=pps01 header.b=iYLVIb4e; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.a=rsa-sha256 header.s=lionmail header.b=QmtsIiyT Received: from pps.filterd (m0499198.ppops.net [127.0.0.1]) by mx0b-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6AGLZ01I238541 for ; Mon, 16 Nov 2026 18:06:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pps01; bh=shtR RPv4sO05cfKy9jDsVgauLpUzE/l0Te4xSbg74SE=; b=iYLVIb4eyo24+udnvs3G MJgMkShakHkhAOAO9CCgFnM6i8wa3coBagtc8oRa+Lz6Z+MsbX20IDG3LJDy0vFX Z0Yjgn48CeEZWOfHZUatppMpD+9lfvTeu1uj/3fqHOBdXDNgGL9YK9AfIpsuUf6b JdLsR/VkazINFOI0UV6cZ08cE5if7g0pIqYZr6Tij0qLt8/TfT5VCHu0/nirog4e J04gsFT5b3xlACp4HxuRzGUOdy0q0fmWzSUnd1tqycWphXxfpPmPT2mfDAxLoHOg MM4XfQsJlIgAnl7FQPviBjf51Fu25cAE/NqerET3PQEQk5MvIcw/7mao9MSb59qZ Lw== Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0b-00364e01.pphosted.com (PPS) with ESMTPS id 4j059dkryp-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 16 Nov 2026 18:06:47 -0500 (EST) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-91256a7b7b3so66016936d6.2 for ; Mon, 16 Nov 2026 15:06:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1794870407; x=1795475207; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to :content-type; bh=shtRRPv4sO05cfKy9jDsVgauLpUzE/l0Te4xSbg74SE=; b=QmtsIiyT4J+a4IZ//dVKEGkqMqkLf0JvUGdVJUfIdB7tLsVvRk6oB2Q0xIngFzW4hg bZDmsDu//ZpC6SxLhY7Wz7tf5ta6W7f8QAViYzzmNtCEzlYv3kTKO+lYa2t7ShV8nOY3 /LtTnn2LtduheeAs4Oe65sUGiYt+2qD1V5Hv++TJLmO51eriXWbMDM2bHWppC5FADUx8 PrWpenCORqsY3udzEUQPMCGHNd3G+CdaQRpT1eOxBa5SUeyBMWItIkrMFIP9X5d/bged ipEEcQw+tkTLyEdkmAd52NO9nQzpdbwm2Ue+oA9iq4Jf3QyNfLcjpSKpS7VGT7NVpx4S Zn8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794870407; x=1795475207; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=shtRRPv4sO05cfKy9jDsVgauLpUzE/l0Te4xSbg74SE=; b=wmQ6EdtFXkRWKx1lB4YZzrrHk9tAH6cupgaGjmXYMvov16Ph8UnESF17U2RdvsUmPd 55PRW1AXAtgSk+hoAuJ1RgjMZBWMHwn3n5R9iQDlTIKf0Xrnm41ERR83Di+U8bJaULfk i6PQ0wKs656c5zUcEaVkO7kqzPO9DALGcHhjuZjdLHam+aodAMbdbf/UTZLUCrpbURp7 YV2Hv8NNNh5WOJb4Wp5HBr4KC9R7lc1ZxNcCCPdGKtGwPY2qjNLs/Q8IDSMTDVy84jpS KtbyihrxQvHi80EMJ34HVmXsc0AQRtpQ60gVfK1AwaHs9VMMgWlIMO+QxRjFmLJjaFSf 9hJw== X-Forwarded-Encrypted: i=1; AL+hErFejTZS05rW7SAymKJcdeQaG7Qo5P5otINXGqfoSu2uAtFxKiZGdYpEd/tL9BfoJsJcomqVpuODSlTJURo=@vger.kernel.org X-Gm-Message-State: APuU4Z/w7oyok5aSpubD8bFSc+rlmmjQi0bjXzBrSsACFf2pLCrw/BE8 9uU0PWfUg12k07AfXq1WqhPTiTnEkSt8B68sZOVbFVSXlMhbuoPSKC26H4ZgtlAg7x1BG61JSpg ifyiYYyD+geN/zaW99SYgnuXfouS7oqVCF3Q3t3xWlxDC4lGaY7NiWxMV5HyHcw== X-Gm-Gg: AZFdTZf0j4aEasMXd02Bxh1kWtu5B70OesFF/lRzaIGsRgNNjD6dC6YSufyKkaeMpCS KklzBIzPxz25aldGJExLW7YQEhAxhDZ8lQd9ulaMm2sot8/RbUsMRggN4bUvcQ5h21PgjhhTrD2 E115ZjtgSOYJx/rmO137NneymhmgVtEgXmDhKMjnYbJsNh4fcZOCTaeHdSRN1BvpUbZmf3S80gg utc2rsRe6HGXn9wkA6A+UnFNlCN6TQKxPtYuX7q9Vm2j3Pue8Q3pW1HPumHHQyFZpiroPPKlXQW 8JDFNcyHs2qE1pGvm5KvLxbvSnUBpvB6LGodD3uz177g2FbKW42FCVy3Eofu4mMf92MFCrUnP0/ h4f54agTf2yzVm+1fZJ2h//61A431dmWOvBjICyemKrVOEnMie0OerO89o6KMq36hN4uOr1lxL4 Ygz9cyR8qaChIma83ug0CDELep X-Received: by 2002:a05:6214:486:b0:91e:cb85:f84c with SMTP id 6a1803df08f44-91f241ce6admr203454866d6.27.1794870407379; Mon, 16 Nov 2026 15:06:47 -0800 (PST) X-Received: by 2002:a05:6214:486:b0:91e:cb85:f84c with SMTP id 6a1803df08f44-91f241ce6admr203453936d6.27.1794870406649; Mon, 16 Nov 2026 15:06:46 -0800 (PST) Received: from [10.207.2.125] (nat-128-59-176-174.net.columbia.edu. [128.59.176.174]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-91f23d459c6sm97731756d6.14.2026.11.16.15.06.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Nov 2026 15:06:46 -0800 (PST) Message-ID: <71aa028f-c753-40d5-a8e4-8daef5aea3aa@columbia.edu> Date: Mon, 16 Nov 2026 18:06:44 -0500 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: "David Hildenbrand (Arm)" , 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> Content-Language: en-US From: Tal Zussman In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: rz9QnTMDL_Q7mZhNeXKVRQeufI183Hlv X-Authority-Analysis: v=2.4 cv=Utf2pOwB c=1 sm=1 tr=0 ts=6afb8c88 cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=KPY1cyGZ6h6m4ASiENTC8Q==:17 a=IkcTkHD0fZMA:10 a=zJRp6_cAMcgA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=BpGzv1V74M3SfeTrGa8v:22 a=QyXUC8HyAAAA:8 a=20KFwNOVAAAA:8 a=VwQbUJbxAAAA:8 a=zd2uoN0lAAAA:8 a=9jRdOu3wAAAA:8 a=e5mUnYsNAAAA:8 a=Ikd4Dj_1AAAA:8 a=zEWuSTdDNGilpxNPLJEA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=pJ04lnu7RYOZP9TFuWaZ:22 a=ZE6KLimJVUuLrTuGpvhn:22 a=Vxmtnl_E_bksehYqCbjh:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMTE2MDA5MiBTYWx0ZWRfX+3m+He/LRFHD bB45knQTwKiKrSZ2PZdD4Jg//My8F8YuhGcj7s+IvpYorSnoeSs3PiuZbnucBXrR98eH9pbmPoG iYzAIMsBMoQh2q7YOKLa3paqquhCNR61b6+LD48kr/wggERRLyNb26ewqx4DiGwMGDnwJC5t2Wg v8B7F/25PGekfJZ3C05XW8VAoUXnygjBjCLlC+ldFmYuJ7mfxDpgtThSNLkIF80Kx1RspbEP8Is pnqA+/LijBHq7OXdocGtOum47iYcuQeZB7tV7oBjfOhiJibWyLxOlO2GsX7Yh+yPHEAbyIhcA7W kEJRA1yP8TrTKTk3f0elsWt9vOsftVCIx3ZRY6uUNLAWB356cFEFT5jO3KOT00XGeTgpGoZqcUv hCKDrgPzl9F98hnN704917XDffS6QvOirua6E2xOwNDELcVAwWgoXZwfI3E/QPaj+AbCEw8xwZX S2cFAN0c1B4+N+rlwUQ== X-Proofpoint-Spam-Info: AW1haW4tMjYxMTE2MDA5MiBTYWx0ZWRfX199KNS7acLpJ OuihUFTtItMyaucQh9VZU4a4MQSEF9/BITB+wtxL6YECmuPNd1l+maAA7jUcLaDqCLQSd8Q1Odv VlZHP/j/lzSiY3jNFFtGmtOvYFpfpGUfVurygFejXlz1VkNyvBk9 X-Proofpoint-ORIG-GUID: rz9QnTMDL_Q7mZhNeXKVRQeufI183Hlv X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11968 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 priorityscore=1501 bulkscore=10 spamscore=0 adultscore=0 clxscore=1015 impostorscore=10 suspectscore=0 lowpriorityscore=10 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2611040001 definitions=main-2611160092 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. > > -- > Cheers, > > David >