[PATCH 0/2] x86/mm/kaiser: a couple of KAISER mapping fixes

[PATCH 0/2] x86/mm/kaiser: a couple of KAISER mapping fixes

[Josh Poimboeuf]

On top of the tip KAISER patches.

Josh Poimboeuf (2):
  x86/mm/kaiser: Remove unused user-mapped page-aligned section
  x86/mm/kaiser: Don't map the IRQ stack in user space

 include/asm-generic/vmlinux.lds.h |  6 ++----
 include/linux/percpu-defs.h       | 10 ----------
 2 files changed, 2 insertions(+), 14 deletions(-)

-- 
2.13.6

[PATCH 1/2] x86/mm/kaiser: Remove unused user-mapped page-aligned section

[Josh Poimboeuf]

The '.data..percpu..user_mapped..page_aligned' section isn't used
anywhere.  Remove it and its related macros.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
---
 include/asm-generic/vmlinux.lds.h |  2 --
 include/linux/percpu-defs.h       | 10 ----------
 2 files changed, 12 deletions(-)

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index e12168936d3f..386f8846d9e9 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -831,8 +831,6 @@
 	. = ALIGN(cacheline);						\
 	*(.data..percpu..user_mapped)					\
 	*(.data..percpu..user_mapped..shared_aligned)			\
-	. = ALIGN(PAGE_SIZE);						\
-	*(.data..percpu..user_mapped..page_aligned)			\
 	VMLINUX_SYMBOL(__per_cpu_user_mapped_end) = .;			\
 	. = ALIGN(PAGE_SIZE);						\
 	*(.data..percpu..page_aligned)					\
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h
index 752513674295..40ea19ccf1ec 100644
--- a/include/linux/percpu-defs.h
+++ b/include/linux/percpu-defs.h
@@ -182,16 +182,6 @@
 #define DEFINE_PER_CPU_PAGE_ALIGNED(type, name)				\
 	DEFINE_PER_CPU_SECTION(type, name, "..page_aligned")		\
 	__aligned(PAGE_SIZE)
-/*
- * Declaration/definition used for per-CPU variables that must be page aligned and need to be mapped in user mode.
- */
-#define DECLARE_PER_CPU_PAGE_ALIGNED_USER_MAPPED(type, name)		\
-	DECLARE_PER_CPU_SECTION(type, name, USER_MAPPED_SECTION"..page_aligned") \
-	__aligned(PAGE_SIZE)
-
-#define DEFINE_PER_CPU_PAGE_ALIGNED_USER_MAPPED(type, name)		\
-	DEFINE_PER_CPU_SECTION(type, name, USER_MAPPED_SECTION"..page_aligned") \
-	__aligned(PAGE_SIZE)
 
 /*
  * Declaration/definition used for per-CPU variables that must be read mostly.
-- 
2.13.6

Re: [PATCH 1/2] x86/mm/kaiser: Remove unused user-mapped page-aligned section

[Peter Zijlstra]

On Mon, Nov 27, 2017 at 10:10:12PM -0600, Josh Poimboeuf wrote:
> The '.data..percpu..user_mapped..page_aligned' section isn't used
> anywhere.  Remove it and its related macros.

With my patches:

  arch/x86/events/intel/ds.c:DEFINE_PER_CPU_SHARED_ALIGNED_USER_MAPPED(struct debug_store, cpu_debug_store);

is the only user left of any of that.

I suppose we could just allocate a whole page for that and use
kaiser_add_mapping() for it. Then we can remove all of
DEFINE_.*_USER_MAPPED().

Re: [PATCH 1/2] x86/mm/kaiser: Remove unused user-mapped page-aligned section

[Peter Zijlstra]

On Tue, Nov 28, 2017 at 10:20:25AM +0100, Peter Zijlstra wrote:
> On Mon, Nov 27, 2017 at 10:10:12PM -0600, Josh Poimboeuf wrote:
> > The '.data..percpu..user_mapped..page_aligned' section isn't used
> > anywhere.  Remove it and its related macros.
> 
> With my patches:
> 
>   arch/x86/events/intel/ds.c:DEFINE_PER_CPU_SHARED_ALIGNED_USER_MAPPED(struct debug_store, cpu_debug_store);
> 
> is the only user left of any of that.
> 
> I suppose we could just allocate a whole page for that and use
> kaiser_add_mapping() for it. Then we can remove all of
> DEFINE_.*_USER_MAPPED().

Or we could field it a spot in the cpu_entry_area I suppose.

[PATCH 2/2] x86/mm/kaiser: Don't map the IRQ stack in user space

[Josh Poimboeuf]

The '.data..percpu..first' section, which contains the IRQ software
stack, is included in the percpu user-mapped data area.

The IRQ stack is a software stack which is switched to *after* the CR3
switch, so it doesn't make sense to map it in user space.

Unmap it, and make sure the user-mapped area is page-aligned so it can
be mapped cleanly.

Fixes: 7d1b4c99a605 ("x86/mm/kaiser: Introduce user-mapped per-CPU areas")
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
---
 include/asm-generic/vmlinux.lds.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 386f8846d9e9..45d2fbb081c6 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -826,9 +826,9 @@
  */
 #define PERCPU_INPUT(cacheline)						\
 	VMLINUX_SYMBOL(__per_cpu_start) = .;				\
-	VMLINUX_SYMBOL(__per_cpu_user_mapped_start) = .;		\
 	*(.data..percpu..first)						\
-	. = ALIGN(cacheline);						\
+	. = ALIGN(PAGE_SIZE);						\
+	VMLINUX_SYMBOL(__per_cpu_user_mapped_start) = .;		\
 	*(.data..percpu..user_mapped)					\
 	*(.data..percpu..user_mapped..shared_aligned)			\
 	VMLINUX_SYMBOL(__per_cpu_user_mapped_end) = .;			\
-- 
2.13.6