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=1795059938; b=MoEhkF4+WSl8hnLIaWzqyGdcGgjGD/NIodQynTeP/voxB4F0+k8xJAV/zg5xOVNPVloT 3czdvkqa+5s924Of3pcQ1MjsiQfZ3+vIFGa7zgwwVoVo4vJpj+zpUvuARVXOm5iszLtLP OBuvD+n3hpt7MsBLmVDrZtBTTpOGFfyIZ/3vQgFFiHs9h3KGQCPoZoqaeE276h79OHdtz yMOcB+VfVkORAM/XhNJZ3XF8MPZVVbr2hoa+9DVNyeHFq7uttQS+JlkWD9xVCg6Xfcjac UIS1B/EBxVAy4ZsL3u62xnnPN8CsppCUeMU0Q8/kll+kJ6xzVDKD3qLeUitAxAIGb3Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795059938; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=vXTrVHXsd2PNfcALKi8G6EZYs/TmrpDXpS+F3AlNAYE=; b=FrPrIDTVCMpAziOI5369oTHr/kk4YJQYHXsdjzYZ7vFx3M5rg3m4YvPWmD+z2rIwbzc6 VVUf0igkQ4/OIBb9QB8lENm8YQEtfhzs4U74XIi4VwlLkJ/MA5WgNIvWgM8YD4zn0ptl1 e6Xu90FVUJllguSoP3pbJfWz4MIo/3rxTN0Tku5gpLFpXr34PNAx49ZTe5WIFoXTqgWBG wBpu3B565cwvtnuO06MWbDU3TEdkteeXiGgoXggVh5LiD3Gpn0eHrH8utDNpcOMjIr0H3 If2JGRNI8vC2Pv3zsEmcpLNxzZ0vgqv1uDMEIDh7eKV4yTNUjjAD92i/S8IhUu4UBIQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="jMXfRO/P"; 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 87E0F606A325; Thu, 19 Nov 2026 03:45:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=jMXfRO/P Received: by smtp.kernel.org (Postfix) with ESMTPSA id E88221F000C5; Thu, 19 Nov 2026 03:45:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795059938; bh=vXTrVHXsd2PNfcALKi8G6EZYs/TmrpDXpS+F3AlNAYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jMXfRO/PECJCWi6j3vWyEpp8FCUQ2tvufJY5TaIoP4T9SUFw+i6nhpIVfcD3OOo6B T7xnV/bwKef6TZ2h4vt3ePOYne5xew64IwvVTWbv9XxzfA1sBldjk3YZx8qOq1KWxI /RTymr7Tkt187jmp7mxrGtBYGtj+eO5gyZLwRQdo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Samarth Narang , Andrew Morton , Lance Yang , "David Hildenbrand (Arm)" , Xu Xin , Chengming Zhou , Peter Xu , Kiryl Shutsemau , Mike Rapoport , Sasha Levin Subject: [PATCH 5.10 0979/1848] mm/ksm: keep soft-dirty when merging a page Date: Wed, 18 Nov 2026 15:50:17 +0100 Message-ID: <20261118145957.920077992@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore 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-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Samarth Narang [ Upstream commit 2efc6332f18bfd848f74f3d5ba45b31450601faa ] replace_page() maps the KSM page with a PTE built from scratch, so the soft-dirty bit of the PTE it replaces is lost. A page written since "clear_refs 4" then no longer shows as soft-dirty once it is merged, and a soft-dirty based dumper treats it as unchanged. Copy the soft-dirty bit from the original PTE to the new PTE. Link: https://lore.kernel.org/20261021182157.1873726-1-samarth.colleges@gmail.com Fixes: 0f8975ec4db2 ("mm: soft-dirty bits for user memory changes tracking") Signed-off-by: Samarth Narang Signed-off-by: Andrew Morton Reviewed-by: Lance Yang Acked-by: David Hildenbrand (Arm) Assisted-by: LLM Cc: Xu Xin Cc: Chengming Zhou Cc: Peter Xu Cc: Kiryl Shutsemau Cc: Mike Rapoport Cc: [ sashal: adjusted context for direct *ptep access instead of ptep_get(ptep) ] Signed-off-by: Sasha Levin --- mm/ksm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mm/ksm.c b/mm/ksm.c index 466ca19997551..bc097bb03c1c2 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1170,6 +1170,10 @@ static int replace_page(struct vm_area_struct *vma, struct page *page, dec_mm_counter(mm, MM_ANONPAGES); } + /* Preserve soft-dirty when replacing the page. */ + if (pte_soft_dirty(orig_pte)) + newpte = pte_mksoft_dirty(newpte); + flush_cache_page(vma, addr, pte_pfn(*ptep)); /* * No need to notify as we are replacing a read only page with another -- 2.53.0