Release: Prepare v1.2.0

Signed-off-by: Stefan Raspl <raspl@linux.ibm.com>

Author: Stefan Raspl

Makefile

@@ -9,11 +9,12 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 
-SMC_TOOLS_RELEASE = 1.1.0
+SMC_TOOLS_RELEASE = 1.2.0
 VER_MAJOR         = $(shell echo $(SMC_TOOLS_RELEASE) | cut -d '.' -f 1)
 
 ARCHTYPE = $(shell uname -m)
 ARCH := $(shell getconf LONG_BIT)
+DISTRO := $(shell lsb_release -si 2>/dev/null)
 
 ifneq ("${V}","1")
         MAKEFLAGS += --quiet
@@ -39,14 +40,22 @@ STUFF_32BIT	  = 0
 # Check that 31/32-bit build tools are available.
 #
 ifeq ($(ARCH),64)
+ifeq ($(DISTRO),Ubuntu)
+LIBDIR		= ${PREFIX}/lib/s390x-linux-gnu
+else
 LIBDIR		= ${PREFIX}/lib64
+endif
 ifneq ("$(wildcard ${PREFIX}/include/gnu/stubs-32.h)","")
 STUFF_32BIT = 1
 LIBDIR32	= ${PREFIX}/lib
 endif
 else
+ifeq ($(DISTRO),Ubuntu)
+LIBDIR		= ${PREFIX}/lib/s390-linux-gnu
+else
 LIBDIR		= ${PREFIX}/lib
 endif
+endif
 
 all: libsmc-preload.so libsmc-preload32.so smcss smc_pnet
 
@@ -59,6 +68,9 @@ else
 	MACHINE_OPT32="-m32"
 endif
 
+%: %.in
+	$(GEN) -e "s#x.x.x#$(SMC_TOOLS_RELEASE)#g" < $< > $@
+
 smc-preload.o: smc-preload.c
 	${CCC} ${CFLAGS} -fPIC -c smc-preload.c
 
@@ -114,8 +126,13 @@ endif
 	install $(INSTALL_FLAGS_BIN) smc_run $(DESTDIR)$(BINDIR)
 	install $(INSTALL_FLAGS_BIN) smcss $(DESTDIR)$(BINDIR)
 	install $(INSTALL_FLAGS_BIN) smc_pnet $(DESTDIR)$(BINDIR)
+	install $(INSTALL_FLAGS_BIN) smc_dbg $(DESTDIR)$(BINDIR)
+ifeq ($(shell uname -m | cut -c1-4),s390)
+	install $(INSTALL_FLAGS_BIN) smc_rnics $(DESTDIR)$(BINDIR)
+endif
 	install $(INSTALL_FLAGS_MAN) af_smc.7 $(DESTDIR)$(MANDIR)/man7
 	install $(INSTALL_FLAGS_MAN) smc_run.8 $(DESTDIR)$(MANDIR)/man8
+	install $(INSTALL_FLAGS_MAN) smc_rnics.8 $(DESTDIR)$(MANDIR)/man8
 	install $(INSTALL_FLAGS_MAN) smc_pnet.8 $(DESTDIR)$(MANDIR)/man8
 	install $(INSTALL_FLAGS_MAN) smcss.8 $(DESTDIR)$(MANDIR)/man8
 

README.smctools

@@ -1,4 +1,4 @@
-SMC Tools (1.1.0)
+SMC Tools (1.2.0)
 ===================
 
 The SMC Tools provided in this package allow execution of existing TCP
@@ -12,6 +12,7 @@ This package consists of the tools:
 - smc_pnet          : C program for PNET Table handling
 - smcss             : C program for displaying the information about active
                       SMC sockets.
+- smc_rnics         : List available RDMA NICs
 
 The preload shared library libsmc-preload.so provides mapping of TCP socket
 operations to SMC sockets.
@@ -45,6 +46,14 @@ For enhancements, please describe the proposed change and its benefits.
 Release History:
 ================
 
+1.2.0 (2019-02-08)
+    Changes:
+    - smc_rnics: Initial version added
+    - smc_dbg: Initial version added
+
+Bug fixes:
+    - smcss: Parse address family of ip address
+
 1.1.0 (2018-06-29)
     Changes:
     - smcss:    Add IPv6 support
@@ -87,6 +96,7 @@ af_smc.7		manpage for AF_SMC sockets
 smc_pnet.8		manpage for smc_pnet
 smcss.8			manpage for smcss
 smc_run.8		manpage for preload library usage
+smc_dbg			collect debugging data
 
 
 Requirements:

af_smc.7

@@ -1,7 +1,7 @@
 .\"
 .\" Copyright IBM Corp. 2016, 2018
-.\" Author(s):	Ursula Braun <ubraun@linux.vnet.ibm.com>
-.\"		Thomas Richter <tmricht@linux.vnet.ibm.com>
+.\" Author(s):	Ursula Braun <ubraun@linux.ibm.com>
+.\"		Thomas Richter <tmricht@linux.ibm.com>
 .\" ----------------------------------------------------------------------
 .TH AF_SMC 7 "January 2017"  "smc-tools" "Linux Programmer's Manual"
 .SH NAME
@@ -129,14 +129,6 @@ SMC determines the configured MTU size of the RoCE Ethernet port,
 announces this MTU size to the peer during connection start, and chooses
 the minimum MTU size of both peers.
 
