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=1794048900; b=oEjwG3Lj4rQKTRX5eCyOJv84ocTjDJSlSt+uMv25dLOmPOQMATZl2anRd2zuOUYBQu4l G30jHurDtzWJu98p70SwwzeWuV+qmuVPAziXRfWkKfaPEpyy5wrMVikiHRKCljY9woZ1j gevMJthWkrWi44qmYvYOr40RyXlWY77rM2XufYTUs7NXg9TikNSSP/YZuLUaxedgU4q8N F5pvltvguGx2xVtfcR2a4zAXhZiZZpkpG2G+QC73pQTy0fWeohQMLvoqe1+PdFxBadxuT TVTCKqzriqk/ApcfRBMSTCmr2J3ai1LvQpCFRLXyBQ7BLValNroX70mGYyKitdo0vYw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794048900; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=6q2BfLNlDWyfH47sdUzJJOXFnNf+HdLY6+gEnOjdosI=; b=VQRC4EM8wDEUm6efpt04ROLEsMcqWK43LgbjO7p5PKljENCkUtz05lL4wEZ3dUdEqQwv Y7ZE+ZIQ7qH2kKIWEyG+JdwRiX0XnGkIC/whD653UNqYPoqbHUPWelsU0a2tZd5jfPfRD 9tBNKrUqlKquDl4PfL6CoEoYPTmgVQ6k/PcIImtaREuqwgkkxCsxrKURVkclOa7czZ6K7 qe7SI3YF1HSSDgUs6imu31b5HR/ECLtKaP5KLQzntSv2KU5Xo43V6gr10mxKrftwZBNMe 6gthcgEGedXVdlgbs56veYrrVINMpXncDPNsuqD0KgC18KjMuW7UrjvksF/hRiCZPbg== 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=ZTXrTO80; 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 681AF606A326 for ; Sat, 7 Nov 2026 10:55:00 +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=ZTXrTO80 Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF31B1F0089F; Sat, 7 Nov 2026 10:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794048900; bh=6q2BfLNlDWyfH47sdUzJJOXFnNf+HdLY6+gEnOjdosI=; h=From:To:Cc:Subject:Date; b=ZTXrTO804otmqX6CDzaME0N8JGhRakoymXxosEhy5PDKOlP4/emMRZ9WNy4LFiDNG U045UIO5H3ClZh+9jZ1kD5ucXp897OsU4MlZHftQi07DU4mfPISxJv69dyk70lC68q H+87NTJ6BxzuRJKbTRdgZb8q/LzmL+leO0bixuiSMjIRu+zLm9GbO3ibhWYGT5dvM6 1mmX4A/uoWXFaLsaT9aAlROdYpaIBk0SFcRjYU5puWboiKZBkIjoFlVlLHYPLNRYf3 dC7IcbHS90jLkiVCrwiNPhMPRFbCOT7m0w+at0LXdWIvxzy0Ddlx917tKEKLarO/Gw hljdPGgZw/Jzw== From: Sasha Levin To: ljs@kernel.org, akpm@linux-foundation.org, shawnq1@163.com, kas@kernel.org, gourry@gourry.net, xueyuan.chen21@gmail.com, liam@infradead.org, vbabka@kernel.org, jannh@google.com, pfalcato@suse.de, rppt@linux.vnet.ibm.com, peterx@redhat.com, david@kernel.org Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] mm/vma: avoid broken uffd merge on mremap" failed to apply to 6.1-stable tree Date: Sat, 7 Nov 2026 05:54:57 -0500 Message-ID: <20261107055457-failed-6.1-68cb098eadda@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 68cb098eadda190783f8f8bdf9fe764df59f7d32 # git commit -s git send-email --to '' --in-reply-to '20261107055457-failed-6.1-68cb098eadda@kernel.org' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 68cb098eadda190783f8f8bdf9fe764df59f7d32 Mon Sep 17 00:00:00 2001 From: "Lorenzo Stoakes (ARM)" Date: Tue, 20 Oct 2026 15:55:30 +0100 Subject: [PATCH] mm/vma: avoid broken uffd merge on mremap Userfaultfd often causes unexpected interactions within mm, and does so at the intersection of uffd, mremap() and VMA merging. When an mremap of a VMA occurs, copy_vma_and_data() calls mremap_userfaultfd_prep() to notify uffd of this. However, mremap_userfaultfd_prep() simply drops the UFFD context for the VMA if the user did not register it for remap, i.e. didn't specify the UFFD_FEATURE_EVENT_REMAP flag. This is OK for the VMA itself, as upon page table move, move_ptes() clears UFFD page table flags, using vma_has_uffd_without_event_remap() to determine whether to do so. However, this doesn't account for merging with adjacent VMAs, whose page tables won't have received this treatment, and thus latent UFFD markers will be left around. Worse, it'll break UFFD for any VMAs it is merged with. This is very surprising behaviour for a user, who will then simply not receive UFFD events for VMAs they ought to. Resolve the issue by explicitly checking for this case via vma_has_uffd_without_event_remap() in vma_merge_copied_range(), the merge function explicitly designated for mremap() operations. Also update the userland VMA tests accordingly. Link: https://lore.kernel.org/20261020-uffd-remap-fix-v1-1-0f34fc181f0a@kernel.org Fixes: 3cfd22be0ad6 ("userfaultfd: clear flag if remap event not enabled") Signed-off-by: Lorenzo Stoakes (ARM) Signed-off-by: Andrew Morton Reported-by: shaos Closes: https://lore.kernel.org/all/20261020110748.959870-1-shawnq1@163.com/ Reviewed-by: Kiryl Shutsemau (Meta) Reviewed-by: Gregory Price (Meta) Reviewed-by: Xueyuan Chen Cc: Liam R. Howlett Cc: Vlastimil Babka Cc: Jann Horn Cc: Pedro Falcato Cc: Mike Rapoport Cc: Peter Xu Cc: David Hildenbrand Cc: --- mm/vma.c | 5 +++++ tools/testing/vma/include/stubs.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/mm/vma.c b/mm/vma.c index de5ebc57e7a58..1be613044b4a5 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -1211,6 +1211,11 @@ static struct vm_area_struct *vma_merge_copied_range(struct vma_merge_struct *vm vmg->copied_from = vmg->middle; vmg->middle = NULL; + + /* If not registered for remap, uffd context will be cleared. */ + if (vma_has_uffd_without_event_remap(vmg->copied_from)) + return NULL; + return vma_merge_new_range(vmg); } diff --git a/tools/testing/vma/include/stubs.h b/tools/testing/vma/include/stubs.h index be8f5161f92a2..f786a585caf05 100644 --- a/tools/testing/vma/include/stubs.h +++ b/tools/testing/vma/include/stubs.h @@ -386,6 +386,11 @@ static inline bool is_mergeable_vm_userfaultfd_ctx(struct vm_area_struct *vma, return true; } +static inline bool vma_has_uffd_without_event_remap(struct vm_area_struct *vma) +{ + return false; +} + static inline bool anon_vma_name_eq(struct anon_vma_name *anon_name1, struct anon_vma_name *anon_name2) { -- 2.53.0