Release: Prepare v1.0.1

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

Author: Stefan Raspl

Makefile

@@ -1,120 +1,125 @@
 #
 # SMC Tools - Shared Memory Communication Tools
 #
-# Copyright IBM Corp. 2017
+# Copyright IBM Corp. 2016, 2017
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
 
-VERSION			= 1
-RELEASE			= 0
-PATCHLEVEL		= 0
-SMC_TOOLS_RELASE	= $(VERSION).$(RELEASE).$(PATCHLEVEL)
+SMC_TOOLS_RELEASE = 1.0.1
+VER_MAJOR         = $(shell echo $(SMC_TOOLS_RELEASE) | cut -d '.' -f 1)
 
-ARCH = $(shell uname -m)
-ifeq ($(ARCH),i686)
-ARCH64=0
-else ifeq ($(ARCH),s390)
-ARCH64=0
+ARCHTYPE = $(shell uname -m)
+ARCH := $(shell getconf LONG_BIT)
+
+ifneq ("${V}","1")
+        MAKEFLAGS += --quiet
+        cmd = echo $1$2;
 else
-ARCH64=1
+        cmd =
 endif
-
-DESTDIR        ?=
-INSTALLDIR	= /usr
-BINDIR		= ${INSTALLDIR}/bin
-MANDIR		= ${INSTALLDIR}/share/man
-OWNER		= $(shell id -un)
-GROUP		= $(shell id -gn)
-INSTALL_FLAGS_BIN	= -g $(GROUP) -o $(OWNER) -m755
-INSTALL_FLAGS_MAN	= -g $(GROUP) -o $(OWNER) -m644
-
-STUFF_32BIT	= 0
+CCC               = $(call cmd,"  CC      ",$@)${CC}
+LINK              = $(call cmd,"  LINK    ",$@)${CC}
+GEN               = $(call cmd,"  GEN     ",$@)sed
+DESTDIR          ?=
+PREFIX            = /usr
+BINDIR		  = ${PREFIX}/bin
+MANDIR		  = ${PREFIX}/share/man
+OWNER		  = $(shell id -un)
+GROUP		  = $(shell id -gn)
+INSTALL_FLAGS_BIN = -g $(GROUP) -o $(OWNER) -m755
+INSTALL_FLAGS_MAN = -g $(GROUP) -o $(OWNER) -m644
+
+STUFF_32BIT	  = 0
 #
 # Check that 31/32-bit build tools are available.
 #
-ifeq ($(ARCH64),1)
-LIBDIR		= ${INSTALLDIR}/lib64
-ifneq ("$(wildcard ${INSTALLDIR}/include/gnu/stubs-32.h)","")
+ifeq ($(ARCH),64)
+LIBDIR		= ${PREFIX}/lib64
+ifneq ("$(wildcard ${PREFIX}/include/gnu/stubs-32.h)","")
 STUFF_32BIT = 1
-LIBDIR32	= ${INSTALLDIR}/lib
+LIBDIR32	= ${PREFIX}/lib
 endif
 else
-LIBDIR		= ${INSTALLDIR}/lib
+LIBDIR		= ${PREFIX}/lib
 endif
 
-all: smc_run ld_pre_smc.so ld_pre_smc32.so smcss smcrpnet
+all: ld_pre_smc.so ld_pre_smc32.so smcss smc_pnet smc_run
 
-CFLAGS := -Wall -I include -O3 -g
+CFLAGS ?= -Wall -O3 -g
+ALL_CFLAGS = -DSMC_TOOLS_RELEASE=$(SMC_TOOLS_RELEASE) $(CFLAGS)
 
-ifeq ($(ARCH),s390x)
+ifeq ($(ARCHTYPE),s390x)
 	MACHINE_OPT32="-m31"
 else
 	MACHINE_OPT32="-m32"
 endif
 
 smc_run: smc_run.in
-	my_installdir=${INSTALLDIR}; \
-        sed -e "s#@install_dir@#$$my_installdir#g" < $< > $@
+	my_installdir=${PREFIX} $(GEN) -e "s#@install_dir@#$$my_installdir#g" < $< > $@
+	chmod a+x $@
+
+ld_pre_smc.o: ld_pre_smc.c
+	${CCC} ${CFLAGS} -fPIC -c ld_pre_smc.c
 
