From 2882a6b553093b8018f0a14175cf8d7a5fcdb633 Mon Sep 17 00:00:00 2001

From: David Gibson <dgibson@redhat.com>

Date: Thu, 27 Apr 2017 01:16:30 +0200

Subject: [PATCH 16/23] target-ppc: kvm: make use of KVM_CREATE_SPAPR_TCE_64

RH-Author: David Gibson <dgibson@redhat.com>

Message-id: <20170427011630.389-1-dgibson@redhat.com>

Patchwork-id: 74912

O-Subject: [RHEL-7.4 qemu-kvm-rhev PATCH] target-ppc: kvm: make use of KVM_CREATE_SPAPR_TCE_64

Bugzilla: 1440619

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

From: Alexey Kardashevskiy <aik@ozlabs.ru>

KVM_CAP_SPAPR_TCE capability allows creating TCE tables in KVM which

allows having in-kernel acceleration for H_PUT_TCE_xxx hypercalls.

However it only supports 32bit DMA windows at zero bus offset.

There is a new KVM_CAP_SPAPR_TCE_64 capability which supports 64bit

window size, variable page size and bus offset.

This makes use of the new capability. The kernel headers are already

updated as the kernel support went in to v4.6.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

(cherry picked from commit d6ee2a7c85088d587fb0e0376fba1fa20d59c9f3)

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1440619

Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=13095246

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/ppc/spapr_iommu.c |  8 +++++---

 target/ppc/kvm.c     | 48 +++++++++++++++++++++++++++++++++++++-----------

 target/ppc/kvm_ppc.h | 12 +++++++-----

 3 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c

index ae30bbe..29c80bb 100644

--- a/hw/ppc/spapr_iommu.c

+++ b/hw/ppc/spapr_iommu.c

@@ -79,15 +79,16 @@ static IOMMUAccessFlags spapr_tce_iommu_access_flags(uint64_t tce)

 static uint64_t *spapr_tce_alloc_table(uint32_t liobn,

                                        uint32_t page_shift,

+                                       uint64_t bus_offset,

                                        uint32_t nb_table,

                                        int *fd,

                                        bool need_vfio)

 {

     uint64_t *table = NULL;

-    uint64_t window_size = (uint64_t)nb_table << page_shift;

-    if (kvm_enabled() && !(window_size >> 32)) {

-        table = kvmppc_create_spapr_tce(liobn, window_size, fd, need_vfio);

+    if (kvm_enabled()) {

+        table = kvmppc_create_spapr_tce(liobn, page_shift, bus_offset, nb_table,

+                                        fd, need_vfio);

     }

     if (!table) {

@@ -342,6 +343,7 @@ void spapr_tce_table_enable(sPAPRTCETable *tcet,

     tcet->nb_table = nb_table;

     tcet->table = spapr_tce_alloc_table(tcet->liobn,

                                         tcet->page_shift,

+                                        tcet->bus_offset,

                                         tcet->nb_table,

                                         &tcet->fd,

                                         tcet->need_vfio);

diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c

index 9f1f132..031d31f 100644

--- a/target/ppc/kvm.c

+++ b/target/ppc/kvm.c

@@ -73,6 +73,7 @@ static int cap_booke_sregs;

 static int cap_ppc_smt;

 static int cap_ppc_rma;

 static int cap_spapr_tce;

+static int cap_spapr_tce_64;

 static int cap_spapr_multitce;

 static int cap_spapr_vfio;

 static int cap_hior;

@@ -125,6 +126,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)

     cap_ppc_smt = kvm_check_extension(s, KVM_CAP_PPC_SMT);

     cap_ppc_rma = kvm_check_extension(s, KVM_CAP_PPC_RMA);

     cap_spapr_tce = kvm_check_extension(s, KVM_CAP_SPAPR_TCE);

+    cap_spapr_tce_64 = kvm_check_extension(s, KVM_CAP_SPAPR_TCE_64);

     cap_spapr_multitce = kvm_check_extension(s, KVM_CAP_SPAPR_MULTITCE);

     cap_spapr_vfio = false;

     cap_one_reg = kvm_check_extension(s, KVM_CAP_ONE_REG);

@@ -2132,13 +2134,10 @@ bool kvmppc_spapr_use_multitce(void)

     return cap_spapr_multitce;

 }

-void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t window_size, int *pfd,

-                              bool need_vfio)

+void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t page_shift,

+                              uint64_t bus_offset, uint32_t nb_table,

+                              int *pfd, bool need_vfio)

 {

-    struct kvm_create_spapr_tce args = {

-        .liobn = liobn,

-        .window_size = window_size,

-    };

     long len;

     int fd;

     void *table;

@@ -2151,14 +2150,41 @@ void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t window_size, int *pfd,

         return NULL;

     }

