Release: Prepare v1.2.1

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

Author: Stefan Raspl

Makefile

@@ -9,7 +9,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 
-SMC_TOOLS_RELEASE = 1.2.0
+SMC_TOOLS_RELEASE = 1.2.1
 VER_MAJOR         = $(shell echo $(SMC_TOOLS_RELEASE) | cut -d '.' -f 1)
 
 ARCHTYPE = $(shell uname -m)
@@ -41,7 +41,7 @@ STUFF_32BIT	  = 0
 #
 ifeq ($(ARCH),64)
 ifeq ($(DISTRO),Ubuntu)
-LIBDIR		= ${PREFIX}/lib/s390x-linux-gnu
+LIBDIR		= ${PREFIX}/lib/${ARCHTYPE}-linux-gnu
 else
 LIBDIR		= ${PREFIX}/lib64
 endif
@@ -129,10 +129,10 @@ endif
 	install $(INSTALL_FLAGS_BIN) smc_dbg $(DESTDIR)$(BINDIR)
 ifeq ($(shell uname -m | cut -c1-4),s390)
 	install $(INSTALL_FLAGS_BIN) smc_rnics $(DESTDIR)$(BINDIR)
+	install $(INSTALL_FLAGS_MAN) smc_rnics.8 $(DESTDIR)$(MANDIR)/man8
 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.2.0)
+SMC Tools (1.2.1)
 ===================
 
 The SMC Tools provided in this package allow execution of existing TCP
@@ -46,12 +46,19 @@ For enhancements, please describe the proposed change and its benefits.
 Release History:
 ================
 
+1.2.1 (2019-04-15)
+    Bug fixes:
+    - smc_rnics: Install man page on s390 only
+    - smc-preload: Handle behavior flags in type argument to socket() call
+    - Makefile: Fixed install target on Ubuntu for platforms other than s390
+    - smc_pnet: changes in support of kernel 5.1
+
 1.2.0 (2019-02-08)
     Changes:
     - smc_rnics: Initial version added
     - smc_dbg: Initial version added
 
-Bug fixes:
+    Bug fixes:
     - smcss: Parse address family of ip address
 
 1.1.0 (2018-06-29)

smc-preload.c

@@ -79,7 +79,8 @@ int socket(int domain, int type, int protocol)
 
 	/* check if socket is eligible for AF_SMC */
 	if ((domain == AF_INET || domain == AF_INET6) &&
-	    type == SOCK_STREAM &&
+	    // see kernel code, include/linux/net.h, SOCK_TYPE_MASK
+	    (type & 0xf) == SOCK_STREAM &&
 	    (protocol == IPPROTO_IP || protocol == IPPROTO_TCP)) {
 		dbg_msg(stderr, "libsmc-preload: map sock to AF_SMC\n");
 		if (domain == AF_INET)

smc_dbg

@@ -36,7 +36,7 @@ while [ $# -gt 0 ]; do
         "-t" | "--tgz" )
                 tgz="on";;
         "-v" | "--version" )
-		echo "smc_dbg utility, smc-tools-1.2.0 (8a2dae6)";
+		echo "smc_dbg utility, smc-tools-1.2.1 (5ad3088)";
 		exit 0;;
         * )
         esac
@@ -60,7 +60,11 @@ if [ "$ARCH" == "s390" ]; then
 	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/^/    /'`";
+		if [ -e /sys/devices/css0/chp0.$chpid/util_string ]; then
+			pnetid="`cat /sys/devices/css0/chp0.$chpid/util_string | iconv -f IBM-1047 -t ASCII 2>/dev/null | tr -d '\000' | sed  's/^/    /'`";
+		else
+			pnetid="";
+		fi
 		printf "  %8s  %4s   %s\n" $device 0x$chpid $pnetid;
 	done
 	echo;

smc_pnet.8

@@ -1,7 +1,7 @@
 .\" smc_pnet.8
 .\"
 .\"
-.\" Copyright IBM Corp. 2017
+.\" Copyright IBM Corp. 2017, 2019
 .\" Author(s):  Thomas Richter <tmricht@linux.ibm.com>
 .\"             Ursula Braun <ubraun@linux.ibm.com>
 .\" ----------------------------------------------------------------------
@@ -15,30 +15,46 @@ smc_pnet \- create, destroy, and change the SMC PNET table.
 .SH SYNOPSIS
 
 .B smc_pnet