-ld_pre_smc.so: ld_pre_smc.c
-	${CC} ${CFLAGS} -fPIC -c ld_pre_smc.c
-	${CC} -shared ld_pre_smc.o -ldl -Wl,-z,defs -o ld_pre_smc.so
+ld_pre_smc.so: ld_pre_smc.o
+	${LINK} ${LDFLAGS} -shared ld_pre_smc.o -ldl -Wl,-z,defs,-soname,$@.$(VER_MAJOR) -o $@
 
 ld_pre_smc32.so: ld_pre_smc.c
-ifeq ($(ARCH64),1)
+ifeq ($(ARCH),64)
 ifeq ($(STUFF_32BIT),1)
-	${CC} ${CFLAGS} -fPIC -c ${MACHINE_OPT32} ld_pre_smc.c -o ld_pre_smc32.o
-	${CC} -shared ld_pre_smc32.o ${MACHINE_OPT32} -ldl -o ld_pre_smc32.so
+	${CCC} ${CFLAGS} -fPIC -c ${MACHINE_OPT32} $< -o ld_pre_smc32.o
+	${LINK} ${LDFLAGS} -shared ld_pre_smc32.o ${MACHINE_OPT32} -ldl -Wl,-soname,$@.$(VER_MAJOR) -o $@
 else
-	$(warning "Warning: Skipping 31/32-bit library build because 31/32-bit \
-build tools are unavailable. SMC-R will not support 31 and 32 bit TCP \
-applications unless the glibc-devel for appropriate addressing mode is \
-installed and the preload libraries are rebuilt.")
+	$(warning "Warning: Skipping 31/32-bit library build because 31/32-bit build tools")
+	$(warning "         are unavailable. SMC will not support 31/32 bit applications")
+	$(warning "         unless the glibc devel package for the appropriate addressing")
+	$(warning "         mode is installed and the preload libraries are rebuilt.")
 endif
 endif
 
-smcss.o: smcss.c smc_diag.h smctools_common.h
-	${CC} ${CFLAGS} -c smcss.c
-
-smcss: smcss.o
-
-#
 ifneq ($(shell sh -c 'command -v pkg-config'),)
-SMCRPNET_FLAGS = $(shell pkg-config --silence-errors --cflags --libs libnl-genl-3.0)
+SMC_PNET_CFLAGS = $(shell pkg-config --silence-errors --cflags libnl-genl-3.0)
+SMC_PNET_LFLAGS = $(shell pkg-config --silence-errors --libs libnl-genl-3.0)
 else
-SMCRPNET_FLAGS = -I/usr/include/libnl3 -lnl-genl-3 -lnl-3
+SMC_PNET_CFLAGS = -I /usr/include/libnl3
+SMC_PNET_LFLAGS = -lnl-genl-3 -lnl-3
 endif
 
-smcrpnet: smcrpnet.c smc.h
-	@if [ -e /usr/include/libnl3/netlink/netlink.h ]; then \
-		echo ${CC} ${CFLAGS} ${SMCRPNET_FLAGS} -o $@ $< ; \
-		${CC} ${CFLAGS} ${SMCRPNET_FLAGS} -o $@ $< ; \
-	else \
-		printf "*********************************************\n" >&2; \
+smc_pnet: smc_pnet.c smc.h smctools_common.h
+	@if [ ! -e /usr/include/libnl3/netlink/netlink.h ]; then \
+		printf "**************************************************************\n" >&2; \
 		printf "* Missing build requirement for: %-45s\n" $@ >&2; \
-		printf "* Install package..............: %-45s\n" libnl3-devel >&2; \
-		printf "*********************************************\n" >&2; \
-		exit 0; \
+		printf "* Install package..............: %-45s\n" "devel package for libnl3" >&2; \
+		printf "* Install package..............: %-45s\n" "devel package for libnl3-genl" >&2; \
+		printf "* NOTE: Package names might differ by platform\n" >&2; \
+		printf "**************************************************************\n" >&2; \
+		exit 1; \
 	fi
+	${CCC} ${ALL_CFLAGS} ${SMC_PNET_CFLAGS} ${LDFLAGS} -o $@ $< ${SMC_PNET_LFLAGS}
+
+smcss: smcss.c smc_diag.h smctools_common.h
+	${CCC} ${ALL_CFLAGS} ${LDFLAGS} $< -o $@
 
-install:
+install: all
+	echo "  INSTALL"
 	install -d -m755 $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)$(MANDIR)/man8
