From: <gregkh@linuxfoundation.org>
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: <stable-commits@vger.kernel.org>
Subject: Patch "mm/migrate: set swap entry values of THP tail pages properly." has been added to the 6.1-stable tree
Date: Sat, 30 Mar 2024 10:20:50 +0100 [thread overview]
Message-ID: <2024033050-reconcile-qualified-63fe@gregkh> (raw)
In-Reply-To: <20240306155217.118467-1-zi.yan@sent.com>
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 6.1-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-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
From stable+bounces-27001-greg=kroah.com@vger.kernel.org Wed Mar 6 16:52:30 2024
From: Zi Yan <zi.yan@sent.com>
Date: Wed, 6 Mar 2024 10:52:17 -0500
Subject: mm/migrate: set swap entry values of THP tail pages properly.
To: gregkh@linuxfoundation.org, stable@vger.kernel.org
Cc: Zi Yan <ziy@nvidia.com>, linux-mm@kvack.org, Charan Teja Kalla <quic_charante@quicinc.com>, "Matthew Wilcox (Oracle)" <willy@infradead.org>, David Hildenbrand <david@redhat.com>, Andrew Morton <akpm@linux-foundation.org>, Huang Ying <ying.huang@intel.com>, Naoya Horiguchi <naoya.horiguchi@linux.dev>
Message-ID: <20240306155217.118467-1-zi.yan@sent.com>
From: Zi Yan <ziy@nvidia.com>
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 <ziy@nvidia.com>
Acked-by: David Hildenbrand <david@redhat.com>
Reported-and-tested-by: Charan Teja Kalla <quic_charante@quicinc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
mm/migrate.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -423,8 +423,12 @@ int folio_migrate_mapping(struct address
if (folio_test_swapbacked(folio)) {
__folio_set_swapbacked(newfolio);
if (folio_test_swapcache(folio)) {
+ int i;
+
folio_set_swapcache(newfolio);
- newfolio->private = folio_get_private(folio);
+ for (i = 0; i < nr; i++)
+ set_page_private(folio_page(newfolio, i),
+ page_private(folio_page(folio, i)));
}
entries = nr;
} else {
Patches currently in stable-queue which might be from kroah.com@vger.kernel.org are
queue-6.1/vfio-pci-create-persistent-intx-handler.patch
queue-6.1/vfio-fsl-mc-block-calling-interrupt-handler-without-trigger.patch
queue-6.1/vfio-pci-disable-auto-enable-of-exclusive-intx-irq.patch
queue-6.1/vfio-introduce-interface-to-flush-virqfd-inject-workqueue.patch
queue-6.1/mm-migrate-set-swap-entry-values-of-thp-tail-pages-properly.patch
queue-6.1/vfio-platform-create-persistent-irq-handlers.patch
prev parent reply other threads:[~2024-03-30 9:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-06 15:52 [PATCH STABLE v6.1.y] mm/migrate: set swap entry values of THP tail pages properly Zi Yan
2024-03-13 11:23 ` Charan Teja Kalla
2024-03-30 9:20 ` gregkh [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2024033050-reconcile-qualified-63fe@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=1707814102-22682-1-git-send-email-quic_charante@quicinc.com \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=linux-mm@kvack.org \
--cc=naoya.horiguchi@linux.dev \
--cc=quic_charante@quicinc.com \
--cc=stable-commits@vger.kernel.org \
--cc=willy@infradead.org \
--cc=ying.huang@intel.com \
--cc=zi.yan@sent.com \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).