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>
Subject: [PATCH 01/24] asm-generic: add generic versions of mmu context functions
Date: Tue, 28 Jul 2020 13:33:42 +1000 [thread overview]
Message-ID: <20200728033405.78469-2-npiggin@gmail.com> (raw)
In-Reply-To: <20200728033405.78469-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: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arch@vger.kernel.org
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/microblaze/include/asm/mmu_context.h | 2 +-
arch/sh/include/asm/mmu_context.h | 2 +-
include/asm-generic/mmu_context.h | 57 +++++++++++++++++------
include/asm-generic/nommu_context.h | 19 ++++++++
4 files changed, 64 insertions(+), 16 deletions(-)
create mode 100644 include/asm-generic/nommu_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 48e67d544d53..9470d17c71c2 100644
--- a/arch/sh/include/asm/mmu_context.h
+++ b/arch/sh/include/asm/mmu_context.h
@@ -134,7 +134,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..86cea80a50df 100644
--- a/include/asm-generic/mmu_context.h
+++ b/include/asm-generic/mmu_context.h
@@ -3,44 +3,73 @@
#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
+ */
+#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..72b8d8b1d81e
--- /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>
+#include <asm-generic/mmu_context.h>
+
+static inline void switch_mm(struct mm_struct *prev,
+ struct mm_struct *next,
+ struct task_struct *tsk)
+{
+}
+
+#endif /* __ASM_GENERIC_NOMMU_H */
--
2.23.0
next prev parent reply other threads:[~2020-07-28 3:34 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 3:33 [PATCH 00/24] Use asm-generic for mmu_context no-op functions Nicholas Piggin
2020-07-28 3:33 ` Nicholas Piggin [this message]
2020-07-28 4:01 ` [PATCH 01/24] asm-generic: add generic versions of mmu context functions Vineet Gupta
2020-07-28 10:37 ` Nicholas Piggin
2020-08-26 13:59 ` Nicholas Piggin
2020-07-28 5:53 ` kernel test robot
2020-07-28 23:52 ` kernel test robot
2020-07-28 3:33 ` [PATCH 02/24] alpha: use asm-generic/mmu_context.h for no-op implementations Nicholas Piggin
2020-07-28 3:33 ` [PATCH 03/24] arc: " Nicholas Piggin
2020-07-28 3:58 ` Vineet Gupta
2020-07-28 3:33 ` [PATCH 04/24] arm: " Nicholas Piggin
2020-07-28 4:14 ` Vineet Gupta
2020-08-26 14:14 ` Nicholas Piggin
2020-07-28 3:33 ` [PATCH 05/24] arm64: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 06/24] csky: " Nicholas Piggin
2020-07-28 4:09 ` Guo Ren
2020-07-28 3:33 ` [PATCH 07/24] hexagon: " Nicholas Piggin
2020-08-11 18:34 ` Brian Cain
2020-07-28 3:33 ` [PATCH 08/24] ia64: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 09/24] m68k: " Nicholas Piggin
2020-07-30 8:11 ` kernel test robot
2020-07-28 3:33 ` [PATCH 10/24] microblaze: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 11/24] mips: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 12/24] nds32: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 13/24] nios2: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 14/24] openrisc: " Nicholas Piggin
2020-07-29 11:45 ` Stafford Horne
2020-08-26 14:33 ` Nicholas Piggin
2020-07-28 3:33 ` [PATCH 15/24] parisc: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 16/24] powerpc: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 17/24] riscv: " Nicholas Piggin
2020-07-30 21:20 ` Palmer Dabbelt
2020-07-28 3:33 ` [PATCH 18/24] s390: " Nicholas Piggin
2020-07-28 3:34 ` [PATCH 19/24] sh: " Nicholas Piggin
2020-07-28 3:34 ` [PATCH 20/24] sparc: " Nicholas Piggin
2020-07-28 3:34 ` [PATCH 21/24] um: " Nicholas Piggin
2020-07-28 3:34 ` [PATCH 22/24] unicore32: " Nicholas Piggin
2020-07-28 3:34 ` [PATCH 23/24] x86: " Nicholas Piggin
2020-07-28 10:54 ` peterz
2020-07-28 3:34 ` [PATCH 24/24] xtensa: " 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=20200728033405.78469-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 \
/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).