-.SH "AUTHOR"
-.nf
-Copyright IBM Corp. 2016, 2018
-
-Published under the terms and conditions of the EPL
-(Eclipse Public License).
-.fi
-
 .SH "SEE ALSO"
 .BR socket (2),
 .BR ip (7),

smc-preload.c

@@ -1,7 +1,7 @@
 /*
  * SMC Tools - Shared Memory Communication Tools
  *
- * Copyright (c) IBM Corp. 2016, 2018
+ * Copyright IBM Corp. 2016, 2018
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

smc.h

@@ -5,7 +5,7 @@
  *
  *  Copyright IBM Corp. 2017
  *
- *  Author(s):  Thomas Richter <tmricht@linux.vnet.ibm.com>
+ *  Author(s):  Thomas Richter <tmricht@linux.ibm.com>
  */
 
 #ifndef _UAPI_LINUX_SMC_H_

smc_dbg

@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# Copyright IBM Corp. 2019
+
+function usage() {
+	echo;
+	echo "Usage: smc_dbg [ OPTIONS ]";
+	echo;
+	echo "Collect debug information";
+	echo;
+	echo "   -h, --help           display this message";
+	echo "   -t, --tgz            generate .tgz file";
+	echo "   -v, --version        display version info";
+	echo;
+}
+
+
+function redirect() {
+	if [ "$tgz" == "on" ]; then
+		exec &>$tmpdir/$1;
+	else
+		echo;
+	fi
+}
+
+tgz="off";
+ARCH=`uname -m | cut -c1-4`;
+args=`getopt -u -o hvt -l help,version,tgz -- $*`;
+[ $? -ne 0 ] && exit 1;
+set -- $args;
+while [ $# -gt 0 ]; do
+        case $1 in
+        "-h" | "--help" )
+                usage;
+                exit 0;;
+        "-t" | "--tgz" )
+                tgz="on";;
+        "-v" | "--version" )
+		echo "smc_dbg utility, smc-tools-1.2.0 (8a2dae6)";
+		exit 0;;
+        * )
+        esac
+        shift;
+done
+if [ "$tgz" == "on" ]; then
+	exec 3>&1 4>&2
+	tmpdir=`mktemp -d /tmp/smc_dbg-XXXXXX`;
+fi
+
+redirect version.txt;
+smcss -v
+smc_dbg -v
+smc_pnet -v
+smc_rnics -v
+
+if [ "$ARCH" == "s390" ]; then
+	redirect devices.txt;
+	echo "CCW Devices:"
+	printf "  Device    CHPID  PNET ID\n";
+	echo "  -------------------------------------------";
+	for device in `ls -1 /sys/bus/ccwgroup/devices`; do
+		chpid=`cat /sys/bus/ccwgroup/devices/$device/chpid | tr [A-F] [a-f]`;
+		pnetid="`cat /sys/devices/css0/chp0.$chpid/util_string | iconv -f IBM-1047 -t ASCII 2>/dev/null | tr -d '\000' | sed  's/^/    /'`";
+		printf "  %8s  %4s   %s\n" $device 0x$chpid $pnetid;
+	done
+	echo;
+
+	echo "PCI Devices:"
+	smc_rnics | sed 's/^/  /';
+
+	redirect smcss_smcd;
+	smcss --smcd;
+fi
+
+redirect smcss_all.txt;
+smcss --all --debug;
+
+redirect smcss_smcr;
+smcss --smcr;
+
+redirect pnet_table.txt;
+smc_pnet --show;
+
+if [ "$tgz" == "on" ]; then
+	exec >&3 2>&4
+	cd /tmp;
+	tar cvfz $tmpdir.tgz `basename $tmpdir` >/dev/null 2>&1;
+	rm -rf $tmpdir;
+	echo "Debug output written to $tmpdir.tgz";
+fi
+exit 0;

smc_pnet.8

@@ -2,8 +2,8 @@
 .\"
 .\"
 .\" Copyright IBM Corp. 2017
-.\" Author(s):  Thomas Richter <tmricht@linux.vnet.ibm.com>
-.\"             Ursula Braun <ubraun@linux.vnet.ibm.com>
+.\" Author(s):  Thomas Richter <tmricht@linux.ibm.com>
+.\"             Ursula Braun <ubraun@linux.ibm.com>
 .\" ----------------------------------------------------------------------
 .\"
 
@@ -129,18 +129,8 @@ If an error occurs,
 writes a message to stderr and completes with a return code
 other than 0.
 .P
-.SH AUTHOR
-.nf
-This man page was written by
-Ursula Braun <ubraun@linux.vnet.ibm.com>
-
-Copyright (c) IBM Corp. 2017
-
-Published under the terms and conditions of the EPL
-(Eclipse Public License).
-.fi
-
 .SH SEE ALSO
 .BR af_smc (7),
-.BR smc_run (8)
+.BR smc_rnics (8),
+.BR smc_run (8),
 .BR smcss (8)

smc_pnet.c

@@ -3,7 +3,7 @@
  *
  * Copyright IBM Corp. 2017
  *
- * Author(s):  Thomas Richter <tmricht@linux.vnet.ibm.com>
+ * Author(s):  Thomas Richter <tmricht@linux.ibm.com>
  *
  * User space program for SMC-R PNET Table manipulation with generic netlink.
  *