From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org,nao.horiguchi@gmail.com,linmiaohe@huawei.com,jane.chu@oracle.com,akpm@linux-foundation.org,akpm@linux-foundation.org
Subject: [folded-merged] mm-memory-failure-send-sigbus-in-the-event-of-thp-split-fail-fix.patch removed from -mm tree
Date: Wed, 08 May 2024 10:23:27 -0700 [thread overview]
Message-ID: <20240508172328.58035C113CC@smtp.kernel.org> (raw)
The quilt patch titled
Subject: mm-memory-failure-send-sigbus-in-the-event-of-thp-split-fail-fix
has been removed from the -mm tree. Its filename was
mm-memory-failure-send-sigbus-in-the-event-of-thp-split-fail-fix.patch
This patch was dropped because it was folded into mm-memory-failure-send-sigbus-in-the-event-of-thp-split-fail.patch
------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-memory-failure-send-sigbus-in-the-event-of-thp-split-fail-fix
Date: Thu May 2 04:07:39 PM PDT 2024
update for folio conversions
Cc: Jane Chu <jane.chu@oracle.com>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/memory-failure.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- a/mm/memory-failure.c~mm-memory-failure-send-sigbus-in-the-event-of-thp-split-fail-fix
+++ a/mm/memory-failure.c
@@ -2170,16 +2170,15 @@ out:
* election for MCE early killed will be honored.
*/
static int kill_procs_now(struct page *p, unsigned long pfn, int flags,
- struct page *hpage)
+ struct folio *folio)
{
- struct folio *folio = page_folio(hpage);
LIST_HEAD(tokill);
int res = -EHWPOISON;
/* deal with user pages only */
if (PageReserved(p) || PageSlab(p) || PageTable(p) || PageOffline(p))
res = -EBUSY;
- if (!(PageLRU(hpage) || PageHuge(p)))
+ if (!(folio_test_lru(folio) || PageHuge(p)))
res = -EBUSY;
if (res == -EHWPOISON) {
@@ -2324,7 +2323,7 @@ try_again:
if (try_to_split_thp_page(p) < 0) {
if (flags & MF_ACTION_REQUIRED) {
pr_err("%#lx: thp split failed\n", pfn);
- res = kill_procs_now(p, pfn, flags, hpage);
+ res = kill_procs_now(p, pfn, flags, folio);
goto unlock_mutex;
}
res = action_result(pfn, MF_MSG_UNSPLIT_THP, MF_IGNORED);
_
Patches currently in -mm which might be from akpm@linux-foundation.org are
mm-memory-failure-send-sigbus-in-the-event-of-thp-split-fail.patch
__mod_memcg_lruvec_state-enhance-diagnostics.patch
__mod_memcg_lruvec_state-enhance-diagnostics-fix.patch
reply other threads:[~2024-05-08 17:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20240508172328.58035C113CC@smtp.kernel.org \
--to=akpm@linux-foundation.org \
--cc=jane.chu@oracle.com \
--cc=linmiaohe@huawei.com \
--cc=mm-commits@vger.kernel.org \
--cc=nao.horiguchi@gmail.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 read-only IMAP folder(s) and NNTP newsgroup(s).