-	install -s $(INSTALL_FLAGS_BIN) ld_pre_smc.so $(DESTDIR)$(LIBDIR)
+	install $(INSTALL_FLAGS_BIN) ld_pre_smc.so $(DESTDIR)$(LIBDIR)
 ifeq ($(STUFF_32BIT),1)
 	install -d -m755 $(DESTDIR)$(LIBDIR32)
-	install -s $(INSTALL_FLAGS_BIN) ld_pre_smc32.so $(DESTDIR)$(LIBDIR32)/ld_pre_smc.so
+	install $(INSTALL_FLAGS_BIN) ld_pre_smc32.so $(DESTDIR)$(LIBDIR32)/ld_pre_smc.so
 endif
 	install $(INSTALL_FLAGS_BIN) smc_run $(DESTDIR)$(BINDIR)
-	install -s $(INSTALL_FLAGS_BIN) smcss $(DESTDIR)$(BINDIR)
-	install -s $(INSTALL_FLAGS_BIN) smcrpnet $(DESTDIR)$(BINDIR)
-	install $(INSTALL_FLAGS_MAN) af_smc.7 $(DESTDIR)$(MANDIR)/man7
+	install $(INSTALL_FLAGS_BIN) smcss $(DESTDIR)$(BINDIR)
+	install $(INSTALL_FLAGS_BIN) smc_pnet $(DESTDIR)$(BINDIR)
+	install $(INSTALL_FLAGS_MAN) $(DESTDIR)$(MANDIR)/man7
 	install $(INSTALL_FLAGS_MAN) smc_run.8 $(DESTDIR)$(MANDIR)/man8
-	install $(INSTALL_FLAGS_MAN) smcrpnet.8 $(DESTDIR)$(MANDIR)/man8
+	install $(INSTALL_FLAGS_MAN) smc_pnet.8 $(DESTDIR)$(MANDIR)/man8
 	install $(INSTALL_FLAGS_MAN) smcss.8 $(DESTDIR)$(MANDIR)/man8
 
 clean:
-	rm -f *.o *.so smc_run smcss smcrpnet
+	echo "  CLEAN"
+	rm -f *.o *.so smc_run smcss smc_pnet

README.smctools

@@ -1,16 +1,15 @@
-SMC Tools (1.0.0)
+SMC Tools (1.0.1)
 ===================
 
 The SMC Tools provided in this package allow execution of existing TCP
 applications over RoCE network without need to make changes in them.
-In addition tools are provided to display SMC socket information and
-SMC socket statistics (in future).
+In addition tools are provided to display SMC socket information.
 
 This package consists of the tools:
 
 - ld_preload_smc.so : preload library.
 - smc_run           : preload library environment setup script.
-- smcrpnet          : C program for PNET Table handling
+- smc_pnet          : C program for PNET Table handling
 - smcss             : C program for displaying the information about active
                       SMC sockets.
 
@@ -20,16 +19,49 @@ The environment setup script smc_run sets up the preload environment
 for the ld_pre_smc.so shared library before starting application.
 The smcss program is used to gather and display information about the
 SMC sockets.
-The smcrpnet program is used to create, destroy, and change the SMC-R PNET
+The smc_pnet program is used to create, destroy, and change the SMC-R PNET
 table.
 
 In addition the package contains the AF_SMC manpage ("man af_smc").
 
+
+Bug Reports
+===========
+See section 'Code Contributions'.
+
+
+Code Contributions
+==================
+Code contributions will not be accepted for smctools.
+Therefore, please do not send DIFFs or code-snippets. Thank you!
+If you want to report bugs or suggest enhancements, please contact:
+   linux390@de.ibm.com
+and put "[smctools]" as the first word in the subject line of your mail.
+For bug reports, at a minimum describe the scenario with instructions on how
+to reproduce.
+For enhancements, please describe the proposed change and its benefits.
+
+
 Release History:
 ================
 
-1.0.0
-    The initial version.
+1.0.1 (2018-01-12)
+    Changes:
+    - Makefile: Improve distro compatibility
+    - Makefile: Add SONAME to shared libraries
+    - Makefile: Do not strip binaries on install
+    - Makefile: Use LDFLAGS to allow addition of externally set link flags
+    - ld_pre..: Remove hardcoded reference to libc
+    - Manpages: Formatting changes
+
+    Bug fixes:
+    - Makefile: Fix target 'install' dependencies
+    - smcss:    Fix "--version" output
+    - smc_pnet: Fix "--version" output
+
+1.0.0 (2017-02-13)
+    The initial version
+
 
 Parts:
 ======
