[GIT,PULL] Please pull my kvm-ppc-next branch
mbox

Message ID 20160303023827.GB25005@fergus.ozlabs.ibm.com
State Accepted
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next

Message

Paul Mackerras March 3, 2016, 2:38 a.m. UTC
Paolo,

Here is my current queue of patches for the v4.6 merge window.  They
have all been in linux-next for at least a couple of days, and in most
cases weeks.

The highlights are:

* Enable VFIO device on PowerPC, from David Gibson
* Optimizations to speed up IPIs between vcpus in HV KVM,
  from Suresh Warrier (who is also Suresh E. Warrier)
* In-kernel handling of IOMMU hypercalls, and support for dynamic DMA
  windows (DDW), from Alexey Kardashevskiy.

There is one merge conflict with some commits from the kvm-arm tree,
as noted by Stephen Rothwell:

"Today's linux-next merge of the kvm-ppc-paulus tree got a conflict in:

  include/uapi/linux/kvm.h

between commits:

  808e738142e7 ("arm64: KVM: Add a new feature bit for PMUv3")
  f577f6c2a6a5 ("arm64: KVM: Introduce per-vcpu kvm device controls")

from the kvm-arm tree and commit:

  01d01d69192e ("KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_64 capability number")

from the kvm-ppc-paulus tree."

Stephen fixed it up like this:

diff --cc include/uapi/linux/kvm.h
index ba098d8ae5fc,b06208b2669c..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -862,8 -850,7 +862,9 @@@ struct kvm_ppc_smmu_info 
  #define KVM_CAP_IOEVENTFD_ANY_LENGTH 122
  #define KVM_CAP_HYPERV_SYNIC 123
  #define KVM_CAP_S390_RI 124
 -#define KVM_CAP_SPAPR_TCE_64 125
 +#define KVM_CAP_ARM_PMU_V3 125
 +#define KVM_CAP_VCPU_ATTRIBUTES 126
++#define KVM_CAP_SPAPR_TCE_64 127
  
  #ifdef KVM_CAP_IRQ_ROUTING

Please pull.

Thanks,
Paul.

The following changes since commit 765bdb406de4b6132e349c5d4e077866536a9cc0:

  Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2016-02-08 10:32:30 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next

for you to fetch changes up to 58ded4201ff028b15f6b317228faa5f154a0663f:

  KVM: PPC: Add support for 64bit TCE windows (2016-03-02 09:56:50 +1100)

----------------------------------------------------------------
Alexey Kardashevskiy (11):
      powerpc: Make vmalloc_to_phys() public
      KVM: PPC: Rework H_PUT_TCE/H_GET_TCE handlers
      KVM: PPC: Use RCU for arch.spapr_tce_tables
      KVM: PPC: Account TCE-containing pages in locked_vm
      KVM: PPC: Replace SPAPR_TCE_SHIFT with IOMMU_PAGE_SHIFT_4K
      KVM: PPC: Move reusable bits of H_PUT_TCE handler to helpers
      KVM: PPC: Add support for multiple-TCE hcalls
      KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_64 capability number
      KVM: PPC: Add @page_shift to kvmppc_spapr_tce_table
      KVM: PPC: Add @offset to kvmppc_spapr_tce_table
      KVM: PPC: Add support for 64bit TCE windows

David Gibson (1):
      vfio: Enable VFIO device for powerpc

Suresh E. Warrier (2):
      KVM: PPC: Book3S HV: Send IPI to host core to wake VCPU
      KVM: PPC: Book3S HV: Add tunable to control H_IPI redirection

Suresh Warrier (7):
      powerpc/smp: Support more IPI messages
      powerpc/smp: Add smp_muxed_ipi_set_message
      powerpc/xics: Add icp_native_cause_ipi_rm
      KVM: PPC: Book3S HV: Host-side RM data structures
      KVM: PPC: Book3S HV: Manage core host state
      KVM: PPC: Book3S HV: kvmppc_host_rm_ops - handle offlining CPUs
      KVM: PPC: Book3S HV: Host side kick VCPU when poked by real-mode KVM

 Documentation/virtual/kvm/api.txt        |  57 ++++++
 arch/powerpc/include/asm/kvm_book3s_64.h |   2 -
 arch/powerpc/include/asm/kvm_host.h      |   5 +-
 arch/powerpc/include/asm/kvm_ppc.h       |  51 ++++-
 arch/powerpc/include/asm/pgtable.h       |   3 +
 arch/powerpc/include/asm/smp.h           |   4 +
 arch/powerpc/include/asm/xics.h          |   1 +
 arch/powerpc/include/uapi/asm/kvm.h      |   9 +
 arch/powerpc/kernel/smp.c                |  28 ++-
 arch/powerpc/kvm/Makefile                |   2 +-
 arch/powerpc/kvm/book3s.c                |   2 +-
 arch/powerpc/kvm/book3s_64_vio.c         | 156 +++++++++++++--
 arch/powerpc/kvm/book3s_64_vio_hv.c      | 330 +++++++++++++++++++++++++++----
 arch/powerpc/kvm/book3s_hv.c             | 192 +++++++++++++++++-
 arch/powerpc/kvm/book3s_hv_builtin.c     |   3 +
 arch/powerpc/kvm/book3s_hv_rm_xics.c     | 131 +++++++++++-
 arch/powerpc/kvm/book3s_hv_rmhandlers.S  |   4 +-
 arch/powerpc/kvm/book3s_pr_papr.c        |  35 ++++
 arch/powerpc/kvm/powerpc.c               |  38 +++-
 arch/powerpc/mm/pgtable.c                |   8 +
 arch/powerpc/perf/hv-24x7.c              |   8 -
 arch/powerpc/sysdev/xics/icp-native.c    |  21 ++
 include/uapi/linux/kvm.h                 |   3 +
 23 files changed, 1005 insertions(+), 88 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Paolo Bonzini March 3, 2016, 1:46 p.m. UTC | #1
On 03/03/2016 03:38, Paul Mackerras wrote:
> Paolo,
> 
> Here is my current queue of patches for the v4.6 merge window.  They
> have all been in linux-next for at least a couple of days, and in most
> cases weeks.
> 
> The highlights are:
> 
> * Enable VFIO device on PowerPC, from David Gibson
> * Optimizations to speed up IPIs between vcpus in HV KVM,
>   from Suresh Warrier (who is also Suresh E. Warrier)
> * In-kernel handling of IOMMU hypercalls, and support for dynamic DMA
>   windows (DDW), from Alexey Kardashevskiy.

Pulled, thanks.

Paolo
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html