From: "Huang\, Ying" <ying.huang@intel.com>
To: Mikhail Gavrilov <mikhail.v.gavrilov@gmail.com>
Cc: huang ying <huang.ying.caritas@gmail.com>,
Linux List Kernel Mailing <linux-kernel@vger.kernel.org>,
<linux-mm@kvack.org>
Subject: Re: kernel BUG at mm/swap_state.c:170!
Date: Tue, 23 Jul 2019 13:08:42 +0800 [thread overview]
Message-ID: <87zhl59w2t.fsf@yhuang-dev.intel.com> (raw)
In-Reply-To: <CABXGCsOhimxC17j=jApoty-o1roRhKYoe+oiqDZ3c1s2r3QxFw@mail.gmail.com> (Mikhail Gavrilov's message of "Mon, 22 Jul 2019 12:56:18 +0500")
Mikhail Gavrilov <mikhail.v.gavrilov@gmail.com> writes:
> On Mon, 22 Jul 2019 at 12:53, Huang, Ying <ying.huang@intel.com> wrote:
>>
>> Yes. This is quite complex. Is the transparent huge page enabled in
>> your system? You can check the output of
>>
>> $ cat /sys/kernel/mm/transparent_hugepage/enabled
>
> always [madvise] never
>
>> And, whether is the swap device you use a SSD or NVMe disk (not HDD)?
>
> NVMe INTEL Optane 905P SSDPE21D480GAM3
Thanks! I have found another (easier way) to reproduce the panic.
Could you try the below patch on top of v5.2-rc2? It can fix the panic
for me.
Best Regards,
Huang, Ying
-----------------------------------8<----------------------------------
From 5e519c2de54b9fd4b32b7a59e47ce7f94beb8845 Mon Sep 17 00:00:00 2001
From: Huang Ying <ying.huang@intel.com>
Date: Tue, 23 Jul 2019 08:49:57 +0800
Subject: [PATCH] dbg xa head
---
mm/huge_memory.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 9f8bce9a6b32..c6ca1c7157ed 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2482,6 +2482,8 @@ static void __split_huge_page(struct page *page, struct list_head *list,
struct page *head = compound_head(page);
pg_data_t *pgdat = page_pgdat(head);
struct lruvec *lruvec;
+ struct address_space *swap_cache = NULL;
+ unsigned long offset;
int i;
lruvec = mem_cgroup_page_lruvec(head, pgdat);
@@ -2489,6 +2491,14 @@ static void __split_huge_page(struct page *page, struct list_head *list,
/* complete memcg works before add pages to LRU */
mem_cgroup_split_huge_fixup(head);
+ if (PageAnon(head) && PageSwapCache(head)) {
+ swp_entry_t entry = { .val = page_private(head) };
+
+ offset = swp_offset(entry);
+ swap_cache = swap_address_space(entry);
+ xa_lock(&swap_cache->i_pages);
+ }
+
for (i = HPAGE_PMD_NR - 1; i >= 1; i--) {
__split_huge_page_tail(head, i, lruvec, list);
/* Some pages can be beyond i_size: drop them from page cache */
@@ -2501,6 +2511,9 @@ static void __split_huge_page(struct page *page, struct list_head *list,
} else if (!PageAnon(page)) {
__xa_store(&head->mapping->i_pages, head[i].index,
head + i, 0);
+ } else if (swap_cache) {
+ __xa_store(&swap_cache->i_pages, offset + i,
+ head + i, 0);
}
}
@@ -2508,9 +2521,10 @@ static void __split_huge_page(struct page *page, struct list_head *list,
/* See comment in __split_huge_page_tail() */
if (PageAnon(head)) {
/* Additional pin to swap cache */
- if (PageSwapCache(head))
+ if (PageSwapCache(head)) {
page_ref_add(head, 2);
- else
+ xa_unlock(&swap_cache->i_pages);
+ } else
page_ref_inc(head);
} else {
/* Additional pin to page cache */
--
2.20.1
next prev parent reply other threads:[~2019-07-23 5:08 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-29 4:05 kernel BUG at mm/swap_state.c:170! Mikhail Gavrilov
2019-05-29 17:32 ` Mikhail Gavrilov
2019-05-29 18:09 ` Michal Hocko
2019-05-29 19:28 ` Mikhail Gavrilov
2019-06-05 20:07 ` Mikhail Gavrilov
2019-06-11 3:59 ` Mikhail Gavrilov
2019-06-16 10:12 ` Mikhail Gavrilov
2019-06-17 12:17 ` Vlastimil Babka
2019-06-17 20:09 ` Mikhail Gavrilov
2019-06-30 21:15 ` Mikhail Gavrilov
2019-07-05 15:19 ` Mikhail Gavrilov
2019-07-05 23:03 ` Jan Kara
2019-07-06 2:39 ` Linus Torvalds
2019-06-17 12:47 ` Vlastimil Babka
2019-07-22 1:37 ` huang ying
2019-07-22 7:31 ` Mikhail Gavrilov
2019-07-22 7:52 ` Huang, Ying
2019-07-22 7:56 ` Mikhail Gavrilov
2019-07-23 5:08 ` Huang, Ying [this message]
2019-07-25 6:17 ` Mikhail Gavrilov
2019-07-25 7:14 ` Huang, Ying
2019-07-25 11:44 ` Matthew Wilcox
2019-07-26 3:20 ` Huang, Ying
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=87zhl59w2t.fsf@yhuang-dev.intel.com \
--to=ying.huang@intel.com \
--cc=huang.ying.caritas@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mikhail.v.gavrilov@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 NNTP newsgroup(s).