linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: paulus@samba.org, aik@ozlabs.ru, benh@kernel.crashing.org
Cc: bharata@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org,
	David Gibson <david@gibson.dropbear.id.au>
Subject: [RFCv2 16/25] powerpc/kvm: HPT resizing stub implementation
Date: Tue,  8 Mar 2016 14:08:53 +1100	[thread overview]
Message-ID: <1457406542-6210-17-git-send-email-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <1457406542-6210-1-git-send-email-david@gibson.dropbear.id.au>

This patch adds a stub (always failing) implementation of the hypercalls
for the HPT resizing PAPR extension.

For now we include a hack which makes it safe for qemu to call ENABLE_HCALL
on these hypercalls, although it will have no effect.  That should go away
once the PAPR change is formalized and we can use "real" hcall numbers.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 arch/powerpc/include/asm/kvm_book3s.h |  6 ++++++
 arch/powerpc/kvm/book3s_64_mmu_hv.c   | 19 +++++++++++++++++++
 arch/powerpc/kvm/book3s_hv.c          |  8 ++++++++
 arch/powerpc/kvm/powerpc.c            |  6 ++++++
 4 files changed, 39 insertions(+)

diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h
index 8f39796..81f2b77 100644
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -191,6 +191,12 @@ extern void kvmppc_copy_to_svcpu(struct kvmppc_book3s_shadow_vcpu *svcpu,
 				 struct kvm_vcpu *vcpu);
 extern void kvmppc_copy_from_svcpu(struct kvm_vcpu *vcpu,
 				   struct kvmppc_book3s_shadow_vcpu *svcpu);
