linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: peterx@redhat.com
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: linux-arm-kernel@lists.infradead.org,
	Muchun Song <muchun.song@linux.dev>,
	Andreas Larsson <andreas@gaisler.com>,
	x86@kernel.org, Matthew Wilcox <willy@infradead.org>,
	peterx@redhat.com, Jason Gunthorpe <jgg@nvidia.com>,
	sparclinux@vger.kernel.org,
	Andrew Morton <akpm@linux-foundation.org>,
	linuxppc-dev@lists.ozlabs.org,
	"David S . Miller" <davem@davemloft.net>,
	Mike Rapoport <rppt@kernel.org>
Subject: [PATCH v2 05/14] mm/sparc: Change pXd_huge() behavior to exclude swap entries
Date: Mon, 18 Mar 2024 16:03:55 -0400	[thread overview]
Message-ID: <20240318200404.448346-6-peterx@redhat.com> (raw)
In-Reply-To: <20240318200404.448346-1-peterx@redhat.com>

From: Peter Xu <peterx@redhat.com>

Please refer to the previous patch on the reasoning for x86.  Now sparc is
the only architecture that will allow swap entries to be reported as
pXd_huge().  After this patch, all architectures should forbid swap entries
in pXd_huge().

Cc: David S. Miller <davem@davemloft.net>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: sparclinux@vger.kernel.org
Signed-off-by: Peter Xu <peterx@redhat.com>
---
 arch/sparc/mm/hugetlbpage.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
index b432500c13a5..d31c2cec35c9 100644
--- a/arch/sparc/mm/hugetlbpage.c
+++ b/arch/sparc/mm/hugetlbpage.c
@@ -409,14 +409,12 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
 
 int pmd_huge(pmd_t pmd)
 {
-	return !pmd_none(pmd) &&
-		(pmd_val(pmd) & (_PAGE_VALID|_PAGE_PMD_HUGE)) != _PAGE_VALID;
+	return pmd_leaf(pmd);;
 }
 
 int pud_huge(pud_t pud)
 {
-	return !pud_none(pud) &&
-		(pud_val(pud) & (_PAGE_VALID|_PAGE_PUD_HUGE)) != _PAGE_VALID;
+	return pud_leaf(pud);
 }
 
 static void hugetlb_free_pte_range(struct mmu_gather *tlb, pmd_t *pmd,
-- 
2.44.0


  parent reply	other threads:[~2024-03-18 20:08 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-18 20:03 [PATCH v2 00/14] mm/treewide: Remove pXd_huge() API peterx
2024-03-18 20:03 ` [PATCH v2 01/14] mm/hmm: Process pud swap entry without pud_huge() peterx
2024-03-18 20:03 ` [PATCH v2 02/14] mm/gup: Cache p4d in follow_p4d_mask() peterx
2024-03-18 20:03 ` [PATCH v2 03/14] mm/gup: Check p4d presence before going on peterx
2024-03-18 20:03 ` [PATCH v2 04/14] mm/x86: Change pXd_huge() behavior to exclude swap entries peterx
2024-03-18 20:03 ` peterx [this message]
2024-03-19  4:25   ` [PATCH v2 05/14] mm/sparc: " Muchun Song
2024-03-19 14:04     ` Peter Xu
2024-03-18 20:03 ` [PATCH v2 06/14] mm/arm: Use macros to define pmd/pud helpers peterx
2024-03-18 20:03 ` [PATCH v2 07/14] mm/arm: Redefine pmd_huge() with pmd_leaf() peterx
2024-03-18 20:03 ` [PATCH v2 08/14] mm/arm64: Merge pXd_huge() and pXd_leaf() definitions peterx
2024-03-18 20:03 ` [PATCH v2 09/14] mm/powerpc: Redefine pXd_huge() with pXd_leaf() peterx
2024-03-18 20:04 ` [PATCH v2 10/14] mm/gup: Merge pXd huge mapping checks peterx
2024-03-18 20:04 ` [PATCH v2 11/14] mm/treewide: Replace pXd_huge() with pXd_leaf() peterx
2024-03-18 20:04 ` [PATCH v2 12/14] mm/treewide: Remove pXd_huge() peterx
2024-05-27  6:03   ` Christophe Leroy
2024-05-27 15:43     ` Peter Xu
2024-03-18 20:04 ` [PATCH v2 13/14] mm/arm: Remove pmd_thp_or_huge() peterx
2024-03-18 20:04 ` [PATCH v2 14/14] mm: Document pXd_leaf() API peterx

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=20240318200404.448346-6-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=andreas@gaisler.com \
    --cc=davem@davemloft.net \
    --cc=jgg@nvidia.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=muchun.song@linux.dev \
    --cc=rppt@kernel.org \
    --cc=sparclinux@vger.kernel.org \
    --cc=willy@infradead.org \
    --cc=x86@kernel.org \
    /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).