Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 updates from Martin Schwidefsky:
 "Mostly cleanups and bug-fixes, with two exceptions.

  The first is lazy flushing of I/O-TLBs for PCI to improve performance,
  the second is software dirty bits in the pmd for the madvise-free
  implementation"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (24 commits)
  s390/locking: Reenable optimistic spinning
  s390/mm: implement dirty bits for large segment table entries
  KVM: s390/mm: Fix page table locking vs. split pmd lock
  s390/dasd: fix camel case
  s390/3215: fix hanging console issue
  s390/irq: improve displayed interrupt order in /proc/interrupts
  s390/seccomp: fix error return for filtered system calls
  s390/pci: introduce lazy IOTLB flushing for DMA unmap
  dasd: fix error recovery for alias devices during format
  dasd: fix list_del corruption during format
  dasd: fix unresponsive device during format
  dasd: use aliases for formatted devices during format
  s390/pci: fix kmsg component
  s390/kdump: Return NOTIFY_OK for all actions other than MEM_GOING_OFFLINE
  s390/watchdog: Fix module name in Kconfig help text
  s390/dasd: replace seq_printf by seq_puts
  s390/dasd: replace pr_warning by pr_warn
  s390/dasd: Move EXPORT_SYMBOL after function/variable
  s390/dasd: remove unnecessary null test before debugfs_remove
  s390/zfcp: use qdio buffer helpers
  ...

1 files changed, 21 insertions, 28 deletions

diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index 06025cdaa4ad..495e1cb3afa6 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -14,27 +14,10 @@
 #include "zfcp_ext.h"
 #include "zfcp_qdio.h"
 
-#define QBUFF_PER_PAGE          (PAGE_SIZE / sizeof(struct qdio_buffer))
-
 static bool enable_multibuffer = 1;
 module_param_named(datarouter, enable_multibuffer, bool, 0400);
 MODULE_PARM_DESC(datarouter, "Enable hardware data router support (default on)");
 
-static int zfcp_qdio_buffers_enqueue(struct qdio_buffer **sbal)
-{
-        int pos;
-
-        for (pos = 0; pos < QDIO_MAX_BUFFERS_PER_Q; pos += QBUFF_PER_PAGE) {
-                sbal[pos] = (struct qdio_buffer *) get_zeroed_page(GFP_KERNEL);
-                if (!sbal[pos])
-                        return -ENOMEM;
-        }
-        for (pos = 0; pos < QDIO_MAX_BUFFERS_PER_Q; pos++)
-                if (pos % QBUFF_PER_PAGE)
-                        sbal[pos] = sbal[pos - 1] + 1;
-        return 0;
-}
-
 static void zfcp_qdio_handler_error(struct zfcp_qdio *qdio, char *id,
                                     unsigned int qdio_err)
 {
@@ -326,15 +309,30 @@ static void zfcp_qdio_setup_init_data(struct qdio_initialize *id,
 static int zfcp_qdio_allocate(struct zfcp_qdio *qdio)
 {
         struct qdio_initialize init_data;
+        int ret;
 
-        if (zfcp_qdio_buffers_enqueue(qdio->req_q) ||
-            zfcp_qdio_buffers_enqueue(qdio->res_q))
+        ret = qdio_alloc_buffers(qdio->req_q, QDIO_MAX_BUFFERS_PER_Q);
+        if (ret)
                 return -ENOMEM;
 
+        ret = qdio_alloc_buffers(qdio->res_q, QDIO_MAX_BUFFERS_PER_Q);
+        if (ret)
+                goto free_req_q;
+
         zfcp_qdio_setup_init_data(&init_data, qdio);
         init_waitqueue_head(&qdio->req_q_wq);
 
-        return qdio_allocate(&init_data);
+        ret = qdio_allocate(&init_data);
+        if (ret)
+                goto free_res_q;
+
+        return 0;
+
+free_res_q:
+        qdio_free_buffers(qdio->res_q, QDIO_MAX_BUFFERS_PER_Q);
+free_req_q:
+        qdio_free_buffers(qdio->req_q, QDIO_MAX_BUFFERS_PER_Q);
+        return ret;
 }
 
 /**
@@ -448,19 +446,14 @@ failed_establish:
 
 void zfcp_qdio_destroy(struct zfcp_qdio *qdio)
 {
-        int p;
-
         if (!qdio)
                 return;
 
         if (qdio->adapter->ccw_device)
                 qdio_free(qdio->adapter->ccw_device);
 
-        for (p = 0; p < QDIO_MAX_BUFFERS_PER_Q; p += QBUFF_PER_PAGE) {
-                free_page((unsigned long) qdio->req_q[p]);
-                free_page((unsigned long) qdio->res_q[p]);
-        }
-
+        qdio_free_buffers(qdio->req_q, QDIO_MAX_BUFFERS_PER_Q);
+        qdio_free_buffers(qdio->res_q, QDIO_MAX_BUFFERS_PER_Q);
         kfree(qdio);
 }
 
@@ -475,7 +468,7 @@ int zfcp_qdio_setup(struct zfcp_adapter *adapter)
         qdio->adapter = adapter;
 
         if (zfcp_qdio_allocate(qdio)) {
-                zfcp_qdio_destroy(qdio);
+                kfree(qdio);
                 return -ENOMEM;
         }