+extern unsigned long do_h_resize_hpt_prepare(struct kvm_vcpu *vcpu,
+					     unsigned long flags,
+					     unsigned long shift);
+extern unsigned long do_h_resize_hpt_commit(struct kvm_vcpu *vcpu,
+					    unsigned long flags,
+					    unsigned long shift);
 
 static inline struct kvmppc_vcpu_book3s *to_book3s(struct kvm_vcpu *vcpu)
 {
diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index 4547b6e..b92384f 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -1118,6 +1118,25 @@ void kvmppc_unpin_guest_page(struct kvm *kvm, void *va, unsigned long gpa,
 }
 
 /*
+ * HPT resizing
+ */
+
+unsigned long do_h_resize_hpt_prepare(struct kvm_vcpu *vcpu,
+				      unsigned long flags,
+				      unsigned long shift)
+{
+	return H_HARDWARE;
+}
+
+unsigned long do_h_resize_hpt_commit(struct kvm_vcpu *vcpu,
+				     unsigned long flags,
+				     unsigned long shift)
+{
+	return H_HARDWARE;
+}
+
+
+/*
  * Functions for reading and writing the hash table via reads and
  * writes on a file descriptor.
  *
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index a2730ca..5a451f8 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -726,6 +726,14 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)
 					kvmppc_get_gpr(vcpu, 5),
 					kvmppc_get_gpr(vcpu, 6));
 		break;
+	case H_RESIZE_HPT_PREPARE:
+		ret = do_h_resize_hpt_prepare(vcpu, kvmppc_get_gpr(vcpu, 4),
+					      kvmppc_get_gpr(vcpu, 5));
+		break;
+	case H_RESIZE_HPT_COMMIT:
+		ret = do_h_resize_hpt_commit(vcpu, kvmppc_get_gpr(vcpu, 4),
+					     kvmppc_get_gpr(vcpu, 5));
+		break;
 	case H_RTAS:
 		if (list_empty(&vcpu->kvm->arch.rtas_tokens))
 			return RESUME_HOST;
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index a4250f1..eeda4a8 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -1287,6 +1287,12 @@ static int kvm_vm_ioctl_enable_cap(struct kvm *kvm,
 		unsigned long hcall = cap->args[0];
 
 		r = -EINVAL;
+		/* Hack: until we have proper hcall numbers allocated */
+		if ((hcall == H_RESIZE_HPT_PREPARE)
+		    || (hcall == H_RESIZE_HPT_COMMIT)) {
+			r = 0;
+			break;
+		}
 		if (hcall > MAX_HCALL_OPCODE || (hcall & 3) ||
 		    cap->args[1] > 1)
 			break;
-- 
2.5.0

  parent reply	other threads:[~2016-03-08  3:09 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-08  3:08 [RFCv2 00/25] PAPR HPT resizing, guest side & host side preliminaries David Gibson
2016-03-08  3:08 ` [RFCv2 01/25] powerpc/mm: Clean up error handling for htab_remove_mapping David Gibson
2016-03-08  3:08 ` [RFCv2 02/25] powerpc/mm: Handle removing maybe-present bolted HPTEs David Gibson
2016-03-08  3:08 ` [RFCv2 03/25] powerpc/mm: Clean up memory hotplug failure paths David Gibson
2016-03-08  3:08 ` [RFCv2 04/25] powerpc/mm: Split hash page table sizing heuristic into a helper David Gibson
2016-03-08  3:08 ` [RFCv2 05/25] pseries: Add hypercall wrappers for hash page table resizing David Gibson
2016-03-08  3:08 ` [RFCv2 06/25] pseries: Add support for hash " David Gibson
2016-03-08  3:08 ` [RFCv2 07/25] pseries: Advertise HPT resizing support via CAS David Gibson
2016-03-08  3:08 ` [RFCv2 08/25] pseries: Automatically resize HPT for memory hot add/remove David Gibson
2016-03-08  3:08 ` [RFCv2 09/25] powerpc/kvm: Corectly report KVM_CAP_PPC_ALLOC_HTAB David Gibson
2016-03-08  3:08 ` [RFCv2 10/25] powerpc/kvm: Add capability flag for hashed page table resizing David Gibson
2016-03-08  3:08 ` [RFCv2 11/25] powerpc/kvm: Rename kvm_alloc_hpt() for clarity David Gibson
2016-03-08  3:08 ` [RFCv2 12/25] powerpc/kvm: Gather HPT related variables into sub-structure David Gibson
2016-03-08  3:08 ` [RFCv2 13/25] powerpc/kvm: Don't store values derivable from HPT order David Gibson
2016-03-08  3:08 ` [RFCv2 14/25] powerpc/kvm: Split HPT allocation from activation David Gibson
2016-03-08  3:08 ` [RFCv2 15/25] powerpc/kvm: Allow KVM_PPC_ALLOCATE_HTAB ioctl() to change HPT size David Gibson
2016-03-08  3:08 ` David Gibson [this message]
2016-03-08  3:08 ` [RFCv2 17/25] powerpc/kvm: Advertise availablity of HPT resizing on KVM HV David Gibson
2016-03-08  3:08 ` [RFCv2 18/25] powerpc/kvm: Outline of HPT resizing implementation David Gibson
2016-03-08  3:08 ` [RFCv2 19/25] powerpc/kbm: Allocations for HPT resizing David Gibson
2016-03-08  3:08 ` [RFCv2 20/25] powerpc/kvm: Make MMU notifier handlers more flexible David Gibson
2016-03-08  3:08 ` [RFCv2 21/25] powerpc/kvm: Make MMU notifiers HPT resize aware David Gibson
2016-03-08  3:08 ` [RFCv2 22/25] powerpc/kvm: Exclude HPT resizes when collecting the dirty log David Gibson
2016-03-08  3:09 ` [RFCv2 23/25] powerpc/kvm: Rehashing for HPT resizing David Gibson
2016-03-08  3:09 ` [RFCv2 24/25] powerpc/kvm: HPT resize pivot David Gibson
2016-03-08  3:09 ` [RFCv2 25/25] powerpc/kvm: Harvest RC bits from old HPT after HPT resize David Gibson

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=1457406542-6210-17-git-send-email-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=aik@ozlabs.ru \
    --cc=benh@kernel.crashing.org \
    --cc=bharata@linux.vnet.ibm.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=paulus@samba.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).