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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DAE9C47DD9 for ; Sat, 30 Mar 2024 09:20:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AF8956B009A; Sat, 30 Mar 2024 05:20:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AA9086B009B; Sat, 30 Mar 2024 05:20:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 971EC6B009C; Sat, 30 Mar 2024 05:20:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 74CD76B009A for ; Sat, 30 Mar 2024 05:20:42 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 0357AA1AD0 for ; Sat, 30 Mar 2024 09:20:41 +0000 (UTC) X-FDA: 81953160324.15.2D6BBCE Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf27.hostedemail.com (Postfix) with ESMTP id 5202240016 for ; Sat, 30 Mar 2024 09:20:40 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=oagKuOpm; spf=pass (imf27.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711790440; a=rsa-sha256; cv=none; b=rAMmW2Ue+fgSVZcjOvpVjCpoXZ+PdOHREyxWJewuWv1Fi7gNXVkmUNICEtGLkTEhHWdp4m FoeyaZtiAvfjQtxIE8Ji0lCYlc3FoX8GcTkLiy0UObKX5SJ2LXlHWDryf/ytp6LwWibNsA va4YKgMrT7gxVpGmvg9d+DXW0Vp+h8I= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=oagKuOpm; spf=pass (imf27.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711790440; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:dkim-signature; bh=HDiOVHFSjJbjfJvDjproQ6N3n73qZ/2+/P9ZzU6pNUI=; b=YdNHRwSLTGaL6+F8PL7aemMB0K9nxky4JmPqF0n8E0LByCK0WbOr7bPO33FUpju5ZjJbGp 2+1+dtgLsl/nRbNQfGvvRS61bR4nC+njY1spI/3aOiT90pG0zZd7zQihBR0Vt6okZ3YpH1 0pIPM8htOspSFXG4e3fw1pvIWfooADE= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8858A60EBD; Sat, 30 Mar 2024 09:20:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D254AC43390; Sat, 30 Mar 2024 09:20:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711790439; bh=h5fRk33QOxphA0E81zxTgEx4Jdc9vXJEJovtEafO6PU=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=oagKuOpmqtfpvg04r7DvydMV9D2qvMq+mlMGhGQcJkkw/w0gt/L4ukilEkbVeT2cm C0W7voB+cfCqUZHHa8pkN6aYVxUIfmUv6BdGsgDT8Hr6WIZYfiX3MglXfJ9Kaum4U4 7sNGgcHPLm9uOoK6ETzzjIy1rPRQ7i4s0CeYei1g= Subject: Patch "mm/migrate: set swap entry values of THP tail pages properly." has been added to the 5.10-stable tree To: 1707814102-22682-1-git-send-email-quic_charante@quicinc.com,akpm@linux-foundation.org,david@redhat.com,gregkh@linuxfoundation.org,linux-mm@kvack.org,naoya.horiguchi@linux.dev,quic_charante@quicinc.com,willy@infradead.org,ying.huang@intel.com,zi.yan@sent.com,ziy@nvidia.com Cc: From: Date: Sat, 30 Mar 2024 10:20:30 +0100 In-Reply-To: <20240306155135.118231-1-zi.yan@sent.com> Message-ID: <2024033030-choosy-waggle-a021@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 5202240016 X-Stat-Signature: ued7czd6njc5ktzjji9fn9i565dgx79r X-Rspam-User: X-HE-Tag: 1711790440-854518 X-HE-Meta: U2FsdGVkX1+rq1+ruisxTIK1LaQspKkolR+E/UwO/kP4swDuxrhnbX0/mpmc6zRHBZZysayjH98wiVMUSJFWk7OeUJzVsgnsEwlqaosxfA1/70t4CpNAyGzThsmOfHpSXfwh64ZmNJUIUc+9eVY9+DMr1pR1Hp9MRp4W3iEpkf/LtGM1WjCNJGpYv0I35iR+VxsS05FppR551YrCBmsDhQDshH1BHxMbDg+K+ogB8u0fsZicy2LqBx5Y80L5oa2pHoAx5r9uLv7n7dm0MKbMZ9HwGrQq3PxB63WE3pGzrobZMCYo1JDc+Bn+EjlkmIrRgW++jX/4xTbgRR9frsETKhjGGMMAjLROIzpNicCMgNhe+egpNP2PcbOC4UydSmtf5c7Vci6A2hL0AtdrlfE8IOwPm4EGR+j/n3n94lqNG6DJBmBJnO16ygZj0W9Z2lyDGcdj2W4mbw9c5q4WcFGMSs6jPBUsIdHaaKMX21MId13lXcTZl4P1FIarXftigHF/5RZ4CnLwOKBrCcs9zY53afsYSyr3M9NwCu3SWpBAHHHkAxw8kEmGSS4wEUtXkSYAmeZo/nlu9KSkdYepHbEZQo+nYpveOy7izjxGJpqSCkisKdSckLuhn/fMj4iGUq9PCQigdWFt5nEMvo4MMiTB/R1fyIXnB41nJaYAj0cP9wCLd7AMVXPIZ34loyFKO2hDm3uTFZrVXtOcrBi72xb+FkyZG3gR3QRZoLY83F2vg2C5eBmMZTQOZdkFRqEQFetdHHG4Q1wkjoeVHGsex1P3ZvxtGYYewAa5b+/d9h2gSO2MVBW7GpFSgIWqGP8vCT3UQCrMtLqqUr/ouZLuNRwjDte8EMo+xCX5srFL81AXZBdlGmCHQUKvIQlJ7GeK8z2LHXvu/TbJHfj+ML1+M9yA/iZ7n1DfuzLq6tJxhy/kP3sqkrzbMrQHdclsIb0UR4V9Qyu0+zc9lHXVXaghnd8 bHfwHwf+ HD37I9Qj418C76yILg8O1ZMEDtKVwWo5N3U2FUtMvEOoUzI7syZdlr6Y65WBlbkz6uJ8fbVblvJ4sud2hDS8rfG9K3RUoAb7TWbVFLFstokUb7ok+oIf8RyYmaN7JxCmhOJ/TWlm6osXMVpbZb+TA30ZnMUmuuqplLwOOfdtAfD2pJ80/BRHiqkLyQ8iLZsRT0yrAB5ruFJ+gYnzeBIYMni7tMM+TJv4cd4ll7KA3XpPBO6zvrZjnlZ5wvaP5O2rfQBjhMgDjseVTckVUNuJYkw7Rd4fIIroxWmaxb0PhVsIdSzoDJHmcoIyD+cLJFtUvmBoyOHKoMnbvBlLBeN7oWcdtWMHiKlqDAVM2CgMLInCQG1gJJN63U3743HfKoEqUv8rEtXR8gUlnPotjCvXfNXwmVFopDQ7v58wzBBlfQDdfPNEVUD4EC8Tx5irD9uZdcGIfXcwAh1Boys2r8sGG4DDAMDYWqKcHEDdjXxf/321KZcwc4MTXyznAFjL93hksHB4Ay520y47kPdTPO1yCHcmEtikeyTU4jRdFfqo0/LQowRvrVLXZrzcNjqBr/9/7xCyl+d4xpxLAZFvEs6wsC3RIc7LvVeXDwP+5sRc79ido5XeRIRvmbhvri1647G9UkhkwWDHMexSTNkLj3RAipQ91HhQOti5a/PG03DLxDIYQjUBu6PiDGhdtegVQ0eF0Zzw+ X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: This is a note to let you know that I've just added the patch titled mm/migrate: set swap entry values of THP tail pages properly. to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mm-migrate-set-swap-entry-values-of-thp-tail-pages-properly.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From stable+bounces-26999-greg=kroah.com@vger.kernel.org Wed Mar 6 16:51:44 2024 From: Zi Yan Date: Wed, 6 Mar 2024 10:51:35 -0500 Subject: mm/migrate: set swap entry values of THP tail pages properly. To: gregkh@linuxfoundation.org, stable@vger.kernel.org Cc: Zi Yan , linux-mm@kvack.org, Charan Teja Kalla , "Matthew Wilcox (Oracle)" , David Hildenbrand , Andrew Morton , Huang Ying , Naoya Horiguchi Message-ID: <20240306155135.118231-1-zi.yan@sent.com> From: Zi Yan The tail pages in a THP can have swap entry information stored in their private field. When migrating to a new page, all tail pages of the new page need to update ->private to avoid future data corruption. This fix is stable-only, since after commit 07e09c483cbe ("mm/huge_memory: work on folio->swap instead of page->private when splitting folio"), subpages of a swapcached THP no longer requires the maintenance. Adding THPs to the swapcache was introduced in commit 38d8b4e6bdc87 ("mm, THP, swap: delay splitting THP during swap out"), where each subpage of a THP added to the swapcache had its own swapcache entry and required the ->private field to point to the correct swapcache entry. Later, when THP migration functionality was implemented in commit 616b8371539a6 ("mm: thp: enable thp migration in generic path"), it initially did not handle the subpages of swapcached THPs, failing to update their ->private fields or replace the subpage pointers in the swapcache. Subsequently, commit e71769ae5260 ("mm: enable thp migration for shmem thp") addressed the swapcache update aspect. This patch fixes the update of subpage ->private fields. Closes: https://lore.kernel.org/linux-mm/1707814102-22682-1-git-send-email-quic_charante@quicinc.com/ Fixes: 616b8371539a ("mm: thp: enable thp migration in generic path") Signed-off-by: Zi Yan Acked-by: David Hildenbrand Signed-off-by: Greg Kroah-Hartman --- mm/migrate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/mm/migrate.c +++ b/mm/migrate.c @@ -447,8 +447,12 @@ int migrate_page_move_mapping(struct add if (PageSwapBacked(page)) { __SetPageSwapBacked(newpage); if (PageSwapCache(page)) { + int i; + SetPageSwapCache(newpage); - set_page_private(newpage, page_private(page)); + for (i = 0; i < (1 << compound_order(page)); i++) + set_page_private(newpage + i, + page_private(page + i)); } } else { VM_BUG_ON_PAGE(PageSwapCache(page), page); Patches currently in stable-queue which might be from kroah.com@vger.kernel.org are queue-5.10/x86-rfds-mitigate-register-file-data-sampling-rfds.patch queue-5.10/x86-entry_32-add-verw-just-before-userspace-transition.patch queue-5.10/x86-bugs-add-asm-helpers-for-executing-verw.patch queue-5.10/kvm-x86-export-rfds_no-and-rfds_clear-to-guests.patch queue-5.10/x86-asm-add-_asm_rip-macro-for-x86-64-rip-suffix.patch queue-5.10/x86-entry_64-add-verw-just-before-userspace-transition.patch queue-5.10/x86-mmio-disable-kvm-mitigation-when-x86_feature_clear_cpu_buf-is-set.patch queue-5.10/x86-bugs-use-alternative-instead-of-mds_user_clear-static-key.patch queue-5.10/documentation-hw-vuln-add-documentation-for-rfds.patch queue-5.10/kvm-vmx-use-bt-jnc-i.e.-eflags.cf-to-select-vmresume-vs.-vmlaunch.patch queue-5.10/mm-migrate-set-swap-entry-values-of-thp-tail-pages-properly.patch queue-5.10/kvm-vmx-move-verw-closer-to-vmentry-for-mds-mitigation.patch