linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>
Cc: "Alexander Viro" <viro@zeniv.linux.org.uk>,
	"Paul Elliott" <paul.elliott@arm.com>,
	"Peter Zijlstra" <peterz@infradead.org>,
	"Yu-cheng Yu" <yu-cheng.yu@intel.com>,
	"Amit Kachhap" <amit.kachhap@arm.com>,
	"Vincenzo Frascino" <vincenzo.frascino@arm.com>,
	"Marc Zyngier" <maz@kernel.org>,
	"Eugene Syromiatnikov" <esyr@redhat.com>,
	"Szabolcs Nagy" <szabolcs.nagy@arm.com>,
	"H . J . Lu " <hjl.tools@gmail.com>,
	"Andrew Jones" <drjones@redhat.com>,
	"Kees Cook" <keescook@chromium.org>,
	"Arnd Bergmann" <arnd@arndb.de>, "Jann Horn" <jannh@google.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Kristina Martšenko" <kristina.martsenko@arm.com>,
	"Thomas Gleixner" <tglx@linutronix.de>,
	"Florian Weimer" <fweimer@redhat.com>,
	"Sudakshina Das" <sudi.das@arm.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
	linux-fsdevel@vger.kernel.org,
	"Daniel Kiss" <daniel.kiss@arm.com>,
	"Mark Brown" <broonie@kernel.org>
Subject: [PATCH v10 12/13] mm: smaps: Report arm64 guarded pages in smaps
Date: Mon, 16 Mar 2020 16:50:54 +0000	[thread overview]
Message-ID: <20200316165055.31179-13-broonie@kernel.org> (raw)
In-Reply-To: <20200316165055.31179-1-broonie@kernel.org>

From: Daniel Kiss <daniel.kiss@arm.com>

The arm64 Branch Target Identification support is activated by marking
executable pages as guarded pages.  Report pages mapped this way in
smaps to aid diagnostics.

Signed-off-by: Daniel Kiss <daniel.kiss@arm.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 Documentation/filesystems/proc.txt | 1 +
 fs/proc/task_mmu.c                 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 99ca040e3f90..ed5465d0f435 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -519,6 +519,7 @@ manner. The codes are the following:
     hg  - huge page advise flag
     nh  - no-huge page advise flag
     mg  - mergable advise flag
+    bt  - arm64 BTI guarded page
 
 Note that there is no guarantee that every flag and associated mnemonic will
 be present in all further kernel releases. Things get changed, the flags may
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 3ba9ae83bff5..1e3409c484d1 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -668,6 +668,9 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma)
 		[ilog2(VM_ARCH_1)]	= "ar",
 		[ilog2(VM_WIPEONFORK)]	= "wf",
 		[ilog2(VM_DONTDUMP)]	= "dd",
+#ifdef CONFIG_ARM64_BTI
+		[ilog2(VM_ARM64_BTI)]	= "bt",
+#endif
 #ifdef CONFIG_MEM_SOFT_DIRTY
 		[ilog2(VM_SOFTDIRTY)]	= "sd",
 #endif
-- 
2.20.1


  parent reply	other threads:[~2020-03-16 16:51 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-16 16:50 [PATCH v10 00/13] arm64: Branch Target Identification support Mark Brown
2020-03-16 16:50 ` [PATCH v10 01/13] ELF: UAPI and Kconfig additions for ELF program properties Mark Brown
2020-03-16 16:50 ` [PATCH v10 02/13] ELF: Add ELF program property parsing support Mark Brown
2020-03-16 16:50 ` [PATCH v10 03/13] arm64: Basic Branch Target Identification support Mark Brown
2020-03-16 16:50 ` [PATCH v10 04/13] elf: Allow arch to tweak initial mmap prot flags Mark Brown
2020-03-16 16:50 ` [PATCH v10 05/13] arm64: elf: Enable BTI at exec based on ELF program properties Mark Brown
2020-03-16 16:50 ` [PATCH v10 06/13] arm64: BTI: Decode BYTPE bits when printing PSTATE Mark Brown
2020-03-16 16:50 ` [PATCH v10 07/13] arm64: unify native/compat instruction skipping Mark Brown
2020-03-16 16:50 ` [PATCH v10 08/13] arm64: traps: Shuffle code to eliminate forward declarations Mark Brown
2020-03-16 16:50 ` [PATCH v10 09/13] arm64: BTI: Reset BTYPE when skipping emulated instructions Mark Brown
2020-03-16 16:50 ` [PATCH v10 10/13] KVM: " Mark Brown
2020-03-16 16:50 ` [PATCH v10 11/13] arm64: mm: Display guarded pages in ptdump Mark Brown
2020-03-16 16:50 ` Mark Brown [this message]
2020-03-16 16:50 ` [PATCH v10 13/13] arm64: BTI: Add Kconfig entry for userspace BTI Mark Brown
2020-03-17 18:49 ` [PATCH v10 00/13] arm64: Branch Target Identification support Catalin Marinas
2020-03-20 17:39 ` Szabolcs Nagy
2020-03-23 12:21   ` Catalin Marinas
2020-03-23 13:24     ` Mark Brown
2020-03-23 13:57       ` Mark Rutland
2020-03-23 14:39         ` Catalin Marinas
2020-03-23 14:55           ` Mark Rutland
2020-03-23 15:32             ` Mark Brown
2020-03-24 15:43             ` Szabolcs Nagy
2020-03-23 15:02           ` Mark Rutland
2020-04-22 15:44 ` Mark Brown
2020-04-22 16:29   ` Catalin Marinas
2020-04-28 13:28     ` Will Deacon
2020-04-28 15:12       ` Mark Brown
2020-04-28 15:18         ` Will Deacon
2020-04-28 15:58           ` Mark Brown
2020-04-28 16:01             ` Will Deacon
2020-04-30 21:26               ` Will Deacon

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=20200316165055.31179-13-broonie@kernel.org \
    --to=broonie@kernel.org \
    --cc=amit.kachhap@arm.com \
    --cc=arnd@arndb.de \
    --cc=catalin.marinas@arm.com \
    --cc=daniel.kiss@arm.com \
    --cc=drjones@redhat.com \
    --cc=esyr@redhat.com \
    --cc=fweimer@redhat.com \
    --cc=hjl.tools@gmail.com \
    --cc=jannh@google.com \
    --cc=keescook@chromium.org \
    --cc=kristina.martsenko@arm.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maz@kernel.org \
    --cc=paul.elliott@arm.com \
    --cc=peterz@infradead.org \
    --cc=richard.henderson@linaro.org \
    --cc=sudi.das@arm.com \
    --cc=szabolcs.nagy@arm.com \
    --cc=tglx@linutronix.de \
    --cc=vincenzo.frascino@arm.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=will@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).