@@ -39,26 +71,27 @@ The SMC Tools package includes the following files:
 Makefile		smctools Makefile
 ld_pre_smc.c		ld_pre_smc.so, SMC preload library source code
 smc_run			SMC preload library environment setup script
-smcrpnet.c		PNET Table handling source code
+smc_pnet.c		PNET Table handling source code
 smcss.c			SMC socket display source code
 smctools_common.h	common definitions for smctools
 smc.h			include file from kernel include/uapi/linux/smc.h
 smc_diag.h		include file from kernel include/uapi/linux/smc_diag.h
 af_smc.7		manpage for AF_SMC sockets
-smcrpnet.8		manpage for smcrpnet
+smc_pnet.8		manpage for smc_pnet
 smcss.8			manpage for smcss
 smc_run.8		manpage for preload library usage
 
+
 Requirements:
 =============
 
 - To compile and run applications over a RoCE network, PCI support,
   Mellanox Connect-X device support, Infiniband, and SMC support, must be
-  enabled in kernel.
+  enabled in the kernel.
 - To run the applications over a RoCE network, the RoCE network must be
   properly configured.
 
-Copyright IBM Corp. 2017
+Copyright IBM Corp. 2016, 2017
 
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THE ENCLOSED ECLIPSE
 PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE

af_smc.7

@@ -1,7 +1,7 @@
 .\" af_smc.7
 .\"
 .\"
-.\" Copyright IBM Corp. 2017
+.\" Copyright IBM Corp. 2016, 2017
 .\" Author(s):	Ursula Braun <ubraun@linux.vnet.ibm.com>
 .\"		Thomas Richter <tmricht@linux.vnet.ibm.com>
 .\" ----------------------------------------------------------------------
@@ -71,9 +71,9 @@ Any available Ethernet interface can be combined with available
 if they belong to the same Converged Ethernet fabric.
 To configure RoCE Adapter mapping, you must create a pnet table.
 Modify the table with the smc-tools command
-.I smcrpnet.
+.I smc_pnet.
 .PP
-For details call "man smcrpnet".
+For details call "man smc_pnet".
 .SS Important sysctl settings
 SMC-R supports IPv4 only. Use this sysctl setting:
 .IR  net.ipv6.bindv6only=1
@@ -102,10 +102,10 @@ the minimum MTU size of both peers.
 
 .SH "AUTHOR"
 .nf
-Copyright IBM Corp. 2017
+Copyright IBM Corp. 2016, 2017
 
 Published under the terms and conditions of the EPL
-(eclipse public license).
+(Eclipse Public License).
 .fi
 
 .SH "SEE ALSO"
@@ -115,10 +115,10 @@ Published under the terms and conditions of the EPL
 .BR socket (7)
 .BR smc_run (8)
 .BR smcss (8)
-.BR smcrpnet (8)
+.BR smc_pnet (8)
 .SH "HISTORY"
 .TP
-.B AF_SMC, version 1.0.0
+.B AF_SMC, version 1.0.1
 .RS 4
 .IP "\bu" 2
 Initial version.

ld_pre_smc.c

@@ -1,7 +1,7 @@
 /*
  * SMC Tools - Shared Memory Communication Tools
  *
- * Copyright (c) IBM Corp. 2017
+ * Copyright (c) IBM Corp. 2016, 2017
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,12 +16,12 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
+#include <gnu/lib-names.h>
 #include <netdb.h>
 #include <dlfcn.h>
 #include <errno.h>
 #include <search.h>
 
-#define LIBC_PATH "libc.so.6"
 #define DLOPEN_FLAG RTLD_LAZY
 
 #ifndef AF_SMC
@@ -97,7 +97,7 @@ static void initialize(void)
 {
 	set_debug_mode("SMC_DEBUG");
 
-	dl_handle = dlopen(LIBC_PATH,DLOPEN_FLAG);
+	dl_handle = dlopen(LIBC_SO, DLOPEN_FLAG);
 	if (!dl_handle)
 		dbg_msg(stderr, "dlopen failed: %s\n", dlerror());
 	GET_FUNC(socket);