s390/cio: Change I/O instructions from inline to normal functions
authorPeter Oberparleiter <oberpar@linux.vnet.ibm.com>
Fri, 18 Dec 2015 11:59:40 +0000 (12:59 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Fri, 18 Dec 2015 13:59:37 +0000 (14:59 +0100)
Adding tracepoints to inline functions adds tracepoint invocation code
for each instance where the function is inlined. The resulting increase
in kernel code size can have negative impact:
 - More cache misses in instruction cache
 - Reduced amount of DMA-capable memory

Therefore change all functions implementing I/O instructions from inline
to normal functions.

Bloat-o-meter summary after change (using performance_defconfig):

  add/remove: 24/2 grow/shrink: 4/39 up/down: 2205/-4858 (-2653)

Signed-off-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/cio/Makefile
drivers/s390/cio/ioasm.c [new file with mode: 0644]
drivers/s390/cio/ioasm.h

index 2c7cf0b3c5a0d654b50036c8985c79749b07ea83..3ab9aedeb84a20be36ad7c097f4a1a68cbc7a861 100644 (file)
@@ -6,7 +6,7 @@
 CFLAGS_trace.o := -I$(src)
 
 obj-y += airq.o blacklist.o chsc.o cio.o css.o chp.o idset.o isc.o \
-       fcx.o itcw.o crw.o ccwreq.o trace.o
+       fcx.o itcw.o crw.o ccwreq.o trace.o ioasm.o
 ccw_device-objs += device.o device_fsm.o device_ops.o
 ccw_device-objs += device_id.o device_pgid.o device_status.o
 obj-y += ccw_device.o cmf.o
diff --git a/drivers/s390/cio/ioasm.c b/drivers/s390/cio/ioasm.c
new file mode 100644 (file)
index 0000000..9898481
--- /dev/null
@@ -0,0 +1,224 @@
+/*
+ * Channel subsystem I/O instructions.
+ */
+
+#include <linux/export.h>
+
+#include <asm/chpid.h>
+#include <asm/schid.h>
+#include <asm/crw.h>
+
+#include "ioasm.h"
+#include "orb.h"
+#include "cio.h"
+
+int stsch(struct subchannel_id schid, struct schib *addr)
+{
+       register struct subchannel_id reg1 asm ("1") = schid;
+       int ccode = -EIO;
+
+       asm volatile(
+               "       stsch   0(%3)\n"
+               "0:     ipm     %0\n"
+               "       srl     %0,28\n"
+               "1:\n"
+               EX_TABLE(0b, 1b)
+               : "+d" (ccode), "=m" (*addr)
+               : "d" (reg1), "a" (addr)
+               : "cc");
+       trace_s390_cio_stsch(schid, addr, ccode);
+
+       return ccode;
+}
+EXPORT_SYMBOL(stsch);
+
+int msch(struct subchannel_id schid, struct schib *addr)
+{
+       register struct subchannel_id reg1 asm ("1") = schid;
+       int ccode = -EIO;
+
+       asm volatile(
+               "       msch    0(%2)\n"
+               "0:     ipm     %0\n"
+               "       srl     %0,28\n"
+               "1:\n"
+               EX_TABLE(0b, 1b)
+               : "+d" (ccode)
+               : "d" (reg1), "a" (addr), "m" (*addr)
+               : "cc");
+       trace_s390_cio_msch(schid, addr, ccode);
+
+       return ccode;
+}
+
+int tsch(struct subchannel_id schid, struct irb *addr)
+{
+       register struct subchannel_id reg1 asm ("1") = schid;
+       int ccode;
+
+       asm volatile(
+               "       tsch    0(%3)\n"
+               "       ipm     %0\n"
+               "       srl     %0,28"
+               : "=d" (ccode), "=m" (*addr)
+               : "d" (reg1), "a" (addr)
+               : "cc");
+       trace_s390_cio_tsch(schid, addr, ccode);
+
+       return ccode;
+}
+
+int ssch(struct subchannel_id schid, union orb *addr)
+{
+       register struct subchannel_id reg1 asm("1") = schid;
+       int ccode = -EIO;
+
+       asm volatile(
+               "       ssch    0(%2)\n"
+               "0:     ipm     %0\n"
+               "       srl     %0,28\n"
+               "1:\n"
+               EX_TABLE(0b, 1b)
+               : "+d" (ccode)
+               : "d" (reg1), "a" (addr), "m" (*addr)
+               : "cc", "memory");
+       trace_s390_cio_ssch(schid, addr, ccode);
+
+       return ccode;
+}
+EXPORT_SYMBOL(ssch);
+
+int csch(struct subchannel_id schid)
+{
+       register struct subchannel_id reg1 asm("1") = schid;
+       int ccode;
+
+       asm volatile(
+               "       csch\n"
+               "       ipm     %0\n"
+               "       srl     %0,28"
+               : "=d" (ccode)
+               : "d" (reg1)
+               : "cc");
+       trace_s390_cio_csch(schid, ccode);
+
+       return ccode;
+}
+EXPORT_SYMBOL(csch);
+
+int tpi(struct tpi_info *addr)
+{
+       int ccode;
+
+       asm volatile(
+               "       tpi     0(%2)\n"
+               "       ipm     %0\n"
+               "       srl     %0,28"
+               : "=d" (ccode), "=m" (*addr)
+               : "a" (addr)
+               : "cc");
+       trace_s390_cio_tpi(addr, ccode);
+
+       return ccode;
+}
+
+int chsc(void *chsc_area)
+{
+       typedef struct { char _[4096]; } addr_type;
+       int cc;
+
+       asm volatile(
+               "       .insn   rre,0xb25f0000,%2,0\n"
+               "       ipm     %0\n"
+               "       srl     %0,28\n"
+               : "=d" (cc), "=m" (*(addr_type *) chsc_area)
+               : "d" (chsc_area), "m" (*(addr_type *) chsc_area)
+               : "cc");
+       trace_s390_cio_chsc(chsc_area, cc);
+
+       return cc;
+}
+EXPORT_SYMBOL(chsc);
+
+int rchp(struct chp_id chpid)
+{
+       register struct chp_id reg1 asm ("1") = chpid;
+       int ccode;
+
+       asm volatile(
+               "       lr      1,%1\n"
+               "       rchp\n"
+               "       ipm     %0\n"
+               "       srl     %0,28"
+               : "=d" (ccode) : "d" (reg1) : "cc");
+       trace_s390_cio_rchp(chpid, ccode);
+
+       return ccode;
+}
+
+int rsch(struct subchannel_id schid)
+{
+       register struct subchannel_id reg1 asm("1") = schid;
+       int ccode;
+
+       asm volatile(
+               "       rsch\n"
+               "       ipm     %0\n"
+               "       srl     %0,28"
+               : "=d" (ccode)
+               : "d" (reg1)
+               : "cc", "memory");
+       trace_s390_cio_rsch(schid, ccode);
+
+       return ccode;
+}
+
+int hsch(struct subchannel_id schid)
+{
+       register struct subchannel_id reg1 asm("1") = schid;
+       int ccode;
+
+       asm volatile(
+               "       hsch\n"
+               "       ipm     %0\n"
+               "       srl     %0,28"
+               : "=d" (ccode)
+               : "d" (reg1)
+               : "cc");
+       trace_s390_cio_hsch(schid, ccode);
+
+       return ccode;
+}
+
+int xsch(struct subchannel_id schid)
+{
+       register struct subchannel_id reg1 asm("1") = schid;
+       int ccode;
+
+       asm volatile(
+               "       xsch\n"
+               "       ipm     %0\n"
+               "       srl     %0,28"
+               : "=d" (ccode)
+               : "d" (reg1)
+               : "cc");
+       trace_s390_cio_xsch(schid, ccode);
+
+       return ccode;
+}
+
+int stcrw(struct crw *crw)
+{
+       int ccode;
+
+       asm volatile(
+               "       stcrw   0(%2)\n"
+               "       ipm     %0\n"
+               "       srl     %0,28\n"
+               : "=d" (ccode), "=m" (*crw)
+               : "a" (crw)
+               : "cc");
+       trace_s390_cio_stcrw(crw, ccode);
+
+       return ccode;
+}
index 11e255a4fbadb27e542a21d7d876b1dc28722224..b31ee6bff1e48b7104a4de2dea35d938123f5fb3 100644 (file)
 #include "trace.h"
 
 /*
- * Some S390 specific IO instructions as inline
+ * Some S390 specific IO instructions
  */
 
-static inline int stsch(struct subchannel_id schid, struct schib *addr)
-{
-       register struct subchannel_id reg1 asm ("1") = schid;
-       int ccode = -EIO;
-
-       asm volatile(
-               "       stsch   0(%3)\n"
-               "0:     ipm     %0\n"
-               "       srl     %0,28\n"
-               "1:\n"
-               EX_TABLE(0b,1b)
-               : "+d" (ccode), "=m" (*addr)
-               : "d" (reg1), "a" (addr)
-               : "cc");
-       trace_s390_cio_stsch(schid, addr, ccode);
-
-       return ccode;
-}
-
-static inline int msch(struct subchannel_id schid, struct schib *addr)
-{
-       register struct subchannel_id reg1 asm ("1") = schid;
-       int ccode = -EIO;
-
-       asm volatile(
-               "       msch    0(%2)\n"
-               "0:     ipm     %0\n"
-               "       srl     %0,28\n"
-               "1:\n"
-               EX_TABLE(0b,1b)
-               : "+d" (ccode)
-               : "d" (reg1), "a" (addr), "m" (*addr)
-               : "cc");
-       trace_s390_cio_msch(schid, addr, ccode);
-
-       return ccode;
-}
-
-static inline int tsch(struct subchannel_id schid, struct irb *addr)
-{
-       register struct subchannel_id reg1 asm ("1") = schid;
-       int ccode;
-
-       asm volatile(
-               "       tsch    0(%3)\n"
-               "       ipm     %0\n"
-               "       srl     %0,28"
-               : "=d" (ccode), "=m" (*addr)
-               : "d" (reg1), "a" (addr)
-               : "cc");
-       trace_s390_cio_tsch(schid, addr, ccode);
-
-       return ccode;
-}
-
-static inline int ssch(struct subchannel_id schid, union orb *addr)
-{
-       register struct subchannel_id reg1 asm("1") = schid;
-       int ccode = -EIO;
-
-       asm volatile(
-               "       ssch    0(%2)\n"
-               "0:     ipm     %0\n"
-               "       srl     %0,28\n"
-               "1:\n"
-               EX_TABLE(0b, 1b)
-               : "+d" (ccode)
-               : "d" (reg1), "a" (addr), "m" (*addr)
-               : "cc", "memory");
-       trace_s390_cio_ssch(schid, addr, ccode);
-
-       return ccode;
-}
-
-static inline int csch(struct subchannel_id schid)
-{
-       register struct subchannel_id reg1 asm("1") = schid;
-       int ccode;
-
-       asm volatile(
-               "       csch\n"
-               "       ipm     %0\n"
-               "       srl     %0,28"
-               : "=d" (ccode)
-               : "d" (reg1)
-               : "cc");
-       trace_s390_cio_csch(schid, ccode);
-
-       return ccode;
-}
-
-static inline int tpi(struct tpi_info *addr)
-{
-       int ccode;
-
-       asm volatile(
-               "       tpi     0(%2)\n"
-               "       ipm     %0\n"
-               "       srl     %0,28"
-               : "=d" (ccode), "=m" (*addr)
-               : "a" (addr)
-               : "cc");
-       trace_s390_cio_tpi(addr, ccode);
-
-       return ccode;
-}
-
-static inline int chsc(void *chsc_area)
-{
-       typedef struct { char _[4096]; } addr_type;
-       int cc;
-
-       asm volatile(
-               "       .insn   rre,0xb25f0000,%2,0\n"
-               "       ipm     %0\n"
-               "       srl     %0,28\n"
-               : "=d" (cc), "=m" (*(addr_type *) chsc_area)
-               : "d" (chsc_area), "m" (*(addr_type *) chsc_area)
-               : "cc");
-       trace_s390_cio_chsc(chsc_area, cc);
-
-       return cc;
-}
-
-static inline int rchp(struct chp_id chpid)
-{
-       register struct chp_id reg1 asm ("1") = chpid;
-       int ccode;
-
-       asm volatile(
-               "       lr      1,%1\n"
-               "       rchp\n"
-               "       ipm     %0\n"
-               "       srl     %0,28"
-               : "=d" (ccode) : "d" (reg1) : "cc");
-       trace_s390_cio_rchp(chpid, ccode);
-
-       return ccode;
-}
-
-static inline int rsch(struct subchannel_id schid)
-{
-       register struct subchannel_id reg1 asm("1") = schid;
-       int ccode;
-
-       asm volatile(
-               "       rsch\n"
-               "       ipm     %0\n"
-               "       srl     %0,28"
-               : "=d" (ccode)
-               : "d" (reg1)
-               : "cc", "memory");
-       trace_s390_cio_rsch(schid, ccode);
-
-       return ccode;
-}
-
-static inline int hsch(struct subchannel_id schid)
-{
-       register struct subchannel_id reg1 asm("1") = schid;
-       int ccode;
-
-       asm volatile(
-               "       hsch\n"
-               "       ipm     %0\n"
-               "       srl     %0,28"
-               : "=d" (ccode)
-               : "d" (reg1)
-               : "cc");
-       trace_s390_cio_hsch(schid, ccode);
-
-       return ccode;
-}
-
-static inline int xsch(struct subchannel_id schid)
-{
-       register struct subchannel_id reg1 asm("1") = schid;
-       int ccode;
-
-       asm volatile(
-               "       xsch\n"
-               "       ipm     %0\n"
-               "       srl     %0,28"
-               : "=d" (ccode)
-               : "d" (reg1)
-               : "cc");
-       trace_s390_cio_xsch(schid, ccode);
-
-       return ccode;
-}
-
-static inline int stcrw(struct crw *crw)
-{
-       int ccode;
-
-       asm volatile(
-               "       stcrw   0(%2)\n"
-               "       ipm     %0\n"
-               "       srl     %0,28\n"
-               : "=d" (ccode), "=m" (*crw)
-               : "a" (crw)
-               : "cc");
-       trace_s390_cio_stcrw(crw, ccode);
-
-       return ccode;
-}
+int stsch(struct subchannel_id schid, struct schib *addr);
+int msch(struct subchannel_id schid, struct schib *addr);
+int tsch(struct subchannel_id schid, struct irb *addr);
+int ssch(struct subchannel_id schid, union orb *addr);
+int csch(struct subchannel_id schid);
+int tpi(struct tpi_info *addr);
+int chsc(void *chsc_area);
+int rchp(struct chp_id chpid);
+int rsch(struct subchannel_id schid);
+int hsch(struct subchannel_id schid);
+int xsch(struct subchannel_id schid);
+int stcrw(struct crw *crw);
 
 #endif