From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Naoya Horiguchi <naoya.horiguchi@nec.com>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Miaohe Lin <linmiaohe@huawei.com>, <linux-mm@kvack.org>,
<linux-kernel@vger.kernel.org>,
Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH 2/3] mm: memory-failure: avoid pfn_valid() twice in soft_offline_page()
Date: Fri, 21 Oct 2022 16:46:10 +0800 [thread overview]
Message-ID: <20221021084611.53765-2-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20221021084611.53765-1-wangkefeng.wang@huawei.com>
Simplify WARN_ON_ONCE(flags & MF_COUNT_INCREASED) under !pfn_valid().
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
mm/memory-failure.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index b94152abb1c9..ca0199d0f79d 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -2554,10 +2554,10 @@ int soft_offline_page(unsigned long pfn, int flags)
bool try_again = true;
struct page *page;
- WARN_ON_ONCE(!pfn_valid(pfn) && (flags & MF_COUNT_INCREASED));
-
- if (!pfn_valid(pfn))
+ if (!pfn_valid(pfn)) {
+ WARN_ON_ONCE(flags & MF_COUNT_INCREASED);
return -ENXIO;
+ }
/* Only online pages can be soft-offlined (esp., not ZONE_DEVICE). */
page = pfn_to_online_page(pfn);
--
2.35.3
next prev parent reply other threads:[~2022-10-21 8:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-21 8:46 [PATCH 1/3] mm: memory-failure: make put_ref_page() more useful Kefeng Wang
2022-10-21 8:46 ` Kefeng Wang [this message]
2022-10-23 23:39 ` [PATCH 2/3] mm: memory-failure: avoid pfn_valid() twice in soft_offline_page() HORIGUCHI NAOYA(堀口 直也)
2022-10-25 2:55 ` Miaohe Lin
2022-10-21 8:46 ` [PATCH 3/3] mm: memory-failure: make action_result() return int Kefeng Wang
2022-10-23 23:56 ` HORIGUCHI NAOYA(堀口 直也)
2022-10-24 1:39 ` Kefeng Wang
2022-10-24 3:51 ` [PATCH v2] " Kefeng Wang
2022-10-24 7:35 ` HORIGUCHI NAOYA(堀口 直也)
2022-10-25 3:07 ` Miaohe Lin
2022-10-23 23:38 ` [PATCH 1/3] mm: memory-failure: make put_ref_page() more useful HORIGUCHI NAOYA(堀口 直也)
2022-10-25 2:52 ` Miaohe Lin
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=20221021084611.53765-2-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=linmiaohe@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=naoya.horiguchi@nec.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).