From: Michael Ellerman <mpe@ellerman.id.au>
To: linuxppc-dev@ozlabs.org
Cc: aneesh.kumar@linux.vnet.ibm.com
Subject: [PATCH v6 07/19] powerpc/mm/hash: Abstract context id allocation for KVM
Date: Thu, 30 Mar 2017 23:03:55 +1100 [thread overview]
Message-ID: <1490875447-4016-7-git-send-email-mpe@ellerman.id.au> (raw)
In-Reply-To: <1490875447-4016-1-git-send-email-mpe@ellerman.id.au>
KVM wants to be able to allocate an MMU context id, which it does
currently by calling __init_new_context().
We're about to rework that code, so provide a wrapper for KVM so it
can not worry about the details.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/include/asm/mmu_context.h | 2 +-
arch/powerpc/kvm/book3s_64_mmu_host.c | 2 +-
arch/powerpc/mm/mmu_context_book3s64.c | 10 ++++++++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h
index b9e3f0aca261..7d721101ec78 100644
--- a/arch/powerpc/include/asm/mmu_context.h
+++ b/arch/powerpc/include/asm/mmu_context.h
@@ -51,7 +51,7 @@ static inline void switch_mmu_context(struct mm_struct *prev,
return switch_slb(tsk, next);
}
-extern int __init_new_context(void);
+extern int hash__alloc_context_id(void);
extern void __destroy_context(int context_id);
static inline void mmu_context_init(void) { }
#else
diff --git a/arch/powerpc/kvm/book3s_64_mmu_host.c b/arch/powerpc/kvm/book3s_64_mmu_host.c
index a587e8f4fd26..b35f44c98d1f 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_host.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_host.c
@@ -390,7 +390,7 @@ int kvmppc_mmu_init(struct kvm_vcpu *vcpu)
struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);
int err;
- err = __init_new_context();
+ err = hash__alloc_context_id();
if (err < 0)
return -1;
vcpu3s->context_id[0] = err;
diff --git a/arch/powerpc/mm/mmu_context_book3s64.c b/arch/powerpc/mm/mmu_context_book3s64.c
index 73bf6e14c3aa..650a498b1de9 100644
--- a/arch/powerpc/mm/mmu_context_book3s64.c
+++ b/arch/powerpc/mm/mmu_context_book3s64.c
@@ -30,7 +30,7 @@
static DEFINE_SPINLOCK(mmu_context_lock);
static DEFINE_IDA(mmu_context_ida);
-int __init_new_context(void)
+static int __init_new_context(void)
{
int index;
int err;
@@ -57,7 +57,13 @@ int __init_new_context(void)
return index;
}
-EXPORT_SYMBOL_GPL(__init_new_context);
+
+int hash__alloc_context_id(void)
+{
+ return __init_new_context();
+}
+EXPORT_SYMBOL_GPL(hash__alloc_context_id);
+
static int radix__init_new_context(struct mm_struct *mm, int index)
{
unsigned long rts_field;
--
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 ` [PATCH v6 03/19] powerpc/mm: Move copy_mm_to_paca to paca.c Michael Ellerman
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 ` Michael Ellerman [this message]
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-7-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).