Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Hongchen Zhang <zhanghongchen@loongson.cn>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Alistair Popple <apopple@nvidia.com>,
        Peter Xu <peterx@redhat.com>,
        Ralph Campbell <rcampbell@nvidia.com>,
        Naoya Horiguchi <naoya.horiguchi@nec.com>,
        linux-kernel@vger.kernel.org,
        Hongchen Zhang <zhanghongchen@loongson.cn>
Subject: [PATCH] mm/swapops: make is_pmd_migration_entry more strict
Date:   Thu, 28 Apr 2022 15:35:33 +0800
Message-Id: <1651131333-6386-1-git-send-email-zhanghongchen@loongson.cn>
Precedence: bulk

a pmd migration entry should first be a swap pmd,so
use is_swap_pmd(pmd) instead of !pmd_present(pmd).

On the other hand, some architecture (MIPS for example)
may misjudge a pmd_none entry as a pmd migration entry.

Signed-off-by: Hongchen Zhang <zhanghongchen@loongson.cn>
---
 include/linux/swapops.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/swapops.h b/include/linux/swapops.h
index d356ab4..1d16569 100644
--- a/include/linux/swapops.h
+++ b/include/linux/swapops.h
@@ -304,7 +304,7 @@ static inline pmd_t swp_entry_to_pmd(swp_entry_t entry)
 
 static inline int is_pmd_migration_entry(pmd_t pmd)
 {
-	return !pmd_present(pmd) && is_migration_entry(pmd_to_swp_entry(pmd));
+	return is_swap_pmd(pmd) && is_migration_entry(pmd_to_swp_entry(pmd));
 }
 #else
 static inline void set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw,
-- 
1.8.3.1