-.RB { \-\-add | \-a "} {" \-\-interface | \-I "} <ethernet-interface> {" \-\-ibdevice | \-D "} <infiniband-device> [ {" \-\-ibport | \-P "<infiniband-port> ] } <pnetid>"
+{ \fB\-a\fR | \fB\-\-add\fR \fI<pnetid>\fR }
+{ \fB\-I\fR | \fB\-\-interface\fR <ethernet-interface> }
 .P
 .B smc_pnet
-.RB { \-\-show | -s } <pnetid>
+{ \fB\-a\fR | \fB\-\-add\fR \fI<pnetid>\fR }
+{ \fB\-D\fR | \fB\-\-ibdevice\fR <infiniband-or-ISM-device> }
+[ \fB\-P\fR | \fB\-\-ibport\fR <infiniband-port> ]
 .P
 .B smc_pnet
-.RB { \-\-delete | \-d } <pnetid>
+{ \fB\-a\fR | \fB\-\-add\fR \fI<pnetid>\fR }
+{ \fB\-I\fR | \fB\-\-interface\fR <ethernet-interface> }
+{ \fB\-D\fR | \fB\-\-ibdevice\fR <infiniband-or-ISM-device> }
+[ \fB\-P\fR | \fB\-\-ibport\fR <infiniband-port> ]
 .P
 .B smc_pnet
-.RB { \-\-flush | \-f }
+{ \fB\-s\fR | \fB\-\-show\fR \fI<pnetid>\fR }
 .P
 .B smc_pnet
-.RB { \-\-version | \-v }
+{ \fB\-d\fR | \fB\-\-delete\fR \fI<pnetid>\fR }
 .P
 .B smc_pnet
-.RB { \-\-help | \-h }
+{ \fB\-f\fR | \fB\-\-flush\fR }
+.P
+.B smc_pnet
+{ \fB\-v\fR | \fB\-\-version\fR }
+.P
+.B smc_pnet
+{ \fB\-h\fR | \fB\-\-help\fR }
 
 .SH DESCRIPTION
-The SMC protocol requires grouping of standard Ethernet and RoCE networks.
+The SMC protocol requires grouping of standard Ethernet and RoCE networks or ISM
+devices.
 Such groups are called \fIPhysical Networks\fR (PNETs). The mapping is configured
 within a table called \fIpnet table\fR. Any available Ethernet interface can be
-combined with an available RDMA-capable network interface card (RNIC), if they
+combined with an available RDMA-capable network interface card (RNIC) or a
+DMA-capable ISM device, if they
 belong to the same Converged Ethernet fabric. To configure mapping of a RoCE Adapter
-port to a standard Ethernet interface, an entry in the pnet table must be created.
+port or an ISM device to a standard Ethernet interface, both devices need to have
+the same pnetid; either hardware-defined or user-defined using the pnet table.
+Hardware-defined pnetids cannot be overwritten.
 .P
 The
 .B smc_pnet
@@ -49,16 +65,15 @@ By default,
 .B smc_pnet
 shows all entries of the pnet table.
 .TP
-.BR <pnetid>
-defines a name for a grouping of Ethernet interface and RNIC.
+.IR <pnetid>
+defines a name for a grouping of Ethernet interface and RNICs or ISM devices.
 A pnetid name consists of up to 16 alphanumeric uppercase characters without blanks.
 .TP
 .BR "\-a, \-\-add"
 creates a new pnetid definition to the pnet table (if it does not already exist).
 Only one pnetid can be defined for a certain
-Ethernet interface and for a certain infiniband device port.
-Adding an ethernet interface or an infiniband device port more than once
-fails.
+Ethernet interface, a certain InfiniBand device port or a certain ISM device.
+Adding more than one pnetid fails. Hardware defined pnetids cannot be overwritten.
 .TP
 .BR "\-s, \-\-show"
 shows a certain pnetid definition in the pnet table.
@@ -73,11 +88,11 @@ removes all pnetid definitions from the pnet table.
 specifies the name of the Ethernet interface to be added for a certain pnetid
 definition.
 .TP
-.BR "\-D, \-\-ibdevice <infiniband-device>"
-specifies the name of the Infiniband device.
+.BR "\-D, \-\-ibdevice <infiniband-or-ISM-device>"
+specifies the ID of the InfiniBand device or ISM device.
 .TP
 .BR "\-P, \-\-ibport <infiniband-port>"
-specifies the port number of the Infiniband device port. Valid numbers are
+specifies the port number of the InfiniBand device port. Valid numbers are
 1 or 2.
 The default value is 1.
 .TP
@@ -88,31 +103,57 @@ displays smc_pnet program version.
 displays a brief smc_pnet usage information.
 
 .SH EXAMPLES
-.B Create a pnetid ABC with ethernet interface name encf500, infiniband
-.B device name mlx4_0 and port number 2:
+.B Define pnetid ABC for the ethernet device names encf500 and bond0, and define
+.B pnetid ABC for the InfiniBand device ID 0001:00:00.0 (port 2) and the ISM
+.B device ID 0004:00:00.0:
 .RS 4
 .PP
-$ smc_pnet \-a ABC \-I encf500 \-D mlx4_0 \-P 2
+.nf
+$ smc_pnet \-a ABC \-I encf500
+$ smc_pnet \-a ABC \-I bond0
+$ smc_pnet \-a ABC \-D 0001:00:00:00.0 \-P 2
+$ smc_pnet \-a ABC \-D 0004:00:00:00.0
 .RE
 .PP
 .
-.B Delete a pnet table entry with pnetid named ABC:
+.B Show all pnet table entries:
 .RS 4
 .PP
-$ smc_pnet \-d ABC
+.nf
+$ smc_pnet
+ABC encf500 n/a 255
+ABC bond0 n/a 255
+ABC n/a 0001:00:00.0 2
+ABC n/a 0004:00:00.0 1
+.RE
+.PP
+.
+.B Define pnetid XYZ for the ethernet interface name vlan0201 and the InfiniBand
+.B device ID 0001:00:00.0 (port 1):
+.RS 4
+.PP
+$ smc_pnet \-a XYZ \-I vlan0201 \-D 0001:00:00.0 \-P 1
 .RE
 .PP
 .
-.B Show the mapping of ethernet interface name and infiniband device port for pnetid ABC:
+.B Show all entries for pnetid XYZ:
 .RS 4
 .PP
 .nf
-$ smc_pnet \-s ABC
-ABC encf500 mlx4_0 2
+$ smc_pnet \-s XYZ
+XYZ vlan0201 n/a 255
+XYZ n/a 0001:00:00.0 1
+.RE
+.PP
+.
+.B Delete all pnet table entries with pnetid named ABC:
+.RS 4
+.PP
+$ smc_pnet \-d ABC
 .RE
 .PP
 .
-.B Delete all entries in the pnet table
+.B Delete all entries in the pnet table:
 .RS 4
 .PP
 $ smc_pnet \-f
@@ -121,13 +162,9 @@ $ smc_pnet \-f
 .
 .
 .SH RETURN CODES
-Successful
-.IR smc_pnet
-commands return 0.
-If an error occurs,
-.IR smc_pnet
-writes a message to stderr and completes with a return code
-other than 0.
+Successful \fBsmc_pnet\fR commands return 0.
+If an error occurs, \fBsmc_pnet\fR writes a message to stderr and 
+completes with a return code other than 0.
 .P
 .SH SEE ALSO
 .BR af_smc (7),

smc_pnet.c

@@ -40,7 +40,7 @@ static char *progname;
 static struct pnetentry {
 	char *pnetid;		/* Pnetid */
 	char *ethname;		/* Ethernet device name */
-	char *ibname;		/* Infiniband device name */
+	char *ibname;		/* Infiniband/ISM device name */
 	int ibport;		/* Infiniband device port number */
 	unsigned char cmd;	/* Command to execute */
 } pnetcmd;
@@ -51,12 +51,12 @@ static void _usage(FILE *dest)
 "Usage: %s [ OPTIONS ] [pnetid]\n"
 "\t-h, --help            this message\n"
 "\t-V, --version         show version information\n"
-"\t-a, --add             add a pnetid entry, requires interface and ibdevice\n"
+"\t-a, --add             add a pnetid entry, requires interface or ib/ism device\n"
 "\t-d, --delete          delete a pnetid entry\n"
 "\t-s, --show            show a pnetid entry\n"
 "\t-f, --flush           flush the complete pnet table\n"
 "\t-I, --interface       Ethernet interface name of a pnetid entry\n"
-"\t-D, --ibdevice        Infiniband device name of a pnetid entry\n"
+"\t-D, --ibdevice        Infiniband/ISM device name of a pnetid entry\n"
 "\t-P, --ibport          Infiniband device port (default: 1)\n"
 "\t\n"
 "\tno OPTIONS            show complete pnet table\n",
@@ -106,7 +106,7 @@ static const struct option long_opts[] = {
 static struct nla_policy smc_pnet_policy[SMC_PNETID_MAX + 1] = {
 	[SMC_PNETID_NAME] = {
 				.type = NLA_STRING,
-				.maxlen = 16
+				.maxlen = 17
 			    },
 	[SMC_PNETID_ETHNAME] = {
 				.type = NLA_STRING,
@@ -164,7 +164,7 @@ static int genl_command(void)
 	if (id < 0) {
 		rc = EXIT_FAILURE;
 		if (id == -NLE_OBJ_NOTFOUND)
-			fprintf(stderr, "%s: SMC-R module not loaded\n",
+			fprintf(stderr, "%s: SMC module not loaded\n",
 				progname);
 		else
 			nl_perror(id, progname);
@@ -193,21 +193,26 @@ static int genl_command(void)
 
 	switch (pnetcmd.cmd) {		/* Start message construction */
 	case SMC_PNETID_ADD:
-		rc = nla_put_string(msg, SMC_PNETID_ETHNAME, pnetcmd.ethname);
+		if (pnetcmd.ethname)
+			rc = nla_put_string(msg, SMC_PNETID_ETHNAME,
+					    pnetcmd.ethname);
 		if (rc < 0) {
 			nl_perror(rc, progname);
 			rc = EXIT_FAILURE;
 			goto out3;
 		}
 
-		rc = nla_put_string(msg, SMC_PNETID_IBNAME, pnetcmd.ibname);
+		if (pnetcmd.ibname)
+			rc = nla_put_string(msg, SMC_PNETID_IBNAME,
+					    pnetcmd.ibname);
 		if (rc < 0) {
 			nl_perror(rc, progname);
 			rc = EXIT_FAILURE;
 			goto out3;
 		}
 
-		rc = nla_put_u8(msg, SMC_PNETID_IBPORT, pnetcmd.ibport);
+		if (pnetcmd.ibname)
+			rc = nla_put_u8(msg, SMC_PNETID_IBPORT, pnetcmd.ibport);
 		if (rc < 0) {
 			nl_perror(rc, progname);
 			rc = EXIT_FAILURE;
@@ -236,6 +241,13 @@ static int genl_command(void)
 
 	/* Receive reply message, returns number of cb invocations. */
 	rc = nl_recvmsgs_default(sk);
+	/* Kernel commit a9d8b0b1e3d689346b016316bd91980d60c6885d
+	 * introduced a misbehavior that a FLUSH of an empty table
+	 * returned -ENOENT. Fix it in smc-tools as long as kernel patch did'nt
+	 * land in the distros.
+	 */
+	if (pnetcmd.cmd == SMC_PNETID_FLUSH && rc != -NLE_OBJ_NOTFOUND)
+		rc = 0;
 	if (rc < 0) {
 		nl_perror(rc, progname);
 		rc = EXIT_FAILURE;
@@ -328,12 +340,9 @@ int main(int argc, char **argv)
 	}
 
 	if (pnetcmd.cmd == SMC_PNETID_ADD) {
-		if (!pnetcmd.ethname) {
-			fprintf(stderr, "%s: interface missing\n", progname);
-			usage();
-		}
-		if (!pnetcmd.ibname) {
-			fprintf(stderr, "%s: ibdevice missing\n", progname);
+		if (!pnetcmd.ethname && !pnetcmd.ibname) {
+			fprintf(stderr, "%s: interface or device missing\n",
+				progname);
 			usage();
 		}
 		if (!pnetcmd.ibport)
@@ -347,7 +356,7 @@ int main(int argc, char **argv)
 			pnetcmd.ethname = NULL;
 		}
 		if (pnetcmd.ibname) {
-			fprintf(stderr, "%s: ibdevice %s ignored\n", progname,
+			fprintf(stderr, "%s: device %s ignored\n", progname,
 					pnetcmd.ibname);
 			pnetcmd.ibname = NULL;
 		}

smc_rnics

@@ -66,7 +66,7 @@ while [ $# -gt 0 ]; do
 	"-r" | "--rawids" )
 		rawIDs=1;;
 	"-v" | "--version" )
-		echo "smc_rnics utility, smc-tools-1.2.0 (8a2dae6)";
+		echo "smc_rnics utility, smc-tools-1.2.1 (5ad3088)";
 		exit 0;;
 	"--" ) ;;
 	* )	format_fid "$1";