From: David Hildenbrand <david@redhat•com>
To: linux-kernel@vger•kernel.org
Cc: x86@kernel•org, Jan Kara <jack@suse•cz>,
David Hildenbrand <david@redhat•com>,
Catalin Marinas <catalin.marinas@arm•com>,
Yang Shi <shy828301@gmail•com>,
Dave Hansen <dave.hansen@linux•intel.com>,
Peter Xu <peterx@redhat•com>, Michal Hocko <mhocko@kernel•org>,
linux-mm@kvack•org, Donald Dutile <ddutile@redhat•com>,
Liang Zhang <zhangliang5@huawei•com>,
Borislav Petkov <bp@alien8•de>,
Alexander Gordeev <agordeev@linux•ibm.com>,
Will Deacon <will@kernel•org>, Christoph Hellwig <hch@lst•de>,
Paul Mackerras <paulus@samba•org>,
Andrea Arcangeli <aarcange@redhat•com>,
linux-s390@vger•kernel.org, Vasily Gorbik <gor@linux•ibm.com>,
Rik van Riel <riel@surriel•com>, Hugh Dickins <hughd@google•com>,
Matthew Wilcox <willy@infradead•org>,
Mike Rapoport <rppt@linux•ibm.com>,
Ingo Molnar <mingo@redhat•com>,
linux-arm-kernel@lists•infradead.org,
Jason Gunthorpe <jgg@nvidia•com>,
David Rientjes <rientjes@google•com>,
Gerald Schaefer <gerald.schaefer@linux•ibm.com>,
Pedro Gomes <pedrodemargomes@gmail•com>,
Jann Horn <jannh@google•com>, John Hubbard <jhubbard@nvidia•com>,
Heiko Carstens <hca@linux•ibm.com>,
Shakeel Butt <shakeelb@google•com>,
Thomas Gleixner <tglx@linutronix•de>,
Vlastimil Babka <vbabka@suse•cz>,
Oded Gabbay <oded.gabbay@gmail•com>,
linuxppc-dev@lists•ozlabs.org, Oleg Nesterov <oleg@redhat•com>,
Nadav Amit <namit@vmware•com>,
Andrew Morton <akpm@linux-foundation•org>,
Linus Torvalds <torvalds@linux-foundation•org>,
Roman Gushchin <guro@fb•com>,
"Kirill A . Shutemov" <kirill.shutemov@linux•intel.com>,
Mike Kravetz <mike.kravetz@oracle•com>
Subject: [PATCH v2 7/8] powerpc/pgtable: remove _PAGE_BIT_SWAP_TYPE for book3s
Date: Tue, 29 Mar 2022 18:43:28 +0200 [thread overview]
Message-ID: <20220329164329.208407-8-david@redhat.com> (raw)
In-Reply-To: <20220329164329.208407-1-david@redhat.com>
The swap type is simply stored in bits 0x1f of the swap pte. Let's
simplify by just getting rid of _PAGE_BIT_SWAP_TYPE. It's not like that
we can simply change it: _PAGE_SWP_SOFT_DIRTY would suddenly fall into
_RPAGE_RSV1, which isn't possible and would make the
BUILD_BUG_ON(_PAGE_HPTEFLAGS & _PAGE_SWP_SOFT_DIRTY) angry.
While at it, make it clearer which bit we're actually using for
_PAGE_SWP_SOFT_DIRTY by just using the proper define and introduce and
use SWP_TYPE_MASK.
Signed-off-by: David Hildenbrand <david@redhat•com>
---
arch/powerpc/include/asm/book3s/64/pgtable.h | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h
index 875730d5af40..8e98375d5c4a 100644
--- a/arch/powerpc/include/asm/book3s/64/pgtable.h
+++ b/arch/powerpc/include/asm/book3s/64/pgtable.h
@@ -13,7 +13,6 @@
/*
* Common bits between hash and Radix page table
*/
-#define _PAGE_BIT_SWAP_TYPE 0
#define _PAGE_EXEC 0x00001 /* execute permission */
#define _PAGE_WRITE 0x00002 /* write access allowed */
@@ -751,17 +750,16 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
* Don't have overlapping bits with _PAGE_HPTEFLAGS \
* We filter HPTEFLAGS on set_pte. \
*/ \
- BUILD_BUG_ON(_PAGE_HPTEFLAGS & (0x1f << _PAGE_BIT_SWAP_TYPE)); \
+ BUILD_BUG_ON(_PAGE_HPTEFLAGS & SWP_TYPE_MASK); \
BUILD_BUG_ON(_PAGE_HPTEFLAGS & _PAGE_SWP_SOFT_DIRTY); \
} while (0)
#define SWP_TYPE_BITS 5
-#define __swp_type(x) (((x).val >> _PAGE_BIT_SWAP_TYPE) \
- & ((1UL << SWP_TYPE_BITS) - 1))
+#define SWP_TYPE_MASK ((1UL << SWP_TYPE_BITS) - 1)
+#define __swp_type(x) ((x).val & SWP_TYPE_MASK)
#define __swp_offset(x) (((x).val & PTE_RPN_MASK) >> PAGE_SHIFT)
#define __swp_entry(type, offset) ((swp_entry_t) { \
- ((type) << _PAGE_BIT_SWAP_TYPE) \
- | (((offset) << PAGE_SHIFT) & PTE_RPN_MASK)})
+ (type) | (((offset) << PAGE_SHIFT) & PTE_RPN_MASK)})
/*
* swp_entry_t must be independent of pte bits. We build a swp_entry_t from
* swap type and offset we get from swap and convert that to pte to find a
@@ -774,7 +772,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
#define __swp_entry_to_pmd(x) (pte_pmd(__swp_entry_to_pte(x)))
#ifdef CONFIG_MEM_SOFT_DIRTY
-#define _PAGE_SWP_SOFT_DIRTY (1UL << (SWP_TYPE_BITS + _PAGE_BIT_SWAP_TYPE))
+#define _PAGE_SWP_SOFT_DIRTY _PAGE_NON_IDEMPOTENT
#else
#define _PAGE_SWP_SOFT_DIRTY 0UL
#endif /* CONFIG_MEM_SOFT_DIRTY */
--
2.35.1
next prev parent reply other threads:[~2022-03-29 16:51 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-29 16:43 [PATCH v2 0/8] mm: COW fixes part 3: reliable GUP R/W FOLL_GET of anonymous pages David Hildenbrand
2022-03-29 16:43 ` [PATCH v2 1/8] mm/swap: remember PG_anon_exclusive via a swp pte bit David Hildenbrand
2022-04-20 17:10 ` Vlastimil Babka
2022-04-20 17:13 ` David Hildenbrand
2022-03-29 16:43 ` [PATCH v2 2/8] mm/debug_vm_pgtable: add tests for __HAVE_ARCH_PTE_SWP_EXCLUSIVE David Hildenbrand
2022-04-20 17:14 ` Vlastimil Babka
2022-03-29 16:43 ` [PATCH v2 3/8] x86/pgtable: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE David Hildenbrand
2022-04-19 12:46 ` David Hildenbrand
2022-03-29 16:43 ` [PATCH v2 4/8] arm64/pgtable: " David Hildenbrand
2022-03-29 16:43 ` [PATCH v2 5/8] s390/pgtable: cleanup description of swp pte layout David Hildenbrand
2022-03-30 16:48 ` Gerald Schaefer
2022-03-29 16:43 ` [PATCH v2 6/8] s390/pgtable: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE David Hildenbrand
2022-03-30 16:48 ` Gerald Schaefer
2022-03-29 16:43 ` David Hildenbrand [this message]
2022-03-30 6:07 ` [PATCH v2 7/8] powerpc/pgtable: remove _PAGE_BIT_SWAP_TYPE for book3s Christophe Leroy
2022-03-30 6:58 ` David Hildenbrand
2022-03-29 16:43 ` [PATCH v2 8/8] powerpc/pgtable: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE " David Hildenbrand
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=20220329164329.208407-8-david@redhat.com \
--to=david@redhat$(echo .)com \
--cc=aarcange@redhat$(echo .)com \
--cc=agordeev@linux$(echo .)ibm.com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=bp@alien8$(echo .)de \
--cc=catalin.marinas@arm$(echo .)com \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=ddutile@redhat$(echo .)com \
--cc=gerald.schaefer@linux$(echo .)ibm.com \
--cc=gor@linux$(echo .)ibm.com \
--cc=guro@fb$(echo .)com \
--cc=hca@linux$(echo .)ibm.com \
--cc=hch@lst$(echo .)de \
--cc=hughd@google$(echo .)com \
--cc=jack@suse$(echo .)cz \
--cc=jannh@google$(echo .)com \
--cc=jgg@nvidia$(echo .)com \
--cc=jhubbard@nvidia$(echo .)com \
--cc=kirill.shutemov@linux$(echo .)intel.com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=linux-s390@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mhocko@kernel$(echo .)org \
--cc=mike.kravetz@oracle$(echo .)com \
--cc=mingo@redhat$(echo .)com \
--cc=namit@vmware$(echo .)com \
--cc=oded.gabbay@gmail$(echo .)com \
--cc=oleg@redhat$(echo .)com \
--cc=paulus@samba$(echo .)org \
--cc=pedrodemargomes@gmail$(echo .)com \
--cc=peterx@redhat$(echo .)com \
--cc=riel@surriel$(echo .)com \
--cc=rientjes@google$(echo .)com \
--cc=rppt@linux$(echo .)ibm.com \
--cc=shakeelb@google$(echo .)com \
--cc=shy828301@gmail$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=vbabka@suse$(echo .)cz \
--cc=will@kernel$(echo .)org \
--cc=willy@infradead$(echo .)org \
--cc=x86@kernel$(echo .)org \
--cc=zhangliang5@huawei$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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