From: Michael Ellerman <mpe@ellerman.id.au>
To: linuxppc-dev@ozlabs.org
Cc: aneesh.kumar@linux.vnet.ibm.com
Subject: [PATCH v6 03/19] powerpc/mm: Move copy_mm_to_paca to paca.c
Date: Thu, 30 Mar 2017 23:03:51 +1100 [thread overview]
Message-ID: <1490875447-4016-3-git-send-email-mpe@ellerman.id.au> (raw)
In-Reply-To: <1490875447-4016-1-git-send-email-mpe@ellerman.id.au>
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
We also update the function arg to struct mm_struct. Move this so that function
finds the definition of struct mm_struct. No functional change in this patch.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/include/asm/paca.h | 18 +-----------------
arch/powerpc/kernel/paca.c | 19 +++++++++++++++++++
arch/powerpc/mm/hash_utils_64.c | 4 ++--
arch/powerpc/mm/slb.c | 2 +-
arch/powerpc/mm/slice.c | 2 +-
5 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index 708c3e592eeb..f48c250339fd 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -206,23 +206,7 @@ struct paca_struct {
#endif
};
-#ifdef CONFIG_PPC_BOOK3S
-static inline void copy_mm_to_paca(mm_context_t *context)
-{
- get_paca()->mm_ctx_id = context->id;
-#ifdef CONFIG_PPC_MM_SLICES
- get_paca()->mm_ctx_low_slices_psize = context->low_slices_psize;
- memcpy(&get_paca()->mm_ctx_high_slices_psize,
- &context->high_slices_psize, SLICE_ARRAY_SIZE);
-#else
- get_paca()->mm_ctx_user_psize = context->user_psize;
- get_paca()->mm_ctx_sllp = context->sllp;
-#endif
-}
-#else
-static inline void copy_mm_to_paca(mm_context_t *context){}
-#endif
-
+extern void copy_mm_to_paca(struct mm_struct *mm);
extern struct paca_struct *paca;
extern void initialise_paca(struct paca_struct *new_paca, int cpu);
extern void setup_paca(struct paca_struct *new_paca);
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
index dfc479df9634..e2cf745a4b94 100644
--- a/arch/powerpc/kernel/paca.c
+++ b/arch/powerpc/kernel/paca.c
@@ -245,3 +245,22 @@ void __init free_unused_pacas(void)
free_lppacas();
}
+
+void copy_mm_to_paca(struct mm_struct *mm)
+{
+#ifdef CONFIG_PPC_BOOK3S
+ mm_context_t *context = &mm->context;
+
+ get_paca()->mm_ctx_id = context->id;
+#ifdef CONFIG_PPC_MM_SLICES
+ get_paca()->mm_ctx_low_slices_psize = context->low_slices_psize;
+ memcpy(&get_paca()->mm_ctx_high_slices_psize,
+ &context->high_slices_psize, SLICE_ARRAY_SIZE);
+#else /* CONFIG_PPC_MM_SLICES */
+ get_paca()->mm_ctx_user_psize = context->user_psize;
+ get_paca()->mm_ctx_sllp = context->sllp;
+#endif
+#else /* CONFIG_PPC_BOOK3S */
+ return;
+#endif
+}
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index d0ee17029e99..716255f88bbd 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -1133,7 +1133,7 @@ void demote_segment_4k(struct mm_struct *mm, unsigned long addr)
copro_flush_all_slbs(mm);
if ((get_paca_psize(addr) != MMU_PAGE_4K) && (current->mm == mm)) {
- copy_mm_to_paca(&mm->context);
+ copy_mm_to_paca(mm);
slb_flush_and_rebolt();
}
}
@@ -1205,7 +1205,7 @@ static void check_paca_psize(unsigned long ea, struct mm_struct *mm,
{
if (user_region) {
if (psize != get_paca_psize(ea)) {
- copy_mm_to_paca(&mm->context);
+ copy_mm_to_paca(mm);
slb_flush_and_rebolt();
}
} else if (get_paca()->vmalloc_sllp !=
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index 5e01b2ece1d0..98ae810b8c21 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -229,7 +229,7 @@ void switch_slb(struct task_struct *tsk, struct mm_struct *mm)
asm volatile("slbie %0" : : "r" (slbie_data));
get_paca()->slb_cache_ptr = 0;
- copy_mm_to_paca(&mm->context);
+ copy_mm_to_paca(mm);
/*
* preload some userspace segments into the SLB.
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index d1da357583e3..175e0dbce89b 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -192,7 +192,7 @@ static void slice_flush_segments(void *parm)
if (mm != current->active_mm)
return;
- copy_mm_to_paca(¤t->active_mm->context);
+ copy_mm_to_paca(current->active_mm);
local_irq_save(flags);
slb_flush_and_rebolt();
--
2.7.4
next prev parent reply other threads:[~2017-03-30 12:04 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-30 12:03 [PATCH v6 01/19] powerpc/mm/slice: Convert slice_mask high slice to a bitmap Michael Ellerman
2017-03-30 12:03 ` [PATCH v6 02/19] powerpc/mm/slice: Update the function prototype Michael Ellerman
2017-03-30 12:03 ` Michael Ellerman [this message]
2017-03-30 12:03 ` [PATCH v6 04/19] powerpc/mm: Remove checks that TASK_SIZE_USER64 is too small Michael Ellerman
2017-03-30 12:03 ` [PATCH v6 05/19] powerpc/mm/slice: Move slice_mask struct definition to slice.c Michael Ellerman
2017-03-30 12:03 ` [PATCH v6 06/19] powerpc/mm/slice: Update slice mask printing to use bitmap printing Michael Ellerman
2017-03-30 12:03 ` [PATCH v6 07/19] powerpc/mm/hash: Abstract context id allocation for KVM Michael Ellerman
2017-03-30 12:03 ` [PATCH v6 08/19] powerpc/mm/hash: Pull hash constants into hash__alloc_context_id() Michael Ellerman
2017-03-30 12:03 ` [PATCH v6 09/19] powerpc/mm: Split radix vs hash mm context initialisation Michael Ellerman
2017-03-30 12:03 ` [PATCH v6 10/19] powerpc/mm/hash: Use context ids 1-4 for the kernel Michael Ellerman
2017-04-28 10:57 ` Michal Suchánek
2017-04-28 12:05 ` Michael Ellerman
2017-03-30 12:03 ` [PATCH v6 11/19] powerpc/mm/hash: Check for non-kernel address in get_kernel_vsid() Michael Ellerman
2017-03-30 12:04 ` [PATCH v6 12/19] powerpc/mm/hash: Support 68 bit VA Michael Ellerman
2017-03-30 12:04 ` [PATCH v6 13/19] powerpc/mm/hash: Convert mask to unsigned long Michael Ellerman
2017-03-30 12:04 ` [PATCH v6 14/19] powerpc/mm/hash: Increase VA range to 128TB Michael Ellerman
2017-03-30 12:04 ` [PATCH v6 15/19] powerpc/mm: Add addr_limit to mm_context and use it to derive max slice index Michael Ellerman
2017-03-30 12:04 ` [PATCH v6 16/19] powerpc/mm/hash: Store addr_limit in PACA Michael Ellerman
2017-03-30 12:04 ` [PATCH v6 17/19] powerpc/pseries: Skip using reserved virtual address range Michael Ellerman
2017-03-30 12:04 ` [PATCH v6 18/19] powerpc/mm: Switch some TASK_SIZE checks to use mm_context addr_limit Michael Ellerman
2017-03-30 12:04 ` [PATCH v6 19/19] powerpc/mm: Enable mappings above 128TB Michael Ellerman
2017-04-03 10:13 ` [v6, 01/19] powerpc/mm/slice: Convert slice_mask high slice to a bitmap Michael Ellerman
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=1490875447-4016-3-git-send-email-mpe@ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=linuxppc-dev@ozlabs.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).