linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Borislav Petkov <bp@alien8.de>
To: Yu-cheng Yu <yu-cheng.yu@intel.com>
Cc: 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>,
	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>
Subject: Re: [PATCH v23 16/28] mm: Fixup places that call pte_mkwrite() directly
Date: Thu, 18 Mar 2021 10:47:40 +0100	[thread overview]
Message-ID: <20210318094740.GA19570@zn.tnic> (raw)
In-Reply-To: <20210316151054.5405-17-yu-cheng.yu@intel.com>

On Tue, Mar 16, 2021 at 08:10:42AM -0700, Yu-cheng Yu wrote:
> When serving a page fault, maybe_mkwrite() makes a PTE writable if it is in
> a writable vma.  A shadow stack vma is writable, but its PTEs need
> _PAGE_DIRTY to be set to become writable.  For this reason, maybe_mkwrite()
> has been updated.
> 
> There are a few places that call pte_mkwrite() directly, but effect the
> same result as from maybe_mkwrite().  These sites need to be updated for

s/effect the same result/have the same result/

> shadow stack as well.  Thus, change them to maybe_mkwrite():
> 
> - do_anonymous_page() and migrate_vma_insert_page() check VM_WRITE directly
>   and call pte_mkwrite(), which is the same as maybe_mkwrite().  Change
>   them to maybe_mkwrite().
> 
> - In do_numa_page(), if the numa entry 'was-writable', then pte_mkwrite()

You can simply say "was writable" instead of trying to hint at the
variable there.

>   is called directly.  Fix it by doing maybe_mkwrite().
> 
> - In change_pte_range(), pte_mkwrite() is called directly.  Replace it with
>   maybe_mkwrite().
> 
>   A shadow stack vma is writable but has different vma
> flags, and handled accordingly in maybe_mkwrite().
>
> Signed-off-by: Yu-cheng Yu <yu-cheng.yu@intel.com>
> Reviewed-by: Kees Cook <keescook@chromium.org>
> ---
>  mm/memory.c   | 5 ++---
>  mm/migrate.c  | 3 +--
>  mm/mprotect.c | 2 +-
>  3 files changed, 4 insertions(+), 6 deletions(-)

As with the previous one, I guess this one needs a mm person ACK. I
mean, it is pretty obvious but still...

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

  reply	other threads:[~2021-03-18  9:48 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-16 15:10 [PATCH v23 00/28] Control-flow Enforcement: Shadow Stack Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 01/28] Documentation/x86: Add CET description Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 02/28] x86/cet/shstk: Add Kconfig option for user-mode control-flow protection Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 03/28] x86/cpufeatures: Add CET CPU feature flags for Control-flow Enforcement Technology (CET) Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 04/28] x86/cpufeatures: Introduce X86_FEATURE_CET and setup functions Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 05/28] x86/fpu/xstate: Introduce CET MSR and XSAVES supervisor states Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 06/28] x86/cet: Add control-protection fault handler Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 07/28] x86/mm: Remove _PAGE_DIRTY from kernel RO pages Yu-cheng Yu
2021-03-22  9:13   ` Kirill A. Shutemov
2021-03-22 14:52     ` Yu, Yu-cheng
2021-03-16 15:10 ` [PATCH v23 08/28] x86/mm: Move pmd_write(), pud_write() up in the file Yu-cheng Yu
2021-03-22 11:28   ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 09/28] x86/mm: Introduce _PAGE_COW Yu-cheng Yu
2021-03-22 11:29   ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 10/28] drm/i915/gvt: Change _PAGE_DIRTY to _PAGE_DIRTY_BITS Yu-cheng Yu
2021-03-22 11:30   ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 11/28] x86/mm: Update pte_modify for _PAGE_COW Yu-cheng Yu
2021-03-22 11:31   ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 12/28] x86/mm: Update ptep_set_wrprotect() and pmdp_set_wrprotect() for transition from _PAGE_DIRTY to _PAGE_COW Yu-cheng Yu
2021-03-22 10:15   ` Kirill A. Shutemov
2021-03-22 10:46     ` Peter Zijlstra
2021-03-22 11:38       ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 13/28] mm: Introduce VM_SHSTK for shadow stack memory Yu-cheng Yu
2021-03-22 11:33   ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 14/28] x86/mm: Shadow Stack page fault error checking Yu-cheng Yu
2021-03-22 10:38   ` Kirill A. Shutemov
2021-03-22 17:27     ` Yu, Yu-cheng
2021-03-16 15:10 ` [PATCH v23 15/28] x86/mm: Update maybe_mkwrite() for shadow stack Yu-cheng Yu
2021-03-17 15:56   ` Borislav Petkov
2021-03-22 10:46   ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 16/28] mm: Fixup places that call pte_mkwrite() directly Yu-cheng Yu
2021-03-18  9:47   ` Borislav Petkov [this message]
2021-03-18 11:16     ` Borislav Petkov
2021-03-16 15:10 ` [PATCH v23 17/28] mm: Add guard pages around a shadow stack Yu-cheng Yu
2021-03-22 10:55   ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 18/28] mm/mmap: Add shadow stack pages to memory accounting Yu-cheng Yu
2021-03-22 10:57   ` Kirill A. Shutemov
2021-03-26 15:46     ` Yu, Yu-cheng
2021-03-29 10:10       ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 19/28] mm: Update can_follow_write_pte() for shadow stack Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 20/28] mm/mprotect: Exclude shadow stack from preserve_write Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 21/28] mm: Re-introduce vm_flags to do_mmap() Yu-cheng Yu
2021-03-18 11:42   ` Borislav Petkov
2021-03-18 15:59     ` Yu, Yu-cheng
2021-03-18 16:13       ` Borislav Petkov
2021-03-16 15:10 ` [PATCH v23 22/28] x86/cet/shstk: User-mode shadow stack support Yu-cheng Yu
2021-03-18 12:32   ` Borislav Petkov
2021-03-18 19:05     ` Yu, Yu-cheng
2021-03-19  9:28       ` Borislav Petkov
2021-03-19 15:15         ` Yu, Yu-cheng
2021-03-16 15:10 ` [PATCH v23 23/28] x86/cet/shstk: Handle signals for shadow stack Yu-cheng Yu
2021-03-19 12:51   ` Borislav Petkov
2021-03-16 15:10 ` [PATCH v23 24/28] ELF: Introduce arch_setup_elf_property() Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 25/28] x86/cet/shstk: Handle thread shadow stack Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 26/28] x86/cet/shstk: Add arch_prctl functions for " Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 27/28] mm: Move arch_calc_vm_prot_bits() to arch/x86/include/asm/mman.h Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 28/28] mm: Introduce PROT_SHSTK for shadow stack Yu-cheng Yu
2021-03-22 11:27   ` Kirill A. Shutemov
2021-03-16 21:15 ` [PATCH v23 00/28] Control-flow Enforcement: Shadow Stack Peter Zijlstra
2021-03-16 21:34   ` Yu, Yu-cheng
2021-03-17  9:18     ` Ingo Molnar
2021-03-17 10:14       ` Peter Zijlstra
2021-03-19 16:24       ` Yu, Yu-cheng
2021-03-19 21:43   ` Yu, Yu-cheng
2021-03-23 20:49     ` Peter Zijlstra
2021-03-23 21:03       ` 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=20210318094740.GA19570@zn.tnic \
    --to=bp@alien8.de \
    --cc=Dave.Martin@arm.com \
    --cc=arnd@arndb.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=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 \
    --cc=yu-cheng.yu@intel.com \
    /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).