From: Yu-cheng Yu <yu-cheng.yu@intel.com>
To: x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
linux-mm@kvack.org, linux-arch@vger.kernel.org,
linux-api@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Andy Lutomirski <luto@kernel.org>,
Balbir Singh <bsingharora@gmail.com>,
Borislav Petkov <bp@alien8.de>,
Cyrill Gorcunov <gorcunov@gmail.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Eugene Syromiatnikov <esyr@redhat.com>,
Florian Weimer <fweimer@redhat.com>,
"H.J. Lu" <hjl.tools@gmail.com>, Jann Horn <jannh@google.com>,
Jonathan Corbet <corbet@lwn.net>,
Kees Cook <keescook@chromium.org>,
Mike Kravetz <mike.kravetz@oracle.com>,
Nadav Amit <nadav.amit@gmail.com>,
Oleg Nesterov <oleg@redhat.com>, Pavel Machek <pavel@ucw.cz>,
Peter Zijlstra <peterz@infradead.org>,
Randy Dunlap <rdunlap@infradead.org>,
"Ravi V. Shankar" <ravi.v.shankar@intel.com>,
Vedvyas Shanbhogue <vedvyas.shanbhogue@intel.com>,
Dave Martin <Dave.Martin@arm.com>,
Weijiang Yang <weijiang.yang@intel.com>,
Pengfei Xu <pengfei.xu@intel.com>,
Haitao Huang <haitao.huang@intel.com>
Cc: Yu-cheng Yu <yu-cheng.yu@intel.com>,
"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCH v25 08/30] x86/mm: Move pmd_write(), pud_write() up in the file
Date: Thu, 15 Apr 2021 15:13:57 -0700 [thread overview]
Message-ID: <20210415221419.31835-9-yu-cheng.yu@intel.com> (raw)
In-Reply-To: <20210415221419.31835-1-yu-cheng.yu@intel.com>
To prepare the introduction of _PAGE_COW, move pmd_write() and
pud_write() up in the file, so that they can be used by other
helpers below.
Signed-off-by: Yu-cheng Yu <yu-cheng.yu@intel.com>
Reviewed-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
arch/x86/include/asm/pgtable.h | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index a02c67291cfc..c1650d0af1b5 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -185,6 +185,18 @@ static inline int pte_write(pte_t pte)
return pte_flags(pte) & _PAGE_RW;
}
+#define pmd_write pmd_write
+static inline int pmd_write(pmd_t pmd)
+{
+ return pmd_flags(pmd) & _PAGE_RW;
+}
+
+#define pud_write pud_write
+static inline int pud_write(pud_t pud)
+{
+ return pud_flags(pud) & _PAGE_RW;
+}
+
static inline int pte_huge(pte_t pte)
{
return pte_flags(pte) & _PAGE_PSE;
@@ -1128,12 +1140,6 @@ extern int pmdp_clear_flush_young(struct vm_area_struct *vma,
unsigned long address, pmd_t *pmdp);
-#define pmd_write pmd_write
-static inline int pmd_write(pmd_t pmd)
-{
- return pmd_flags(pmd) & _PAGE_RW;
-}
-
#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR
static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, unsigned long addr,
pmd_t *pmdp)
@@ -1155,12 +1161,6 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
clear_bit(_PAGE_BIT_RW, (unsigned long *)pmdp);
}
-#define pud_write pud_write
-static inline int pud_write(pud_t pud)
-{
- return pud_flags(pud) & _PAGE_RW;
-}
-
#ifndef pmdp_establish
#define pmdp_establish pmdp_establish
static inline pmd_t pmdp_establish(struct vm_area_struct *vma,
--
2.21.0
next prev parent reply other threads:[~2021-04-15 22:16 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-15 22:13 [PATCH v25 00/30] Control-flow Enforcement: Shadow Stack Yu-cheng Yu
2021-04-15 22:13 ` [PATCH v25 01/30] Documentation/x86: Add CET description Yu-cheng Yu
2021-04-15 22:13 ` [PATCH v25 02/30] x86/cet/shstk: Add Kconfig option for Shadow Stack Yu-cheng Yu
2021-04-15 22:13 ` [PATCH v25 03/30] x86/cpufeatures: Add CET CPU feature flags for Control-flow Enforcement Technology (CET) Yu-cheng Yu
2021-04-15 22:13 ` [PATCH v25 04/30] x86/cpufeatures: Introduce CPU setup and option parsing for CET Yu-cheng Yu
2021-04-15 22:13 ` [PATCH v25 05/30] x86/fpu/xstate: Introduce CET MSR and XSAVES supervisor states Yu-cheng Yu
2021-04-15 22:13 ` [PATCH v25 06/30] x86/cet: Add control-protection fault handler Yu-cheng Yu
2021-04-15 22:13 ` [PATCH v25 07/30] x86/mm: Remove _PAGE_DIRTY from kernel RO pages Yu-cheng Yu
2021-04-15 22:13 ` Yu-cheng Yu [this message]
2021-04-15 22:13 ` [PATCH v25 09/30] x86/mm: Introduce _PAGE_COW Yu-cheng Yu
2021-04-15 22:13 ` [PATCH v25 10/30] drm/i915/gvt: Change _PAGE_DIRTY to _PAGE_DIRTY_BITS Yu-cheng Yu
2021-04-15 22:14 ` [PATCH v25 11/30] x86/mm: Update pte_modify for _PAGE_COW Yu-cheng Yu
2021-04-15 22:14 ` [PATCH v25 12/30] x86/mm: Update ptep_set_wrprotect() and pmdp_set_wrprotect() for transition from _PAGE_DIRTY to _PAGE_COW Yu-cheng Yu
2021-04-15 22:14 ` [PATCH v25 13/30] mm: Introduce VM_SHADOW_STACK for shadow stack memory Yu-cheng Yu
2021-04-15 22:14 ` [PATCH v25 14/30] x86/mm: Shadow Stack page fault error checking Yu-cheng Yu
2021-04-15 22:14 ` [PATCH v25 15/30] x86/mm: Update maybe_mkwrite() for shadow stack Yu-cheng Yu
2021-04-15 22:14 ` [PATCH v25 16/30] mm: Fixup places that call pte_mkwrite() directly Yu-cheng Yu
2021-04-23 10:13 ` Kirill A. Shutemov
2021-04-15 22:14 ` [PATCH v25 17/30] mm: Add guard pages around a shadow stack Yu-cheng Yu
2021-04-15 22:14 ` [PATCH v25 18/30] mm/mmap: Add shadow stack pages to memory accounting Yu-cheng Yu
2021-04-23 10:19 ` Kirill A. Shutemov
2021-04-15 22:14 ` [PATCH v25 19/30] mm: Update can_follow_write_pte() for shadow stack Yu-cheng Yu
2021-04-23 10:25 ` Kirill A. Shutemov
2021-04-15 22:14 ` [PATCH v25 20/30] mm/mprotect: Exclude shadow stack from preserve_write Yu-cheng Yu
2021-04-23 10:27 ` Kirill A. Shutemov
2021-04-15 22:14 ` [PATCH v25 21/30] mm: Re-introduce vm_flags to do_mmap() Yu-cheng Yu
2021-04-23 10:31 ` Kirill A. Shutemov
2021-04-23 15:59 ` Yu, Yu-cheng
2021-04-15 22:14 ` [PATCH v25 22/30] x86/cet/shstk: Add user-mode shadow stack support Yu-cheng Yu
2021-04-15 22:14 ` [PATCH v25 23/30] x86/cet/shstk: Handle thread shadow stack Yu-cheng Yu
2021-04-15 22:14 ` [PATCH v25 24/30] x86/cet/shstk: Introduce shadow stack token setup/verify routines Yu-cheng Yu
2021-04-15 22:14 ` [PATCH v25 25/30] x86/cet/shstk: Handle signals for shadow stack Yu-cheng Yu
2021-04-15 22:14 ` [PATCH v25 26/30] ELF: Introduce arch_setup_elf_property() Yu-cheng Yu
2021-04-15 22:14 ` [PATCH v25 27/30] x86/cet/shstk: Add arch_prctl functions for shadow stack Yu-cheng Yu
2021-04-15 22:14 ` [PATCH v25 28/30] mm: Move arch_calc_vm_prot_bits() to arch/x86/include/asm/mman.h Yu-cheng Yu
2021-04-26 6:31 ` Kirill A. Shutemov
2021-04-15 22:14 ` [PATCH v25 29/30] mm: Update arch_validate_flags() to include vma anonymous Yu-cheng Yu
2021-04-26 6:40 ` Kirill A. Shutemov
2021-04-26 11:11 ` Catalin Marinas
2021-04-26 17:56 ` Yu, Yu-cheng
2021-04-15 22:14 ` [PATCH v25 30/30] mm: Introduce PROT_SHSTK for shadow stack Yu-cheng Yu
2021-04-26 6:52 ` Kirill A. Shutemov
2021-04-26 18:00 ` Yu, Yu-cheng
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=20210415221419.31835-9-yu-cheng.yu@intel.com \
--to=yu-cheng.yu@intel.com \
--cc=Dave.Martin@arm.com \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=bsingharora@gmail.com \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=esyr@redhat.com \
--cc=fweimer@redhat.com \
--cc=gorcunov@gmail.com \
--cc=haitao.huang@intel.com \
--cc=hjl.tools@gmail.com \
--cc=hpa@zytor.com \
--cc=jannh@google.com \
--cc=keescook@chromium.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=mike.kravetz@oracle.com \
--cc=mingo@redhat.com \
--cc=nadav.amit@gmail.com \
--cc=oleg@redhat.com \
--cc=pavel@ucw.cz \
--cc=pengfei.xu@intel.com \
--cc=peterz@infradead.org \
--cc=ravi.v.shankar@intel.com \
--cc=rdunlap@infradead.org \
--cc=tglx@linutronix.de \
--cc=vedvyas.shanbhogue@intel.com \
--cc=weijiang.yang@intel.com \
--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).