From: Nicholas Piggin <npiggin@gmail.com>
To: linux-arch@vger.kernel.org
Cc: Nicholas Piggin <npiggin@gmail.com>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Arnd Bergmann <arnd@arndb.de>, Mike Rapoport <rppt@linux.ibm.com>
Subject: [PATCH v3 01/23] asm-generic: add generic MMU versions of mmu context functions
Date: Wed, 2 Sep 2020 00:15:17 +1000 [thread overview]
Message-ID: <20200901141539.1757549-2-npiggin@gmail.com> (raw)
In-Reply-To: <20200901141539.1757549-1-npiggin@gmail.com>
Many of these are no-ops on many architectures, so extend mmu_context.h
to cover MMU and NOMMU, and split the NOMMU bits out to nommu_context.h
Cc: linux-arch@vger.kernel.org
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/c6x/include/asm/mmu_context.h | 6 +++
arch/microblaze/include/asm/mmu_context.h | 2 +-
arch/sh/include/asm/mmu_context.h | 2 +-
include/asm-generic/mmu_context.h | 58 +++++++++++++++++------
include/asm-generic/nommu_context.h | 19 ++++++++
5 files changed, 71 insertions(+), 16 deletions(-)
create mode 100644 arch/c6x/include/asm/mmu_context.h
create mode 100644 include/asm-generic/nommu_context.h
diff --git a/arch/c6x/include/asm/mmu_context.h b/arch/c6x/include/asm/mmu_context.h
new file mode 100644
index 000000000000..d2659d0a3297
--- /dev/null
+++ b/arch/c6x/include/asm/mmu_context.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_C6X_MMU_CONTEXT_H
+#define _ASM_C6X_MMU_CONTEXT_H
+
+#include <asm-generic/nommu_context.h>
+
+#endif /* _ASM_C6X_MMU_CONTEXT_H */
diff --git a/arch/microblaze/include/asm/mmu_context.h b/arch/microblaze/include/asm/mmu_context.h
index f74f9da07fdc..34004efb3def 100644
--- a/arch/microblaze/include/asm/mmu_context.h
+++ b/arch/microblaze/include/asm/mmu_context.h
@@ -2,5 +2,5 @@
#ifdef CONFIG_MMU
# include <asm/mmu_context_mm.h>
#else
-# include <asm-generic/mmu_context.h>
+# include <asm-generic/nommu_context.h>
#endif
diff --git a/arch/sh/include/asm/mmu_context.h b/arch/sh/include/asm/mmu_context.h
index f664e51e8a15..461b1304580b 100644
--- a/arch/sh/include/asm/mmu_context.h
+++ b/arch/sh/include/asm/mmu_context.h
@@ -133,7 +133,7 @@ static inline void switch_mm(struct mm_struct *prev,
#define set_TTB(pgd) do { } while (0)
#define get_TTB() (0)
-#include <asm-generic/mmu_context.h>
+#include <asm-generic/nommu_context.h>
#endif /* CONFIG_MMU */
diff --git a/include/asm-generic/mmu_context.h b/include/asm-generic/mmu_context.h
index 6be9106fb6fb..91727065bacb 100644
--- a/include/asm-generic/mmu_context.h
+++ b/include/asm-generic/mmu_context.h
@@ -3,44 +3,74 @@
#define __ASM_GENERIC_MMU_CONTEXT_H
/*
- * Generic hooks for NOMMU architectures, which do not need to do
- * anything special here.
+ * Generic hooks to implement no-op functionality.
*/
-#include <asm-generic/mm_hooks.h>
-
struct task_struct;
struct mm_struct;
+/*
+ * enter_lazy_tlb - Called when "tsk" is about to enter lazy TLB mode.
+ *
+ * @mm: the currently active mm context which is becoming lazy
+ * @tsk: task which is entering lazy tlb
+ *
+ * tsk->mm will be NULL
+ */
+#ifndef enter_lazy_tlb
static inline void enter_lazy_tlb(struct mm_struct *mm,
struct task_struct *tsk)
{
}
+#endif
+/**
+ * init_new_context - Initialize context of a new mm_struct.
+ * @tsk: task struct for the mm
+ * @mm: the new mm struct
+ * @return: 0 on success, -errno on failure
+ */
+#ifndef init_new_context
static inline int init_new_context(struct task_struct *tsk,
struct mm_struct *mm)
{
return 0;
}
+#endif
+/**
+ * destroy_context - Undo init_new_context when the mm is going away
+ * @mm: old mm struct
+ */
+#ifndef destroy_context
static inline void destroy_context(struct mm_struct *mm)
{
}
+#endif
-static inline void deactivate_mm(struct task_struct *task,
- struct mm_struct *mm)
-{
-}
-
-static inline void switch_mm(struct mm_struct *prev,
- struct mm_struct *next,
- struct task_struct *tsk)
+/**
+ * activate_mm - called after exec switches the current task to a new mm, to switch to it
+ * @prev_mm: previous mm of this task
+ * @next_mm: new mm
+ */
+#ifndef activate_mm
+static inline void activate_mm(struct mm_struct *prev_mm,
+ struct mm_struct *next_mm)
{
+ switch_mm(prev_mm, next_mm, current);
}
+#endif
-static inline void activate_mm(struct mm_struct *prev_mm,
- struct mm_struct *next_mm)
+/**
+ * dectivate_mm - called when an mm is released after exit or exec switches away from it
+ * @tsk: the task
+ * @mm: the old mm
+ */
+#ifndef deactivate_mm
+static inline void deactivate_mm(struct task_struct *tsk,
+ struct mm_struct *mm)
{
}
+#endif
#endif /* __ASM_GENERIC_MMU_CONTEXT_H */
diff --git a/include/asm-generic/nommu_context.h b/include/asm-generic/nommu_context.h
new file mode 100644
index 000000000000..4f916f9e16cd
--- /dev/null
+++ b/include/asm-generic/nommu_context.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __ASM_GENERIC_NOMMU_H
+#define __ASM_GENERIC_NOMMU_H
+
+/*
+ * Generic hooks for NOMMU architectures, which do not need to do
+ * anything special here.
+ */
+#include <asm-generic/mm_hooks.h>
+
+static inline void switch_mm(struct mm_struct *prev,
+ struct mm_struct *next,
+ struct task_struct *tsk)
+{
+}
+
+#include <asm-generic/mmu_context.h>
+
+#endif /* __ASM_GENERIC_NOMMU_H */
--
2.23.0
next prev parent reply other threads:[~2020-09-01 14:47 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-01 14:15 [PATCH v3 00/23] Use asm-generic for mmu_context no-op functions Nicholas Piggin
2020-09-01 14:15 ` Nicholas Piggin [this message]
2020-09-01 14:15 ` [PATCH v3 02/23] alpha: use asm-generic/mmu_context.h for no-op implementations Nicholas Piggin
2020-09-01 16:51 ` Matt Turner
2020-09-01 14:15 ` [PATCH v3 03/23] arc: " Nicholas Piggin
2020-09-01 18:32 ` Vineet Gupta
2020-09-01 14:15 ` [PATCH v3 04/23] arm: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 05/23] arm64: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 06/23] csky: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 07/23] hexagon: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 08/23] ia64: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 09/23] m68k: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 10/23] microblaze: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 11/23] mips: " Nicholas Piggin
2020-09-01 15:23 ` Thomas Bogendoerfer
2020-09-01 14:15 ` [PATCH v3 12/23] nds32: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 13/23] nios2: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 14/23] openrisc: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 15/23] parisc: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 16/23] powerpc: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 17/23] riscv: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 18/23] s390: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 19/23] sh: " Nicholas Piggin
2020-09-03 5:57 ` Rich Felker
2020-09-01 14:15 ` [PATCH v3 20/23] sparc: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 21/23] um: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 22/23] x86: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 23/23] xtensa: " Nicholas Piggin
2020-09-01 17:55 ` Max Filippov
2020-09-09 11:27 ` [PATCH v3 00/23] Use asm-generic for mmu_context no-op functions Arnd Bergmann
2020-10-09 14:01 ` Arnd Bergmann
2020-10-10 2:02 ` Stephen Rothwell
2020-10-10 8:25 ` Arnd Bergmann
2020-10-10 19:00 ` Stephen Rothwell
2020-10-19 1:00 ` Nicholas Piggin
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=20200901141539.1757549-2-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=arnd@arndb.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=rppt@linux.ibm.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).