2022-10-21 08:32:13

by Kefeng Wang

Subject: [PATCH 2/3] mm: memory-failure: avoid pfn_valid() twice in soft_offline_page()

Simplify WARN_ON_ONCE(flags & MF_COUNT_INCREASED) under !pfn_valid().

Signed-off-by: Kefeng Wang <[email protected]>
---
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

2022-10-24 00:40:28

by HORIGUCHI NAOYA(堀口　直也)

Subject: Re: [PATCH 2/3] mm: memory-failure: avoid pfn_valid() twice in soft_offline_page()

On Fri, Oct 21, 2022 at 04:46:10PM +0800, Kefeng Wang wrote:
> Simplify WARN_ON_ONCE(flags & MF_COUNT_INCREASED) under !pfn_valid().
>
> Signed-off-by: Kefeng Wang <[email protected]>

Acked-by: Naoya Horiguchi <[email protected]>

2022-10-25 03:46:45

by Miaohe Lin

Subject: Re: [PATCH 2/3] mm: memory-failure: avoid pfn_valid() twice in soft_offline_page()

On 2022/10/21 16:46, Kefeng Wang wrote:
> Simplify WARN_ON_ONCE(flags & MF_COUNT_INCREASED) under !pfn_valid().
>
> Signed-off-by: Kefeng Wang <[email protected]>

Reviewed-by: Miaohe Lin <[email protected]>

Thanks,
Miaohe Lin