-    fd = kvm_vm_ioctl(kvm_state, KVM_CREATE_SPAPR_TCE, &args);

-    if (fd < 0) {

-        fprintf(stderr, "KVM: Failed to create TCE table for liobn 0x%x\n",

-                liobn);

+    if (cap_spapr_tce_64) {

+        struct kvm_create_spapr_tce_64 args = {

+            .liobn = liobn,

+            .page_shift = page_shift,

+            .offset = bus_offset >> page_shift,

+            .size = nb_table,

+            .flags = 0

+        };

+        fd = kvm_vm_ioctl(kvm_state, KVM_CREATE_SPAPR_TCE_64, &args);

+        if (fd < 0) {

+            fprintf(stderr,

+                    "KVM: Failed to create TCE64 table for liobn 0x%x\n",

+                    liobn);

+            return NULL;

+        }

+    } else if (cap_spapr_tce) {

+        uint64_t window_size = (uint64_t) nb_table << page_shift;

+        struct kvm_create_spapr_tce args = {

+            .liobn = liobn,

+            .window_size = window_size,

+        };

+        if ((window_size != args.window_size) || bus_offset) {

+            return NULL;

+        }

+        fd = kvm_vm_ioctl(kvm_state, KVM_CREATE_SPAPR_TCE, &args);

+        if (fd < 0) {

+            fprintf(stderr, "KVM: Failed to create TCE table for liobn 0x%x\n",

+                    liobn);

+            return NULL;

+        }

+    } else {

         return NULL;

     }

-    len = (window_size / SPAPR_TCE_PAGE_SIZE) * sizeof(uint64_t);

+    len = nb_table * sizeof(uint64_t);

     /* FIXME: round this up to page size */

     table = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);

diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h

index 8e9f42d..08ecf75 100644

--- a/target/ppc/kvm_ppc.h

+++ b/target/ppc/kvm_ppc.h

@@ -36,8 +36,9 @@ int kvmppc_booke_watchdog_enable(PowerPCCPU *cpu);

 #ifndef CONFIG_USER_ONLY

 off_t kvmppc_alloc_rma(void **rma);

 bool kvmppc_spapr_use_multitce(void);

-void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t window_size, int *pfd,

-                              bool need_vfio);

+void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t page_shift,

+                              uint64_t bus_offset, uint32_t nb_table,

+                              int *pfd, bool need_vfio);

 int kvmppc_remove_spapr_tce(void *table, int pfd, uint32_t window_size);

 int kvmppc_reset_htab(int shift_hint);

 uint64_t kvmppc_rma_size(uint64_t current_size, unsigned int hash_shift);

@@ -167,9 +168,10 @@ static inline bool kvmppc_spapr_use_multitce(void)

     return false;

 }

-static inline void *kvmppc_create_spapr_tce(uint32_t liobn,

-                                            uint32_t window_size, int *fd,

-                                            bool need_vfio)

+static inline void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t page_shift,

+                                            uint64_t bus_offset,

+                                            uint32_t nb_table,

+                                            int *pfd, bool need_vfio)

 {

     return NULL;

 }

-- 

1.8.3.1