New release s390-tools-2.16.0

Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>

.gitignore

@@ -11,9 +11,8 @@
 cmsfs-fuse/cmsfs-fuse
 cpacfstats/cpacfstats
 cpacfstats/cpacfstatsd
-cpumf/bin/chcpumf
+cpumf/chcpumf
-cpumf/bin/cpumf_helper
+cpumf/lscpumf
-cpumf/bin/lscpumf
 cpuplugd/cpuplugd
 dasdfmt/dasdfmt
 dasdinfo/dasdinfo
@@ -35,6 +34,11 @@ iucvterm/src/iucvconn
 iucvterm/src/iucvtty
 iucvterm/src/ttyrun
 iucvterm/test/test_afiucv
+libekmfweb/check-dep-libekmfweb
+libekmfweb/detect-openssl-version.dep
+libekmfweb/libekmfweb.so
+libekmfweb/libekmfweb.so.1
+libekmfweb/libekmfweb.so.1.0
 libutil/util_base_example
 libutil/util_file_example
 libutil/util_libc_example
@@ -45,8 +49,9 @@ libutil/util_path_example
 libutil/util_prg_example
 libutil/util_rec_example
 libutil/util_scandir_example
-libzds/libzds.a
 libvmcp/vmcp_example
+libzds/libzds.a
+lsstp/lsstp
 mon_tools/mon_fsstatd
 mon_tools/mon_procd
 osasnmpd/osasnmpd
@@ -76,10 +81,10 @@ zdev/src/lszdev
 zdev/src/lszdev_usage.c
 zdsfs/zdsfs
 zdump/zgetdump
-zfcpdump/cpioinit
-zfcpdump/zfcpdump_part
-zfcpdump/zfcpdump-initrd
 zfcpdump/10-zfcpdump.install
+zfcpdump/cpioinit
+zfcpdump/zfcpdump-initrd
+zfcpdump/zfcpdump_part
 ziomon/ziomon_mgr
 ziomon/ziomon_util
 ziomon/ziomon_zfcpdd
@@ -91,9 +96,11 @@ zipl/boot/data.h
 zipl/src/chreipl_helper.device-mapper
 zipl/src/zipl
 zipl/src/zipl_helper.device-mapper
-zkey/zkey
-zkey/zkey-cryptsetup
 zkey/check-dep-zkey
 zkey/check-dep-zkey-cryptsetup
 zkey/detect-libcryptsetup.dep
+zkey/ekmfweb/libekmfweb.dep
+zkey/ekmfweb/zkey-ekmfweb.so
+zkey/zkey
+zkey/zkey-cryptsetup
 zpcictl/zpcictl

AUTHORS.md

@@ -1,6 +1,7 @@
 List of all individuals having contributed content to s390-tools
 ----------------------------------------------------------------
 
+- Alexander Egorenkov
 - Alexey Ishchuk
 - Andreas Herrmann
 - Andre Wild
@@ -8,16 +9,19 @@ List of all individuals having contributed content to s390-tools
 - Arnd Bergmann
 - Axel Wirbser
 - Benjamin Block
+- Brian C. Lane
 - Carsten Otte
 - Christian Borntraeger
 - Christian Ehrhardt
 - Christof Schmitt
 - Claudio Imbrenda
 - Clemens von Mann
+- Colin Walters
 - Dan Horak
 - Despina Papadopoulou
 - Dimitri John Ledkov
 - Eberhard Pasch
+- Eduard Shishkin
 - Einar Lueck
 - Eric Sandeen
 - Erwin Vicari
@@ -32,6 +36,7 @@ List of all individuals having contributed content to s390-tools
 - Fritz Elfert
 - Gerald Schaefer
 - Gerhard Tonn
+- Guevenc Guelce
 - Hannes Reinecke
 - Hans-Joachim Picht
 - Hans Wippel
@@ -52,6 +57,7 @@ List of all individuals having contributed content to s390-tools
 - Jean-Baptiste Joret
 - Jens Remus
 - Jochen Roehrig
+- Juergen Christ
 - Julian Wiedmann
 - Karsten Graul
 - Kittipon Meesompop
@@ -71,11 +77,13 @@ List of all individuals having contributed content to s390-tools
 - Michael Mueller
 - Mijo Safradin
 - Mikhail Zaslonko
+- Nikita Dubrovskii
 - Niklas Schnelle
 - Peter Oberparleiter
 - Peter Tiedemann
 - Philipp Kern
 - Philipp Rudo
+- Prashanth Sundararaman
 - Rafael Fonseca
 - Raimund Schroeder
 - Ralph Wuerthner
@@ -94,6 +102,7 @@ List of all individuals having contributed content to s390-tools
 - Steffen Maier
 - Steffen Thoss
 - Susanne Wintenberger
+- Sven Schnelle
 - Sven Schuetz
 - Swen Schillig
 - Taraka R. Bodireddy
@@ -104,7 +113,10 @@ List of all individuals having contributed content to s390-tools
 - Tuan Hoang
 - Ursula Braun
 - Utz Bacher
+- Vance Morris
 - Vasily Gorbik
 - Viktor Mihajlovski
+- Vineeth Vijayan
 - Volker Sameske
+- Wenjia Zhang
 - Wolfgang Taphorn

CHANGELOG.md

@@ -1,5 +1,97 @@
 Release history for s390-tools (MIT version)
 --------------------------------------------
+* __v2.16.0 (2021-02-19)__
+
+  For Linux kernel version: 5.10 / 5.11
+
+  Add new tool:
+  - hsci: New tool to manage HSCI (HiperSockets Converged Interfaces)
+
+  Changes of existing tools:
+  - genprotimg: Add host-key document verification support
+  - genprotimg: boot: Make boot loader -march=z900 compatible
+  - libekmfweb: Make install directory for shared libraries configurable
+  - lsdasd: Add FC Endpoint Security information
+  - make: Add address sanitizer support
+  - netboot: Add version information to scripts
+  - netboot: Bump busybox version in pxelinux.0 build
+  - zdev: Add FC Endpoint Security information for DASD devices
+  - zdev: Add build option to update initial RAM-disk by default
+  - zkey-ekmfweb: Avoid sequence number clash when generating keys
+  - zkey/zkey-ekmfweb: Install KMS plugins into configurable location
+  - zkey: Add support to store LUKS2 dummy passphrase in key repository
+
+  Bug Fixes:
+  - dasdfmt: Fix segfault when an incorrect option is specified
+  - genprotimg: Fix several build issues
+  - genprotimg: Require argument for 'ramdisk' and 'parmfile' options
+  - zcryptstats: Fix handling of partial results with many domains
+  - zfcpdbf: Deal with crash 7.2.9 change in caller name formatting
+  - zipl/boot: Fix memory use after free in stage2
+  - zipl/boot: Fix potential heap overflow in stage2
+  - zipl: Fix reading 4k disk's geometry
+
+* __v2.15.1 (2020-10-28)__
+
+  For Linux kernel version: 5.9
+
+  Changes of existing tools:
+  - lsstp: Improve wording and fix typos in man page
+  - zkey: Ensure zkey and friends are skipped with HAVE_OPENSSL=0
+  - zkey: Add library versioning for libekmfweb and zkey-ekmfweb
+  - libutil: Add function to determine base device of a partition block device
+
+  Bug Fixes:
+  - dasdfmt: Fix bad file descriptor error when running on symlinks
+  - libdasd: Fix dasd_get_host_access_count()
+  - zipl: Fix multivolume dump
+  - zgetdump: Fix device node determination via sysfs to work with multivolume again
+  - genprotimg/boot: Fix build by disabling SSP
+  - zipl/boot: Fix build by disabling SSP
+
+* __v2.15.0 (2020-10-15)__
+
+  For Linux kernel version: 5.9
+
+  Add new tool:
+  - lsstp: A small utility to display the Server Time Protocol (STP) information present in sysfs
+
+  Changes of existing tools:
+  - dumpconf: support NVMe dump/reipl device
+  - ipl_tools: support clear attribute for nvme re-IPL
+  - zcrypt: Support new config state with lszcrypt and chzcrypt
+  - zkey: Add support for key management system plugins
+        including the KMS commands:
+            bind, unbind, info, configure, rencipher, list, import, refresh
+  - zkey: Add EKMFWeb support to remotely generate secure keys
+  - libekmfweb: Add new EKMFWeb client library
+  - libutil: Add util_file_read_va()
+  - libutil: Add util_file_read_i()/util_file_read_ui()
+
+  Bug Fixes:
+  - cpumf: Fix version and help printout when CPUMF is not installed
+  - ziomon/ziorep_printers: fix virtual adapter CSV output
+  - zipl: Fix Error when title is not the first field in BLS file
+
+
+* __v2.14.0 (2020-08-21)__
+
+  For Linux kernel version: 5.7 / 5.8
+
+  Changes of existing tools:
+  - cpacfstats: Add ECC counters
+  - dbginfo: Added collection of /proc/softirqs
+  - ipl-tools: Add nvme device support to lsreipl/chreipl
+  - zdsfs: Add coordinated read access
+  - libzds: Add curl interface to access zosmf rest api
+  - util_opt: Change util_opt_init() to honor current command, if set
+  Bug Fixes:
+  - lsluns: Try harder to find udevadm
+  - mon_tools: Update udevadm location
+  - zipl: Fix NVMe partition and base device detection
+  - zipl/stage3: Correctly handle diag308 response code
+  - znetconf: Introduce better ways to locate udevadm
+
 * __v2.13.0 (2020-05-06)__
 
   For Linux kernel version: 5.5 / 5.6

CONTRIBUTING.md

@@ -72,7 +72,7 @@ In the examples below we use this fictive identity:
 ### Setup GitHub and local git
 
 1. Create a fork of this repository by clicking the `Fork` button on the top
-   right of the [s390-tools](https://github.com/ibm-s390-tools/s390-tools)
+   right of the [s390-tools](https://github.com/ibm-s390-linux/s390-tools)
    main page
 
 2. Clone your forked repository to your local development system
@@ -84,7 +84,7 @@ In the examples below we use this fictive identity:
    s390-tools repository on GitHub
    ```
    $ cd s390-tools
-   ~/s390-tools $ git remote add upstream https://github.com/ibm-s390-tools/s390-tools.git
+   ~/s390-tools $ git remote add upstream https://github.com/ibm-s390-linux/s390-tools.git
    ```
 
 4. Verify your remotes
@@ -92,8 +92,8 @@ In the examples below we use this fictive identity:
    ~/s390-tools $ git remote -v
    origin  https://github.com/random-developer/s390-tools.git (fetch)
    origin  https://github.com/random-developer/s390-tools.git (push)
-   upstream        https://github.com/ibm-s390-tools/s390-tools.git (fetch)
+   upstream        https://github.com/ibm-s390-linux/s390-tools.git (fetch)
-   upstream        https://github.com/ibm-s390-tools/s390-tools.git (push)
+   upstream        https://github.com/ibm-s390-linux/s390-tools.git (push)
    ```
    You now have two remotes: The "origin" remote points to your fork
    and the "upstream" remote to the official s390-tools repository.

Makefile

@@ -3,13 +3,13 @@ ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/ar
 # Include common definitions
 include common.mak
 
-LIB_DIRS = libvtoc libutil libzds libdasd libvmdump libccw libvmcp
+LIB_DIRS = libvtoc libutil libzds libdasd libvmdump libccw libvmcp libekmfweb
 TOOL_DIRS = zipl zdump fdasd dasdfmt dasdview tunedasd \
 	   tape390 osasnmpd qetharp ip_watcher qethconf scripts zconf \
 	   vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \
 	   ziomon iucvterm hyptop cmsfs-fuse qethqoat zfcpdump zdsfs cpumf \
 	   systemd hmcdrvfs cpacfstats zdev dump2tar zkey netboot etc zpcictl \
-	   genprotimg
+	   genprotimg lsstp hsci
 
 SUB_DIRS = $(LIB_DIRS) $(TOOL_DIRS)
 

README.md

@@ -243,6 +243,15 @@ Package contents
    Provides simple tools to create a binary that can be used to implement
    simple network boot setups following the PXELINUX conventions.
 
+ * libekmfweb:
+   A shared library that provides functions to communicate with an EKMF Web
+   server via REST calls over HTTPS. EKMF Web stands for IBM Enterprise Key
+   Management Foundation - Web Edition, and is used to manage keys in an
+   enterprise.
+
+ * hsci:
+   Manage HiperSockets Converged Interfaces (HSCI).
+
 For more information refer to the following publications:
 
   * "Device Drivers, Features, and Commands" chapter "Useful Linux commands"
@@ -267,17 +276,19 @@ build options:
 | pfm            | `HAVE_PFM`         | cpacfstats                            |
 | net-snmp       | `HAVE_SNMP`        | osasnmpd                              |
 | glibc-static   | `HAVE_LIBC_STATIC` | zfcpdump                              |
-| openssl        | `HAVE_OPENSSL`     | genprotimg,zkey                       |
+| openssl        | `HAVE_OPENSSL`     | genprotimg, zkey, libekmfweb          |
 | cryptsetup     | `HAVE_CRYPTSETUP2` | zkey-cryptsetup                       |
-| json-c         | `HAVE_JSONC`       | zkey-cryptsetup                       |
+| json-c         | `HAVE_JSONC`       | zkey-cryptsetup, libekmfweb           |
 | glib2          | `HAVE_GLIB2`       | genprotimg                            |
+| libcurl        | `HAVE_LIBCURL`     | genprotimg, libekmfweb                |
 
 This table lists additional build or install options:
 
-| __COMPONENT__  | __OPTION__       | __TOOLS__                       |
+| __COMPONENT__    | __OPTION__                   | __TOOLS__      |
-|----------------|:----------------:|:-------------------------------:|
+|------------------|:----------------------------:|:--------------:|
-| dracut         | `HAVE_DRACUT`    | zdev                            |
+| dracut           | `HAVE_DRACUT`                | zdev           |
-| initramfs-tools| `HAVE_INITRAMFS` | zdev                            |
+| initramfs-tools  | `HAVE_INITRAMFS`             | zdev           |
+|                  | `ZDEV_ALWAYS_UPDATE_INITRD`  | zdev           |
 
 The s390-tools build process uses "pkg-config" if available and hard-coded
 compiler and linker options otherwise.
@@ -368,6 +379,17 @@ the different tools are provided:
   Distributors with different boot or RAM-disk mechanisms should provide
   a custom zdev-root-update helper script.
 
+  - `ZDEV_ALWAYS_UPDATE_INITRD=1` upon modification of any persistent device
+    configuration, chzdev updates the initial RAM-disk by default, without any
+    additional user interaction.
+
+  For some distributions, all the configuration attributes must be copied to
+  the initial RAM-disk. Because the device configuration directives applied
+  in the initial RAM-disk takes precedence over those stored in the root file-
+  system. This copying is done usually by explicitly invoking a command. This
+  build option makes it user-friendly and does this copying without any manual
+  intervention.
+
   Some functions of zdev require that the following programs are available:
 
   - modprobe (kmod)
@@ -397,3 +419,11 @@ the different tools are provided:
   tool must be added to this group. The owner of the default key repository
   '/etc/zkey/repository' must be set to group 'zkeyadm' with write permission
   for this group.
+
+* libekmfweb:
+  For building the libekmfweb shared library you need openssl version 1.1.1 or
+  newer installed (openssl-devel.rpm). Also required are json-c version 0.13 or
+  newer (json-c-devel.rpm), and libcurl version 7.59 or newer
+  (libcurl-devel.rpm).
+  Tip: you may skip the libekmfweb build by adding `HAVE_OPENSSL=0`,
+  `HAVE_JSONC=0`, or `HAVE_LIBCURL=0` to the make invocation.

cmsfs-fuse/cmsfs-fuse.c

@@ -299,7 +299,7 @@ static unsigned long dec_to_hex(unsigned long long num)
 {
 	unsigned long res;
 
-	asm volatile("cvb %0,%1" : "=d" (res) : "m" (num));
+	asm volatile("cvb %0,%1" : "=d" (res) : "Q" (num));
 	return res & 0xffffffff;
 }
 
@@ -307,7 +307,7 @@ static unsigned int hex_to_dec(unsigned int num)
 {
 	unsigned long long res;
 
-	asm volatile("cvd %1,%0" : "=m" (res) : "d" (num));
+	asm volatile("cvd %1,%0" : "=Q" (res) : "d" (num));
 	return res & 0xffffffff;
 }
 
@@ -2050,7 +2050,7 @@ static int update_dir_levels(int blocks)
 	if (blocks < 2)
 		return 0;
 
-	while (blocks / (PTRS_PER_BLOCK + 1)) {
+	while (blocks / PTRS_PER_BLOCK) {
 		levels++;
 		blocks /= PTRS_PER_BLOCK;
 	}
@@ -3103,7 +3103,7 @@ static void update_levels(struct file *f)
 		return;
 	}
 
-	while (blocks / (per_block + 1)) {
+	while (blocks / per_block) {
 		levels++;
 		blocks /= per_block;
 	}

common.mak

@@ -5,7 +5,7 @@ COMMON_INCLUDED = true
 # The variable "DISTRELEASE" should be overwritten in rpm spec files with:
 # "make DISTRELEASE=%{release}" and "make install DISTRELEASE=%{release}"
 VERSION            = 2
-RELEASE            = 13
+RELEASE            = 16
 PATCHLEVEL         = 0
 DISTRELEASE        = build-$(shell date +%Y%m%d)
 S390_TOOLS_RELEASE = $(VERSION).$(RELEASE).$(PATCHLEVEL)-$(DISTRELEASE)
@@ -106,6 +106,11 @@ endif
 DEFAULT_CPPFLAGS = -D_GNU_SOURCE
 DEFAULT_LDFLAGS = -rdynamic
 
+ifeq ("${ASAN}","1")
+	DEFAULT_CFLAGS  += -fsanitize=address -fno-omit-frame-pointer
+	DEFAULT_LDFLAGS += -fsanitize=address
+endif
+
 #
 # Check for build dependency
 #
@@ -163,6 +168,7 @@ USRSBINDIR      = $(INSTALLDIR)/usr/sbin
 USRBINDIR       = $(INSTALLDIR)/usr/bin
 BINDIR          = $(INSTALLDIR)/sbin
 LIBDIR          = $(INSTALLDIR)/lib
+USRLIB64DIR     = $(INSTALLDIR)/usr/lib64
 SYSCONFDIR      = $(INSTALLDIR)/etc
 MANDIR          = $(INSTALLDIR)/usr/share/man
 VARDIR          = $(INSTALLDIR)/var
@@ -172,14 +178,24 @@ ZFCPDUMP_DIR    = $(TOOLS_LIBDIR)/zfcpdump
 # Systemd support files are installed only if a directory is specified
 # for SYSTEMDSYSTEMUNITDIR (e.g. /lib/systemd/system)
 SYSTEMDSYSTEMUNITDIR =
+USRINCLUDEDIR   = $(INSTALLDIR)/usr/include
+ZKEYKMSPLUGINDIR = $(USRLIB64DIR)/zkey
+
+ifeq ($(LIBDIR),$(INSTALLDIR)/lib)
+SOINSTALLDIR = $(USRLIB64DIR)
+else
+SOINSTALLDIR = $(LIBDIR)
+endif
 
 INSTDIRS        = $(USRSBINDIR) $(USRBINDIR) $(BINDIR) $(LIBDIR) $(MANDIR) \
 			$(SYSCONFDIR) $(SYSCONFDIR)/sysconfig \
 			$(TOOLS_LIBDIR) $(TOOLS_DATADIR) \
-			$(ZFCPDUMP_DIR) $(SYSTEMDSYSTEMUNITDIR)
+			$(ZFCPDUMP_DIR) $(SYSTEMDSYSTEMUNITDIR) \
+			$(USRLIB64DIR) $(USRINCLUDEDIR) $(ZKEYKMSPLUGINDIR) \
+			$(SOINSTALLDIR)
 OWNER           = $(shell id -un)
 GROUP		= $(shell id -gn)
-export INSTALLDIR BINDIR LIBDIR MANDIR OWNER GROUP
+export INSTALLDIR BINDIR LIBDIR USRLIB64DIR MANDIR OWNER GROUP
 
 # Special defines for zfcpdump
 ZFCPDUMP_IMAGE	= zfcpdump-image
@@ -261,6 +277,7 @@ help:
 	@echo '  G=1      Build with gcov to collect code coverage data'
 	@echo '  V=1      Generate verbose build output'
 	@echo '  W=1      Build with higher warning level'
+	@echo '  ASAN=1   Build with address sanitizer'
 	@echo ''
 	@echo 'EXAMPLES'
 	@echo '  # make clean all D=1 W=1 -j'
@@ -339,6 +356,10 @@ $(rootdir)/libvmcp/libvmcp.a: $(rootdir)/libvmcp
 	$(MAKE) -C $(rootdir)/libvmcp/ libvmcp.a
 .PHONY: $(rootdir)/libvmcp
 
+$(rootdir)/libekmfweb/libekmfweb.so: $(rootdir)/libekmfweb
+	$(MAKE) -C $(rootdir)/libekmfweb/ libekmfweb.so
+.PHONY: $(rootdir)/libekmfweb
+
 $(rootdir)/zipl/boot/data.o:
 	$(MAKE) -C $(rootdir)/zipl/boot/ data.o
 
@@ -359,9 +380,9 @@ install: install_echo install_dirs
 clean_echo:
 	$(call echocmd,"  CLEAN   ")
 clean_gcov:
-	rm -f *.gcda *.gcno *.gcov
+	rm -f -- *.gcda *.gcno *.gcov
 clean_dep:
-	rm -f .*.o.d
+	rm -f -- .*.o.d
 
 clean: clean_echo clean_gcov clean_dep
 endif

cpacfstats/Makefile

@@ -2,28 +2,10 @@ include ../common.mak
 
 ALL_CPPFLAGS += -DVERSION=$(VERSION)
 
-
+all:		cpacfstats cpacfstatsd
-ifeq (${HAVE_PFM},0)
-
-all:
-	$(SKIP) HAVE_PFM=0
-
-install:
-	$(SKIP) HAVE_PFM=0
-
-else
-
-check_dep:
-	$(call check_dep, \
-			"cpacfstats", \
-			"perfmon/pfmlib.h", \
-			"libpfm-devel or libpfm4-dev", \
-			"HAVE_PFM=0")
-
-all:		check_dep cpacfstats cpacfstatsd
 
 cpacfstatsd:	cpacfstatsd.o stats_sock.o perf_crypto.o
-		$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -lpfm -o $@
+		$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
 
 cpacfstats:	cpacfstats.o stats_sock.o
 		$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
@@ -34,7 +16,6 @@ install: 	all
 		$(INSTALL) -m 644 cpacfstatsd.8 $(DESTDIR)$(MANDIR)/man8
 		$(INSTALL) -m 644 cpacfstats.1  $(DESTDIR)$(MANDIR)/man1
 
-endif
 clean:
 		rm -f *.o *~ cpacfstatsd cpacfstats
 

cpacfstats/cpacfstats.1

@@ -1,6 +1,6 @@
 .\" cpacfstats.1
 .\"
-.\" Copyright IBM Corp. 2015, 2017
+.\" Copyright IBM Corp. 2015, 2020
 .\" s390-tools is free software; you can redistribute it and/or modify
 .\" it under the terms of the MIT license. See LICENSE for details.
 .\"
@@ -80,31 +80,33 @@ Display help information for the command.
 Display version and copyright information for the command.
 .TP
 \fB\-e\fR or \fB\-\-enable\fR [counter]
-Enable one or all CPACF performance counters. The optional counter argument
+Enable one or all CPACF performance counters. The optional counter
-can be one of: \fBdes\fR, \fBaes\fR, \fBsha\fR, \fBprng\fR or \fBall\fR. If
+argument can be one of: \fBdes\fR, \fBaes\fR, \fBsha\fR, \fBprng\fR,
-the counter argument is omitted, all performance counters are
+\fBecc\fR, or \fBall\fR. If the counter argument is omitted, all
-enabled. Enabling a counter does not reset it. New events are added to the
+performance counters are enabled. Enabling a counter does not reset
-current counter value.
+it. New events are added to the current counter value.
 .TP
 \fB\-d\fR or \fB\-\-disable\fR [counter]
 Disable one or all CPACF performance counters. The optional counter
-argument can be one of: \fBdes\fR, \fBaes\fR, \fBsha\fR, \fBprng\fR or
+argument can be one of: \fBdes\fR, \fBaes\fR, \fBsha\fR, \fBprng\fR,
-\fBall\fR. If the counter argument is omitted, all performance counters
+\fBecc\fR, or \fBall\fR. If the counter argument is omitted, all
-are disabled. Disabling a counter does not reset it. The counter value is
+performance counters are disabled. Disabling a counter does not reset
-preserved when a counter is disabled, and counting will resume using the
+it. The counter value is preserved when a counter is disabled, and
-preserved value when the counter is re-enabled.
+counting will resume using the preserved value when the counter is
+re-enabled.
 .TP
 \fB\-r\fR or \fB\-\-reset\fR [counter]
 Reset one or all CPACF performance counters. The optional counter
-argument can be one of: \fBdes\fR, \fBaes\fR, \fBsha\fR, \fBprng\fR or
+argument can be one of: \fBdes\fR, \fBaes\fR, \fBsha\fR, \fBprng\fR,
-\fBall\fR. If the counter argument is omitted, all performance counters are
+\fBecc\fR, or \fBall\fR. If the counter argument is omitted, all
-reset to 0.
+performance counters are reset to 0.
 .TP
 \fB\-p\fR or \fB\-\-print\fR [counter]
-Display the value of one or all CPACF performance counters. The optional
+Display the value of one or all CPACF performance counters. The
-counter argument can be one of: \fBdes\fR, \fBaes\fR, \fBsha\fR, \fBprng\fR
+optional counter argument can be one of: \fBdes\fR, \fBaes\fR,
-or \fBall\fR. If the counter argument is omitted or if there is no
+\fBsha\fR, \fBprng\fR, \fBecc\fR, or \fBall\fR. If the counter
-argument, all performance counters are displayed.
+argument is omitted or if there is no argument, all performance
+counters are displayed.
 .TP
 The default command is --print all.
 .
@@ -123,5 +125,10 @@ version mismatch between client and daemon, or the application is out of
 memory. The application prints a message with the details of the error and
 the errno value.
 .
+.SH NOTES
+ECC counters are only available since z15. cpacfstats will show the
+counters as \fIunsupported\fR if the hardware does not support ECC
+counters.
+.
 .SH SEE ALSO
-cpacfstatsd (8)
+.BR cpacfstatsd (8)

cpacfstats/cpacfstats.c

@@ -3,7 +3,7 @@
  *
  * cpacfstats client implementation
  *
- * Copyright IBM Corp. 2015, 2017
+ * Copyright IBM Corp. 2015, 2020
  *
  * s390-tools is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
@@ -39,13 +39,14 @@ static const char *const usage =
 	"\t-d, --disable [counter]   Disable one or all counters\n"
 	"\t-r, --reset   [counter]   Reset one or all counter values\n"
 	"\t-p, --print   [counter]   Print one or all counter values\n"
-	"\tcounter can be: 'aes' 'des' 'rng' 'sha' or 'all'\n";
+	"\tcounter can be: 'aes' 'des' 'rng' 'sha' 'ecc' or 'all'\n";
 
 static const char *const counter_str[] = {
 	[DES_FUNCTIONS]  = "des",
 	[AES_FUNCTIONS]  = "aes",
 	[SHA_FUNCTIONS]  = "sha",
 	[PRNG_FUNCTIONS] = "rng",
+	[ECC_FUNCTIONS] = "ecc",
 	[ALL_COUNTER]    = "all"
 };
 
@@ -98,6 +99,8 @@ static void print_answer(int ctr, int state, uint64_t value)
 		       counter_str[ctr], state);
 	else if (state == DISABLED)
 		printf(" %s counter: disabled\n", counter_str[ctr]);
+	else if (state == UNSUPPORTED)
+		printf(" %s counter: unsupported\n", counter_str[ctr]);
 	else
 		printf(" %s counter: %"PRIu64"\n", counter_str[ctr], value);
 }

cpacfstats/cpacfstats.h

@@ -3,7 +3,7 @@
  *
  * common function prototypes and definitions
  *
- * Copyright IBM Corp. 2015, 2017
+ * Copyright IBM Corp. 2015, 2020
  *
  * s390-tools is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
@@ -14,7 +14,7 @@
 
 #include "lib/zt_common.h"
 
-#define COPYRIGHT "Copyright IBM Corp. 2015, 2017"
+#define COPYRIGHT "Copyright IBM Corp. 2015, 2020"
 
 int eprint(const char *format, ...);
 
@@ -27,6 +27,7 @@ enum ctr_e {
 	AES_FUNCTIONS,
 	SHA_FUNCTIONS,
 	PRNG_FUNCTIONS,
+	ECC_FUNCTIONS,
 	ALL_COUNTER
 };
 
@@ -44,7 +45,8 @@ enum cmd_e {
 
 enum state_e {
 	DISABLED = 0,
-	ENABLED
+	ENABLED,
+	UNSUPPORTED
 };
 
 /*
@@ -108,5 +110,6 @@ int  perf_enable_ctr(enum ctr_e ctr);
 int  perf_disable_ctr(enum ctr_e ctr);
 int  perf_reset_ctr(enum ctr_e ctr);
 int  perf_read_ctr(enum ctr_e ctr, uint64_t *value);
+int  perf_ecc_supported(void);
 
 #endif

cpacfstats/cpacfstatsd.8

@@ -1,6 +1,6 @@
 .\" cpacfstatsd.8
 .\"
-.\" Copyright IBM Corp. 2015, 2017
+.\" Copyright IBM Corp. 2015, 2020
 .\" s390-tools is free software; you can redistribute it and/or modify
 .\" it under the terms of the MIT license. See LICENSE for details.
 .\"
@@ -37,7 +37,10 @@ config option enabled.
 .P
 - Libpfm version 4 or higher is needed to successfully run the daemon.
 .P
-- Your LPAR must be configured to enable the "Counter Facility Security Options".
+- On the HMC or SE, authorize the LPAR for each counter set you want
+to use. Customize the LPAR activation profile and modify the Counter
+Facility Security Options. You need to activate the "Crypto activity
+counter set authorization control" checkbox.
 .P
 - The daemon requires root privileges to interact with the performance
 ioctls of the kernel.
@@ -47,7 +50,7 @@ restart the daemon to ensure correct summing of the per-CPU performance
 counters.
 
 The starting daemon first checks for any stale pid file
-/run/cpacfstatsd.pid. If this file exists, and the process ID in the
+\%/run/cpacfstatsd.pid. If this file exists, and the process ID in the
 file belongs to an active process, an error message is printed to the
 console and the program terminates.
 
@@ -94,4 +97,4 @@ done in the re-spawned process. Check the syslog for success or failure.
 The daemon could not be set to run in the background.
 
 .SH SEE ALSO
-cpacfstats (1)
+.BR cpacfstats (1)

cpacfstats/cpacfstatsd.c

@@ -94,20 +94,24 @@ static int do_enable(int s, enum ctr_e ctr)
 
 	for (i = 0; i < ALL_COUNTER; i++) {
 		if (i == (int) ctr || ctr == ALL_COUNTER) {
-			if (!ctr_state[i]) {
+			if (ctr_state[i] == DISABLED) {
 				rc = perf_enable_ctr(i);
 				if (rc != 0) {
 					send_answer(s, i, rc, 0);
 					break;
 				}
-				ctr_state[i] = 1;
+				ctr_state[i] = ENABLED;
 			}
-			rc = perf_read_ctr(i, &value);
+			if (ctr_state[i] == UNSUPPORTED) {
-			if (rc != 0) {
+				send_answer(s, i, UNSUPPORTED, 0);
-				send_answer(s, i, rc, 0);
+			} else {
-				break;
+				rc = perf_read_ctr(i, &value);
+				if (rc != 0) {
+					send_answer(s, i, rc, 0);
+					break;
+				}
+				send_answer(s, i, ENABLED, value);
 			}
-			send_answer(s, i, ENABLED, value);
 		}
 	}
 
@@ -121,7 +125,7 @@ static int do_disable(int s, enum ctr_e ctr)
 
 	for (i = 0; i < ALL_COUNTER; i++) {
 		if (i == (int) ctr || ctr == ALL_COUNTER) {
-			if (ctr_state[i]) {
+			if (ctr_state[i] == ENABLED) {
 				rc = perf_disable_ctr(i);
 				if (rc != 0) {
 					send_answer(s, i, rc, 0);
@@ -129,7 +133,7 @@ static int do_disable(int s, enum ctr_e ctr)
 				}
 				ctr_state[i] = 0;
 			}
-			send_answer(s, i, DISABLED, 0);
+			send_answer(s, i, ctr_state[i], 0);
 		}
 	}
 
@@ -143,7 +147,7 @@ static int do_reset(int s, enum ctr_e ctr)
 
 	for (i = 0; i < ALL_COUNTER; i++) {
 		if (i == (int) ctr || ctr == ALL_COUNTER) {
-			if (ctr_state[i]) {
+			if (ctr_state[i] == ENABLED) {
 				rc = perf_reset_ctr(i);
 				if (rc != 0) {
 					send_answer(s, i, rc, 0);
@@ -151,7 +155,7 @@ static int do_reset(int s, enum ctr_e ctr)
 				}
 				send_answer(s, i, ENABLED, 0);
 			} else {
-				send_answer(s, i, DISABLED, 0);
+				send_answer(s, i, ctr_state[i], 0);
 			}
 		}
 	}
@@ -166,7 +170,7 @@ static int do_print(int s, enum ctr_e ctr)
 
 	for (i = 0; i < ALL_COUNTER; i++) {
 		if (i == (int) ctr || ctr == ALL_COUNTER) {
-			if (ctr_state[i]) {
+			if (ctr_state[i] == ENABLED) {
 				rc = perf_read_ctr(i, &value);
 				if (rc != 0) {
 					send_answer(s, i, rc, 0);
@@ -174,7 +178,7 @@ static int do_print(int s, enum ctr_e ctr)
 				}
 				send_answer(s, i, ENABLED, value);
 			} else {
-				send_answer(s, i, DISABLED, 0);
+				send_answer(s, i, ctr_state[i], 0);
 			}
 		}
 	}
@@ -412,6 +416,9 @@ int main(int argc, char *argv[])
 	}
 	atexit(perf_close);
 
+	if (!perf_ecc_supported())
+		ctr_state[ECC_FUNCTIONS] = UNSUPPORTED;
+
 	sfd = open_socket(SERVER);
 	if (sfd < 0) {
 		eprint("Couldn't initialize server socket\n");

cpacfstats/perf_crypto.c

@@ -3,36 +3,39 @@
  *
  * low level perf functions
  *
- * Copyright IBM Corp. 2015, 2017
+ * Copyright IBM Corp. 2015, 2020
  *
  * s390-tools is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
+#include <asm/unistd.h>
 #include <errno.h>
 #include <getopt.h>
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
-#include <perfmon/perf_event.h>
+#include <limits.h>
-#include <perfmon/pfmlib.h>
+#include <linux/perf_event.h>
-#include <perfmon/pfmlib_perf_event.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/ioctl.h>
 #include <unistd.h>
 
 #include "cpacfstats.h"
 
 /* correlation between counter and perf counter string */
 static const struct {
-	char pfm_name[80];
+	char pmu[20];
+	char pfm_name[60];
 	enum ctr_e ctr;
 } pmf_counter_name[ALL_COUNTER] = {
-	{"cpum_cf::DEA_FUNCTIONS", DES_FUNCTIONS},
+	{"cpum_cf", "DEA_FUNCTIONS", DES_FUNCTIONS},
-	{"cpum_cf::AES_FUNCTIONS", AES_FUNCTIONS},
+	{"cpum_cf", "AES_FUNCTIONS", AES_FUNCTIONS},
-	{"cpum_cf::SHA_FUNCTIONS", SHA_FUNCTIONS},
+	{"cpum_cf", "SHA_FUNCTIONS", SHA_FUNCTIONS},
-	{"cpum_cf::PRNG_FUNCTIONS", PRNG_FUNCTIONS}
+	{"cpum_cf", "PRNG_FUNCTIONS", PRNG_FUNCTIONS},
+	{"cpum_cf", "ECC_FUNCTION_COUNT", ECC_FUNCTIONS}
 };
 
 /*
@@ -53,27 +56,106 @@ static const struct {
  */
 static int *ctr_fds[ALL_COUNTER];
 
+static int ecc_supported;
+
+static long perf_event_open(struct perf_event_attr *hw_event, pid_t pid,
+			    int cpu, int group_fd, unsigned long flags)
+{
+	int ret;
+
+	ret = syscall(__NR_perf_event_open, hw_event, pid, cpu,
+		group_fd, flags);
+	return ret;
+}
+
+static int perf_supported(void)
+{
+	return !access("/proc/sys/kernel/perf_event_paranoid", R_OK);
+}
+
+static int perf_counter_supported(const char *pmu, const char *counter)
+{
+	char buf[PATH_MAX];
+
+	if (snprintf(buf, PATH_MAX, "/sys/bus/event_source/devices/%s/events/%s",
+		     pmu, counter) >= PATH_MAX) {
+		eprint("overflow in path name");
+		return 0;
+	}
+	return !access(buf, R_OK);
+}
+
+static int perf_event_encode(struct perf_event_attr *attr,
+			     const char *pmu, const char *event)
+{
+	FILE *f;
+	int eventid;
+	int pmutype;
+	char buf[PATH_MAX];
+
+	if (snprintf(buf, PATH_MAX, "/sys/bus/event_source/devices/%s/events/%s",
+		     pmu, event) >= PATH_MAX) {
+		eprint("overflow in path name");
+		return -1;
+	}
+	f = fopen(buf, "r");
+	if (!f) {
+		eprint("Event %s for pmu %s not found (%d:%s)\n", event, pmu,
+		       errno, strerror(errno));
+		return -1;
+	}
+	if (fscanf(f, "event=0x%x\n", &eventid) != 1) {
+		fclose(f);
+		eprint("Event file %s has invalid format\n", buf);
+		return -1;
+	}
+	fclose(f);
+	if (snprintf(buf, PATH_MAX, "/sys/bus/event_source/devices/%s/type",
+		     pmu) >= PATH_MAX) {
+		eprint("overflow in path name");
+		return -1;
+	}
+	f = fopen(buf, "r");
+	if (!f) {
+		eprint("Event %s for pmu %s not found (%d:%s)\n", event, pmu,
+		       errno, strerror(errno));
+		return -1;
+	}
+	if (fscanf(f, "%d\n", &pmutype) != 1) {
+		fclose(f);
+		eprint("Type file %s has invalid format\n", buf);
+		return -1;
+	}
+	attr->type = pmutype;
+	attr->config = eventid;
+	return 0;
+}
 
 int perf_init(void)
 {
-	int i, cpus, ctr, cpu, ec, *fds;
+	int i, cpus, ctr, cpu, *fds;
 
 	memset(ctr_fds, 0, sizeof(ctr_fds));
 
 	/*  initialize performance monitoring library */
-	ec = pfm_initialize();
+	if (!perf_supported()) {
-	if (ec != PFM_SUCCESS) {
+		eprint("Performance counter not supported");
-		eprint("Pfm_initialize() returned with failure (%d:%s)\n",
-		       ec, pfm_strerror(ec));
 		return -1;
 	}
 
+	/* Check if ECC is supported on current hardware */
+	ecc_supported = perf_counter_supported("cpum_cf", "ECC_FUNCTION_COUNT");
+
 	/* get number of logical processors */
 	cpus = sysconf(_SC_NPROCESSORS_ONLN);
 
 	/* for each counter */
 	for (ctr = 0; ctr < ALL_COUNTER; ctr++) {
 
+		/* Skip ECC counters completely if unsupported */
+		if (ctr == ECC_FUNCTIONS && !ecc_supported)
+			continue;
+
 		/*
 		 * allocate an array of ints to store for each CPU
 		 * one filedescriptor + a terminating 0
@@ -88,37 +170,28 @@ int perf_init(void)
 
 		ctr_fds[ctr] = fds;
 
+		/* search for the counter's corresponding pfm name */
+		for (i = ALL_COUNTER-1; i >= 0; i--)
+			if ((int) pmf_counter_name[i].ctr == ctr)
+				break;
+		if (i < 0) {
+			eprint("Pfm ctr name not found for counter %d, please adjust pmf_counter_name[] in %s\n",
+			       ctr, __FILE__);
+			return -1;
+		}
+
 		for (cpu = 0; cpu < cpus; cpu++) {
-			pfm_perf_encode_arg_t pfm_arg;
 			struct perf_event_attr pfm_event;
 			int fd;
 
-			memset(&pfm_arg, 0, sizeof(pfm_arg));
 			memset(&pfm_event, 0, sizeof(pfm_event));
-			pfm_arg.attr = &pfm_event;
-			pfm_arg.size = sizeof(pfm_arg);
 			pfm_event.size = sizeof(pfm_event);
-
+			if (perf_event_encode(&pfm_event,
-			/* search for the counter's corresponding pfm name */
+					      pmf_counter_name[i].pmu,
-			for (i = ALL_COUNTER-1; i >= 0; i--)
+					      pmf_counter_name[i].pfm_name)) {
-				if ((int) pmf_counter_name[i].ctr == ctr)
+				eprint("Failed to initialize counter %s for pmu %s\n",
-					break;
-			if (i < 0) {
-				eprint("Pfm ctr name not found for counter %d, please adjust pmf_counter_name[] in %s\n",
-				       ctr, __FILE__);
-				return -1;
-			}
-
-			/* encode the counters perf event into pfm_arg.attr */
-			ec = pfm_get_os_event_encoding(
-				pmf_counter_name[i].pfm_name,
-				PFM_PLM0,
-				PFM_OS_PERF_EVENT,
-				&pfm_arg);
-			if (ec != PFM_SUCCESS) {
-				eprint("Pfm_initialize() for %s failed (%d:%s)\n",
 				       pmf_counter_name[i].pfm_name,
-				       ec, pfm_strerror(ec));
+				       pmf_counter_name[i].pmu);
 				return -1;
 			}
 
@@ -257,3 +330,8 @@ int perf_read_ctr(enum ctr_e ctr, uint64_t *value)
 
 	return rc;
 }
+
+int  perf_ecc_supported(void)
+{
+	return ecc_supported;
+}

cpumf/Makefile

@@ -1,67 +1,28 @@
-#!/usr/bin/make -f
-
 include ../common.mak
 
-
+BIN_FILES = lscpumf chcpumf
-CPUMF_DATADIR = $(TOOLS_DATADIR)/cpumf
-DATA_FILES = cpum-cf-hw-counter.map \
-	     cpum-cf-cfvn-1.ctr cpum-cf-cfvn-3.ctr \
-	     cpum-cf-csvn-12345.ctr cpum-cf-csvn-6.ctr \
-             cpum-cf-extended-z10.ctr cpum-cf-extended-z196.ctr \
-	     cpum-cf-extended-zEC12.ctr cpum-sf-modes.ctr \
-	     cpum-cf-extended-z13.ctr cpum-cf-extended-z14.ctr \
-	     cpum-cf-extended-z15.ctr
-LIB_FILES = bin/cpumf_helper
-USRBIN_SCRIPTS = bin/lscpumf
-USRSBIN_SCRIPTS = bin/chcpumf
 MAN_FILES = lscpumf.1 chcpumf.8
 
-all:
+all: $(BIN_FILES)
 
-scripts: $(USRBIN_SCRIPTS) $(USRSBIN_SCRIPTS) $(LIB_FILES)
+libs =	$(rootdir)/libutil/libutil.a
-	chmod +x $(USRBIN_SCRIPTS) $(USRSBIN_SCRIPTS) $(LIB_FILES)
 
-check:
+lscpumf: lscpumf.o $(libs)
+chcpumf: chcpumf.o $(libs)
 
-install: scripts install-man
+install: all install-man
-	for prg in $(USRBIN_SCRIPTS); do \
+	$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man8
-	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $$prg $(DESTDIR)$(USRBINDIR) ; \
+	for binf in $(BIN_FILES); do \
-	done
+	 $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $$binf $(DESTDIR)$(BINDIR); \
-	for prg in $(USRSBIN_SCRIPTS); do \
-	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $$prg $(DESTDIR)$(USRSBINDIR) ; \
-	done
-	test -d $(DESTDIR)$(CPUMF_DATADIR) || mkdir -p $(DESTDIR)$(CPUMF_DATADIR)
-	for lib in $(LIB_FILES); do \
-	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $$lib $(DESTDIR)$(TOOLS_LIBDIR) ; \
-	done
-	for data in $(DATA_FILES); do \
-	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 data/$$data $(DESTDIR)$(CPUMF_DATADIR) ; \
 	done
 
+clean:
+	rm -f *.o *~ $(BIN_FILES) core
+
 install-man:
 	for man in $(MAN_FILES); do \
 	  msection=`echo $$man |sed 's/.*\.\([1-9]\)$$/man\1/'` ; \
 	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 -D man/$$man $(DESTDIR)$(MANDIR)/$$msection/$$man ; \
 	done
 
-man2pdf:
+.PHONY: all install clean
-	for man in $(MAN_FILES); do \
-	  man -t man/$$man |ps2pdf -sPAPERSIZE=a4 - man/$${man}.pdf ; \
-	done
-man2text:
-	for man in $(MAN_FILES); do \
-	  MANWIDTH=80 LANG=C man man/$$man |col -b |expand > man/$${man}.txt ; \
-	done
-
-clean:
-	rm -f $(LIB_FILES) $(USRBIN_SCRIPTS) $(USRSBIN_SCRIPTS)
-
-%: %.in
-	real_libdir=$(TOOLS_LIBDIR); \
-	real_cpumfdatadir=$(CPUMF_DATADIR); \
-	$(SED) -e "s#@lib_path@#$$real_libdir#g" \
-	       -e "s#@cpumfdata_path@#$$real_cpumfdatadir#g" \
-	       -e 's#@S390_TOOLS_RELEASE@#$(S390_TOOLS_RELEASE)#g' \
-	< $< > $@
-
-.PHONY: all scripts install install-man man2pdf man2text clean

cpumf/bin/chcpumf.in

@@ -1,182 +0,0 @@
-#!/usr/bin/perl -W
-#
-# chcpumf - Control CPU-measurement facilities
-#
-# Copyright IBM Corp. 2014, 2017
-#
-# s390-tools is free software; you can redistribute it and/or modify
-# it under the terms of the MIT license. See LICENSE for details.
-#
-use strict;
-use warnings;
-use File::Basename qw/fileparse/;
-use Data::Dumper;
-use Getopt::Long qw/:config no_ignore_case/;
-
-# Global constants
-my $CPUMF_HELPER = '@lib_path@/cpumf_helper';
-my $CPUM_SFB_SIZE = '/sys/module/kernel/parameters/cpum_sfb_size';
-
-# Prototypes
-sub main();
-sub show_help();
-sub show_version();
-sub do_set_sfb_size($);
-sub cpumf_set_sfb_size($);
-sub invoke_cpumf_helper($);
-
-sub main()
-{
-	my $config = {
-		# Internal data
-		cpumf	    => {},	# CPU-MF information hash
-	};
-
-	unless (GetOptions(
-		# General options for help, version, verbose,...
-		"h|help"	      => \&show_help,
-		"v|version"	      => \&show_version,
-		"V|verbose+"	      => \$config->{verbose},
-		# Change specific options
-		"m|min=i"	    => \$config->{min},
-		"x|max=i"	    => \$config->{max},
-	)) {
-		print STDERR "One or more options are not valid\n";
-		print STDERR "Try '" . fileparse($0) .
-			      " --help' for more information\n";
-		exit 1;
-	}
-
-	# Collect CPU-MF information
-	$config->{cpumf} = invoke_cpumf_helper("-i");
-	die "Failed to collect CPU-MF information: $!\n" unless $config->{cpumf};
-
-	# Process parameters
-	my $exitval = 5;
-	if (defined($config->{min}) || defined($config->{max})) {
-		$exitval = do_set_sfb_size($config);
-	} else {
-		print STDERR "You must specify a valid option\n";
-		exit 1;
-	}
-
-	exit($exitval);
-}
-
-sub show_help()
-{
-	my $prog = fileparse($0);
-
-	print <<"EoHelp";
-Usage:	chcpumf -h|-v
-	chcpumf -m <num_sdb>
-	chcpumf -x <num_sdb>
-
-Options:
-	-m <num_sdb>  Specifies the initial size of the sampling buffer.
-		      A sample-data-block (SDB) consumes about 4 kilobytes.
-	-x <num_sdb>  Specifies the maximum size of the sampling buffer.
-		      A sample-data-block (SDB) consumes about 4 kilobytes.
-	-h	      Displays help information, then exits.
-	-v	      Displays version information, then exits.
-
-For more help information, issue 'man $prog'.
-EoHelp
-	exit 0;
-}
-
-sub show_version()
-{
-	print <<'EoVersion';
-CPU-measurement facility utilities, version @S390_TOOLS_RELEASE@
-Copyright IBM Corp. 2014, 2017
-
-EoVersion
-	exit 0;
-}
-
-sub cpumf_set_sfb_size($)
-{
-	my @size = @{shift()};
-	my $val = join ',', @size[0,1];
-	my ($SFBSIZE, $rc);
-
-	return undef unless open($SFBSIZE, '>', $CPUM_SFB_SIZE);
-	# Check the return code of print and close to detect error conditions
-	# reported by the device driver.  Because perl might buffer data, print
-	# might be successful, but close might then report the error condition.
-	# So check the return code of both functions and always close the file
-	# handle.
-	$rc = print { $SFBSIZE } "$val\n";
-	unless ($rc) {
-		close($SFBSIZE);
-		return $rc;
-	}
-	return close($SFBSIZE);
-}
-
-sub do_set_sfb_size($)
-{
-	my $c = shift();
-	my $size;
-
-	# Check if sampling facility is available
-	unless (exists $c->{cpumf}->{sf}) {
-		print STDERR "No CPU-measurement sampling facility detected\n";
-		return 2;
-	}
-	# Check if perf support is available
-	unless (exists $c->{cpumf}->{sf}->{perf}) {
-		print STDERR "No perf support for the CPU-measurement" .
-			     " sampling facility availalble\n";
-		return 2;
-	}
-
-	# Optionally, change the sampling buffer sizes
-	if (defined($c->{min}) || defined($c->{max})) {
-		$size = invoke_cpumf_helper("--sfb-size");
-		# Use current size value for zero min/max specifications
-		$size->[0] = $c->{min} if defined($c->{min});
-		$size->[1] = $c->{max} if defined($c->{max});
-		# Validate new settings
-		if ($size->[0] < 1 || $size->[1] < 1) {
-			die "The specified number(s) are not valid\n";
-		}
-		if ($size->[0] >= $size->[1]) {
-			die "The specified maximum must be greater " .
-			    "than the minimum\n";
-		}
-		# Set new sampling buffer sizes
-		unless (cpumf_set_sfb_size($size)) {
-			die "Failed to change sampling buffer size: $!\n";
-		}
-	}
-
-	# Finally, show sampling buffer sizes
-	if ($c->{verbose}) {
-		$size = invoke_cpumf_helper("--sfb-size");
-		print "Sampling buffer sizes:\n";
-		printf "    Minimum: %6u sample-data-blocks\n", $size->[0];
-		printf "    Maximum: %6u sample-data-blocks\n", $size->[1];
-	}
-
-	return 0;
-}
-
-sub invoke_cpumf_helper($)
-{
-	my $parms = shift();
-	my $result;
-
-	# Call helper module
-	my $output = qx"$CPUMF_HELPER $parms";
-	die "Failed to run helper module for '$parms'\n" if $? >> 8;
-	$result = eval "$output";
-	die "Failed to parse helper module data\n" if $@;
-
-	return $result;
-}
-
-&main();
-__DATA__
-__END__

cpumf/bin/cpumf_helper.in

@@ -1,489 +0,0 @@
-#!/usr/bin/perl -W
-#
-# cpumf_helper - Helper module for managing CPU-measurement facilities (CPU-MF)
-#
-# Copyright IBM Corp. 2014, 2017
-#
-# s390-tools is free software; you can redistribute it and/or modify
-# it under the terms of the MIT license. See LICENSE for details.
-#
-use strict;
-use warnings;
-use Carp qw/croak/;
-use Data::Dumper;
-use Getopt::Long qw/:config no_ignore_case/;
-
-# Global constants
-my $SERVICE_LEVELS = '/proc/service_levels';
-my $CPUMF_DATA_DIR = '@cpumfdata_path@';
-my $CPUM_SFB_SIZE = '/sys/module/kernel/parameters/cpum_sfb_size';
-my $CPUM_SF_DBF='/sys/kernel/debug/s390dbf/cpum_sf';
-
-# Counter set bits (according to QUERY COUNTER INFORMATION)
-my $BASIC_SET = 0x0002;
-my $PROBLEM_STATE_SET = 0x0004;
-my $CRYPTO_SET = 0x0008;
-my $EXTENTED_SET = 0x0001;
-my $MT_DIAG_SET = 0x0020;
-my $COPROC_GRP_SET = 0x8000;
-
-
-# Public prototypes
-sub cpumf_collect_data();
-sub cpumf_get_sfb_size();
-sub cpumf_set_sfb_size($);
-sub cpumf_parse_ctrdef($;$);
-sub cpumf_load_ctrdef($;$);
-sub cpumf_get_counter_set($);
-sub cpumf_counter_set_names();
-sub cpumf_counter_set_ids();
-sub cpumf_hardware_counter_map();
-
-# Internal prototypes
-sub cpumf_parse_cf($$);
-sub cpumf_parse_sf($$);
-
-
-sub cpumf_get_sfb_size()
-{
-	my $val = "0,0";
-	my $SFBSIZE;
-
-	if (open($SFBSIZE, '<', $CPUM_SFB_SIZE)) {
-		$val = <$SFBSIZE>;
-		chomp($val);
-		close($SFBSIZE);
-	}
-
-	return [split /,/, $val];
-}
-
-sub cpumf_set_sfb_size($)
-{
-	my @size = @{shift()};
-	my $val = join ',', @size[0,1];
-	my ($SFBSIZE, $rc);
-
-	return undef unless open($SFBSIZE, '>', $CPUM_SFB_SIZE);
-	# Check the return code of print and close to detect error conditions
-	# reported by the device driver.  Because perl might buffer data, print
-	# might be successful, but close might then report the error condition.
-	# So check the return code of both functions and always close the file
-	# handle.
-	$rc = print { $SFBSIZE } "$val\n";
-	unless ($rc) {
-		close($SFBSIZE);
-		return $rc;
-	}
-	return close($SFBSIZE);
-}
-
-
-sub cpumf_parse_cf($$)
-{
-	my ($ent, $data) = @_;
-
-	if ($ent =~ /version=([0-9.]+) authorization=([[:xdigit:]]+)/) {
-		$data->{cf} = { version => $1, auth => hex($2) };
-	}
-}
-
-sub cpumf_parse_sf($$)
-{
-	my ($ent, $data) = @_;
-
-	# Parse common sampling facility entry
-	if ($ent =~ /min_rate=(\d+) max_rate=(\d+) cpu_speed=(\d+)/) {
-		$data->{sf} = {
-			min_sampl_interval => $1,
-			max_sampl_interval => $2,
-			cpu_speed	   => $3,
-			# This contains a list of authorized sampling modes, for
-			# example, basic
-			modes		    => {},
-		};
-	}
-
-	# Parse sampling facility mode entries
-	if ($ent =~ /mode=(\w+) sample_size=(\d+)/) {
-		$data->{sf}->{modes}->{$1}->{sample_size} = $2;
-	}
-}
-
-sub cpumf_collect_data()
-{
-	my $SL;
-
-	# Collect CPU-MF information from /proc/service_levels
-	return undef unless open($SL, '<', $SERVICE_LEVELS);
-	my @sl = <$SL>;
-	chomp(@sl);
-	close($SL);
-
-	# Process CPU-MF information and build data hash
-	my $data = {};
-	foreach my $ent (@sl) {
-		$ent =~ s/^CPU-MF: // or next;
-		cpumf_parse_cf($ent, $data) if $ent =~ s/Counter facility: //;
-		cpumf_parse_sf($ent, $data) if $ent =~ s/Sampling facility: //;
-	}
-
-	# Collect perf support for available facilities
-	if (-e '/sys/bus/event_source/devices/cpum_cf') {
-		$data->{cf}->{perf} = "cpum_cf" if exists $data->{cf};
-	}
-	if (-e '/sys/bus/event_source/devices/cpum_sf') {
-		$data->{sf}->{perf} = "cpum_sf" if exists $data->{sf};
-	}
-
-	return $data;
-}
-
-# Parse the specified counter definition file and returns a hash containing
-# the parsed counter definition.  The optional argument specifies a hash
-# reference to which the new definitions are added.  This reference is returned.
-sub cpumf_parse_ctrdef($;$)
-{
-	my $ctrdef = shift();
-	my $h = @_ ? shift() : {};
-	my $CTRDEF;
-
-	return undef unless open($CTRDEF, '<', "$CPUMF_DATA_DIR/$ctrdef");
-	my ($ctr, $name);
-	while (my $line = <$CTRDEF>) {
-		next if $line =~ /^#/;
-		chomp($line);
-
-		# Parse start of counter definition entry
-		if ($line =~ m/^Counter:\s*(0x[[:xdigit:]]+|\d+)
-			        \s+Name:\s*([[:alnum:]_]+)$/x) {
-			($ctr, $name) = ($1, $2);
-			$ctr = hex($ctr) if $ctr =~ /^0x/;
-			unless (length($ctr)) {
-				print STDERR "Found invalid entry in counter " .
-				      "definition: line $.\n";
-			}
-			$h->{$ctr} = { name => $name || "" };
-		}
-
-		# At this point, a counter must be defined
-		next unless defined($ctr);
-
-		# Parse short description (optional)
-		if ($line =~ m/^Short-Description:\s*(\S.*)?$/) {
-			$h->{$ctr}->{shortdesc} = $1 || "";
-
-		# Parse start of counter description
-		} elsif ($line =~ m/^Description:\s*(\S.*)?$/) {
-			$h->{$ctr}->{desc} = $1 || "";
-
-		# Parse end of counter description
-		} elsif ($line =~ m/^\.$/) {
-			# Complete the counter definition
-			$h->{$ctr}->{set} = cpumf_get_counter_set($ctr);
-			# Trim whitespaces
-			$h->{$ctr}->{shortdesc} =~ s/^\s+|\s+$//g if $h->{$ctr}->{shortdesc};
-			$h->{$ctr}->{desc} =~ s/^\s+|\s+$//g if $h->{$ctr}->{desc};
-			# Finally, reset counter for next entry
-			$ctr = undef;
-
-		# Line is part of counter description (if $ctr_num is set)
-		} else {
-			$h->{$ctr}->{desc} .= " $line";
-		}
-	}
-	close($CTRDEF);
-
-	return $h;
-}
-
-# IBM System z hardware with CPU-M counter facility support
-my $system_z_hwtype_map = {
-	# Machine type	   Description
-	''		=> 'Unknown hardware model',
-	2097		=> 'IBM System z10 EC',
-	2098		=> 'IBM System z10 BC',
-	2817		=> 'IBM zEnterprise 196',
-	2818		=> 'IBM zEnterprise 114',
-	2827		=> 'IBM zEnterprise EC12',
-	2828		=> 'IBM zEnterprise BC12',
-	2964		=> 'IBM z13',
-	2965		=> 'IBM z13s',
-	3906		=> 'IBM z14',
-	3907		=> 'IBM z14 ZR1',
-	8561		=> 'IBM z15',
-};
-
-sub get_hardware_type()
-{
-	my $type = "";
-	my $SYSINFO;
-
-	return undef unless open($SYSINFO, '<', '/proc/sysinfo');
-	while (my $line = <$SYSINFO>) {
-		if ($line =~ m/^Type:\s*(\d+)\s*$/) {
-			$type = $1;
-			last;
-		}
-	}
-	close($SYSINFO);
-	return $type;
-}
-
-sub get_cpum_cf_version()
-{
-	my $SL;
-
-	my $v = {
-		cfvn  => 0,
-		csvn  => 0,
-	};
-
-	return $v unless open($SL, '<', $SERVICE_LEVELS);
-	while (my $line = <$SL>) {
-		# CPU-MF: Counter facility: version=3.5
-		if ($line =~ m/^CPU-MF: Counter facility: version=(\d+)\.(\d+)/) {
-			$v->{cfvn} = $1;  # Counter First Version Number
-			$v->{csvn} = $2;  # Counter Second Version Number
-			last;
-		}
-	}
-	close($SL);
-	return $v
-}
-
-sub cpumf_load_ctrdef($;$)
-{
-	my $hw_type = shift();
-	my $authorized = @_ ? shift() : 0xffff;   # Counter Set authorization
-
-	my $ctrmap = cpumf_hardware_counter_map();
-	return unless $ctrmap;
-
-	# Obtain CPU-MF counter facility versions
-	my $version = get_cpum_cf_version();
-
-	# List of "generic" counter sets
-	my @def = ();
-	push @def, "cfvn-" . $version->{cfvn};
-	if ($version->{csvn} >= 1 && $version->{csvn} <= 6) {
-		push @def, "csvn-12345";
-	}
-	if ($version->{csvn} == 6) {
-		push @def, "csvn-6";
-	}
-
-	my $h = {};
-	# Load counter set definition
-	foreach my $ent (@def) {
-		cpumf_parse_ctrdef($ctrmap->{$ent}, $h) or
-			croak "Failed to read counter definition for $ent: $!\n";
-	}
-	# Load hardware model specific counter set(s)
-	if ($hw_type && $ctrmap->{$hw_type}) {
-		# Hardware-model specific counter sets are:
-		#   - Extended Counter Set
-		#   - MT-diagnostic Counter Set
-		cpumf_parse_ctrdef($ctrmap->{$hw_type}, $h) or
-			croak "Failed to read hardware-model counter definition: $!\n";
-	}
-
-	# Remove counter sets that miss authorizations
-	my @no_auth_list = ();
-	foreach my $ctr (sort keys %$h) {
-		push @no_auth_list, $ctr unless $h->{$ctr}->{set} & $authorized;
-	}
-	delete $h->{$_} foreach (@no_auth_list);
-
-	return $h;
-}
-
-
-sub cpumf_get_counter_set($)
-{
-	my $ctr = shift();
-
-	return $BASIC_SET if $ctr < 32;
-	return $PROBLEM_STATE_SET if $ctr < 64;
-	return $CRYPTO_SET if $ctr < 128;
-	#
-	# The extended counter set ranges from
-	# 128 to
-	#   159	for csvn == 1
-	#   175 for csvn == 2
-	#   255 for csvn >  2
-	# Tolerate any future counters up to
-	# the MT-diagnostic counter set.
-	return $EXTENTED_SET if $ctr < 448;
-	#
-	# The MT-diagnostic counter set ranges from
-	# 448 to
-	#   495 for cvsn > 3
-	return $MT_DIAG_SET if $ctr <= 495;
-	return 0;
-}
-
-sub cpumf_counter_set_names()
-{
-	return {
-		# Identifier	       Name
-		$BASIC_SET	    => 'Basic Counter Set',
-		$PROBLEM_STATE_SET  => 'Problem-State Counter Set',
-		$CRYPTO_SET	    => 'Crypto-Activity Counter Set',
-		$EXTENTED_SET	    => 'Extended Counter Set',
-		$MT_DIAG_SET	    => 'MT-diagnostic Counter Set',
-		$COPROC_GRP_SET	    => 'Coprocessor Group Counter Set',
-	};
-}
-
-sub cpumf_counter_set_ids()
-{
-	return [$BASIC_SET, $PROBLEM_STATE_SET, $CRYPTO_SET, $EXTENTED_SET,
-		$MT_DIAG_SET, $COPROC_GRP_SET];
-}
-
-sub cpumf_hardware_counter_map()
-{
-	my $map = do "$CPUMF_DATA_DIR/cpum-cf-hw-counter.map";
-	croak "Failed to parse mapfile: $@" if $@;
-	croak "Failed to read mapfile: $!" unless defined $map;
-	return $map;
-}
-
-my $cpumf_helper_str = <<'END_MESSAGE';
-
-cpumf_helper - Helper module for managing CPU-Measurement Facilities (CPU-MF)
-
-Options:
--i, --info:
-	Displays detailed information about installed and available
-	CPU-measurement facilities and the related Linux support.
-
--c, --counter authorization_value
-	Displays counter information for the current System z hardware.
-	The authorization value provides information about the authorized
-	counter sets. The value must be specified in decimal format.
-
-	To display all supported counters, specify C<65535> (FFFF hex).
-
-	To display supported counters for a particular System z hardware,
-	use the --ctr-def option and specify the System z hardware type.
-
---hardware-type
-	Displays the System z hardware type.
-
---ctr-def ctr-definition
-	Displays detailed information about the specified counter definition.
-	Valid counter definitions start with C<cfvn-> or <csvn-> followed by
-	the counter first/second version number of the CPU-Measurement Counter
-	Facility.  To display counter information of model-specific counter
-	sets, specify the System z hardware type for I<ctr-definition>.
-
---ctr-set-names
-	Displays the mapping of counter set IDs to counter set names.
-	The counter set IDs are numbers that are used in counter definitions.
-
---ctr-set-ids
-	Displays the counter set IDs.  The counter set IDs are numbers that
-	match the authorization bits (see QUERY COUNTER INFORMATION).
-	The output format is a list. To get the ID for a particular counter
-	set, use an index number as follows:
-
-	0: Basic Counter Set
-	1: Problem-State Counter Set
-	2: Crypto-Activity Counter Set
-	3: Extended Counter Set
-	4: MT-diagnostic Counter Set
-	5: Coprocessor Group Counter Set
-
---ctr-sf
-	Displays the counter definitions for the sampling facility support.
-	These counter definitions are specific to Linux perf infrastructure.
-
---sfb-size
-	Displays the size of the sampling facility buffer (SFB). The minimum
-	and maximum numbers are measured in units of sample-data-blocks. A
-	sample-data-block uses about 4 kilobytes.
-
-END_MESSAGE
-
-sub cpumf_helper_main()
-{
-	# Configuration settings and options
-	my $conf = {
-	};
-
-	# Parse command line option
-	GetOptions(
-		"i|info"	=> \$conf->{opt_info},
-		"c|counter=i"	=> \$conf->{opt_ctr},
-		"ctr-def=s"	=> \$conf->{opt_ctrdef},
-		"hardware-type"	=> \$conf->{opt_hwtype},
-		"ctr-set-names"	=> \$conf->{opt_ctrset_names},
-		"ctr-set-ids"	=> \$conf->{opt_ctrset_ids},
-		"sfb-size"	=> \$conf->{opt_sfb_size},
-		"ctr-sf"	=> \$conf->{opt_sf_ctr},
-	) or die("One or more options are not valid\n" . $cpumf_helper_str);
-
-
-	# Setting up Data::Dumper to create parseable Perl output
-	local $Data::Dumper::Purity = 1;
-	local $Data::Dumper::Sortkeys = 1;
-	local $Data::Dumper::Terse = 1;
-
-	###print STDERR "CONF: " . Dumper($conf) . "\n";
-
-	# Process command line options
-	my $exitval = 0;
-	my $result;
-	if (defined($conf->{opt_info})) {
-		$result = cpumf_collect_data();
-
-	# Display System z hardware type
-	} elsif (defined($conf->{opt_hwtype})) {
-		my $type = get_hardware_type();
-		$result = [$type, $system_z_hwtype_map->{$type} || ""];
-
-	# Display counters for current System z hardware
-	} elsif (defined($conf->{opt_ctr})) {
-		my $type = get_hardware_type();
-		$type = 0 unless $type;
-		$result = cpumf_load_ctrdef($type, $conf->{opt_ctr});
-
-	# Display counters for a particular System z hardware type
-	} elsif (defined($conf->{opt_ctrdef})) {
-		my $m = cpumf_hardware_counter_map();
-		if (exists $m->{$conf->{opt_ctrdef}}) {
-			$result = cpumf_parse_ctrdef($m->{$conf->{opt_ctrdef}});
-		} else {
-			printf STDERR "Invalid counter definition\n";
-			$exitval = 2;
-		}
-	# Display the size of the sampling facility buffer (sfb)
-	} elsif (defined($conf->{opt_sfb_size})) {
-		$result = cpumf_get_sfb_size();
-
-	# Display counter definitions for the sampling facility support (perf)
-	} elsif (defined($conf->{opt_sf_ctr})) {
-		$result = cpumf_parse_ctrdef('cpum-sf-modes.ctr');
-
-	# Display mapping of counter set IDs to counter set names
-	} elsif (defined($conf->{opt_ctrset_names})) {
-		$result = cpumf_counter_set_names();
-
-	# Display counter set IDs
-	} elsif (defined($conf->{opt_ctrset_ids})) {
-		$result = cpumf_counter_set_ids();
-
-	} else {
-		die("No option specified\n" . $cpumf_helper_str);
-	}
-
-	# Display result
-	print Dumper($result) if $result;
-	exit $exitval;
-}
-
-&cpumf_helper_main();
-__DATA__
-__END__

cpumf/bin/lscpumf.in

@@ -1,387 +0,0 @@
-#!/usr/bin/perl -W
-#
-# lscpumf - Display information about CPU-measurement facilities
-#
-# Copyright IBM Corp. 2014, 2017
-#
-# s390-tools is free software; you can redistribute it and/or modify
-# it under the terms of the MIT license. See LICENSE for details.
-#
-use strict;
-use warnings;
-use Data::Dumper;
-use File::Basename qw/fileparse/;
-use Getopt::Long qw/:config no_ignore_case/;
-
-# Global constants
-my $CPUMF_HELPER = '@lib_path@/cpumf_helper';
-
-# Prototypes
-sub main();
-sub show_help();
-sub show_version();
-sub do_show_info($);
-sub do_show_cf($);
-sub do_show_sf($);
-sub do_show_ctr($;$);
-sub do_show_sf_events($);
-sub invoke_cpumf_helper($);
-
-
-sub main()
-{
-	my $config = {
-		# Internal data
-		cpumf	    => {},	# CPU-MF information hash
-	};
-
-	unless (GetOptions(
-		# General options for help, version,...
-		"h|help"	      => \&show_help,
-		"v|version"	      => \&show_version,
-		# Display options
-		"i|info"	      => \$config->{opt_info},
-		"c|list-counters"     => \$config->{opt_ctr},
-		"C|list-all-counters" => \$config->{opt_ctr_all},
-		"s|list-sampling-events" => \$config->{opt_ctr_sf},
-	)) {
-		print STDERR "One or more options are not valid\n";
-		print STDERR "Try '" . fileparse($0) .
-			      " --help' for more information\n";
-		exit 1;
-	}
-
-	# Collect CPU-MF information
-	$config->{cpumf} = invoke_cpumf_helper("-i");
-	die "Failed to collect CPU-MF information: $!\n" unless $config->{cpumf};
-
-	# Process parameters
-	my $exitval = 5;
-	if (defined($config->{opt_info})) {
-		do_show_cf($config);
-		do_show_sf($config);
-		$exitval = 0;
-
-	} elsif (defined($config->{opt_ctr})) {
-		$exitval = do_show_ctr($config);
-	} elsif (defined($config->{opt_ctr_all})) {
-		$exitval = do_show_ctr($config, "all")
-	} elsif (defined($config->{opt_ctr_sf})) {
-		$exitval = do_show_sf_events($config);
-	} else {
-		$exitval = do_show_info($config);
-	}
-
-	exit($exitval);
-}
-
-sub show_help()
-{
-	my $prog = fileparse($0);
-
-	print <<"EoHelp";
-Usage:	lscpumf -h|-v
-	lscpumf [-i]
-	lscpumf -c|-C
-
-Options:
-	-i    Displays detailed information.
-	-c    Lists counters for which the LPAR is authorized.
-	-C    Lists counters regardless of LPAR authorization.
-	-s    Lists perf raw events that activate the sampling facility.
-	-h    Displays help information, then exits.
-	-v    Displays version information, then exits.
-
-For more help information, issue 'man $prog'.
-EoHelp
-	exit 0;
-}
-
-sub show_version()
-{
-	print <<'EoVersion';
-CPU-measurement facility utilities, version @S390_TOOLS_RELEASE@
-Copyright IBM Corp. 2014, 2017
-
-EoVersion
-	exit 0;
-}
-
-sub do_show_info($)
-{
-	my $c = shift();
-	my $cpumf = $c->{cpumf};
-	my @f = ();
-
-	push @f, "CPU-measurement Counter Facility" if exists $cpumf->{cf};
-	push @f, "CPU-measurement Sampling Facility" if exists $cpumf->{sf};
-
-	if (@f) {
-		print((join "\n", @f) . "\n");
-	} else {
-		print STDERR "No CPU-measurement facilities detected\n";
-		return 2;
-	}
-	return 0;
-}
-
-sub do_show_cf($)
-{
-	my $c = shift();
-
-	# Check if counter facility is available
-	unless (exists $c->{cpumf}->{cf}) {
-		print STDERR "No CPU-measurement counter facility detected\n";
-		return 2;
-	}
-
-	# Retrieve counter facility information
-	my $cf = $c->{cpumf}->{cf};
-
-	# Create list of authorized counter sets
-	my @sets = ();
-	push @sets, "None" unless $cf->{auth};
-	push @sets, "Crypto-Activity counter set" if $cf->{auth} & 0x8;
-	push @sets, "Problem-State counter set" if $cf->{auth} & 0x4;
-	push @sets, "Basic counter set" if $cf->{auth} & 0x2;
-	push @sets, "Extented counter set" if $cf->{auth} & 0x1;
-	push @sets, "MT-diagnostic counter set" if $cf->{auth} & 0x20;
-
-	print "CPU-measurement counter facility\n";
-	print "-" x 74 . "\n";
-	# TODO Display additional information about available conters depending
-	# on the version information
-	print "Version: " . $cf->{version} . "\n";
-	print "\n";
-	print "Authorized counter sets:\n";
-	print "    $_\n" foreach (sort @sets);
-	printf "\nLinux perf event support: %s\n\n",
-	       exists $cf->{perf} ? "Yes (PMU: $cf->{perf})" : "No";
-
-	return 0;
-}
-
-sub div_ceil($$)
-{
-	my ($a, $b) = @_;
-	return int(($a + $b - 1) / $b);
-}
-
-sub humanize_bytes($;$)
-{
-	my $bytes = shift();
-	my @units = split //, " KMGTPEZY";
-
-	my $u = @_ ? shift() : 0;
-	while ($bytes >= 1024 && $u <= $#units) {
-		$bytes /= 1024;
-		$u++;
-	}
-	return sprintf "%.f%sB", $bytes, $units[$u];
-}
-
-sub get_sfb_details($)
-{
-	my $n_sdb = shift();
-
-	# Calculate sampling buffer structure
-	my $n_sdbt = div_ceil($n_sdb, 511);
-	my $n_pages = $n_sdb + $n_sdbt;
-	return [
-		$n_sdb,		    # number of sample-data-blocks
-		$n_sdbt,	    # number of sample-data-block-tables
-		$n_pages,	    # number of 4K pages
-		$n_pages * 4096,    # size in bytes
-	];
-}
-
-sub do_show_sf($)
-{
-	my $c = shift();
-
-	# Check if sampling facility is available
-	unless (exists $c->{cpumf}->{sf}) {
-		print STDERR "No CPU-measurement sampling facility detected\n";
-		return 2;
-	}
-	my $sf = $c->{cpumf}->{sf};
-	my $size = invoke_cpumf_helper("--sfb-size");
-
-	# Sampling facility information
-	print "CPU-measurement sampling facility\n";
-	print "-" x 74 . "\n";
-	print  "Sampling Interval:\n";
-	printf "     Minimum: %10u cycles (approx. %8u Hz)\n",
-		$sf->{min_sampl_interval},
-		1000000 * $sf->{cpu_speed} / $sf->{min_sampl_interval};
-	printf "     Maximum: %10u cycles (approx. %8u Hz)\n",
-		$sf->{max_sampl_interval},
-		1000000 * $sf->{cpu_speed} / $sf->{max_sampl_interval};
-	print "\n";
-	print "Authorized sampling modes:\n";
-	foreach my $m (sort keys %{$sf->{modes}}) {
-		printf "     %-10s (sample size: %3u bytes)\n", $m,
-		       $sf->{modes}->{$m}->{sample_size};
-	}
-	print "\n";
-	printf "\nLinux perf event support: %s\n\n",
-	       exists $sf->{perf} ? "Yes (PMU: $sf->{perf})" : "No";
-
-	# Sampling buffer settings for cpum_sf
-	goto out unless exists $sf->{perf};
-
-	print "Current sampling buffer settings for $sf->{perf}:\n";
-	printf "    Basic-sampling mode\n";
-	my $s = get_sfb_details($size->[0]);
-	printf "	Minimum: %6u sample-data-blocks (%6s)\n",
-			$s->[0], humanize_bytes($s->[3]);
-	$s = get_sfb_details($size->[1]);
-	printf "	Maximum: %6u sample-data-blocks (%6s)\n",
-			$s->[0], humanize_bytes($s->[3]);
-	unless (exists $sf->{modes}->{diagnostic}) {
-		goto out;
-	}
-
-	# Sampling buffer setting specific to diagnostic-sampling mode
-	my $f_diag = div_ceil($sf->{modes}->{diagnostic}->{sample_size},
-			      $sf->{modes}->{basic}->{sample_size});
-	print  "\n";
-	printf "    Diagnostic-sampling mode (including basic-sampling)\n";
-	$s = get_sfb_details($size->[0] * $f_diag);
-	printf "	Minimum: %6u sample-data-blocks (%6s)\n",
-			$s->[0], humanize_bytes($s->[3]);
-	$s = get_sfb_details($size->[1] * $f_diag);
-	printf "	Maximum: %6u sample-data-blocks (%6s)\n",
-			$s->[0], humanize_bytes($s->[3]);
-	printf "        Size factor: %2u\n", $f_diag;
-out:
-	return 0;
-}
-
-sub print_counters($$)
-{
-	my ($ctrdef, $header) = @_;
-	my $set_name_map = invoke_cpumf_helper('--ctr-set-names');
-	my $out = [];
-
-	my ($ctr_perf, $ctr_num, $set, $name, $desc);
-	format PERF_CTR_FORM =
-r@<<<<	@<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-$ctr_perf,   $name
-
-		^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-		$desc
-		^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ~~
-		$desc
-		@<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-		$set
-
-.
-	print $header;
-	$~ = "PERF_CTR_FORM";
-	foreach my $ctr (sort { $a <=> $b } keys %$ctrdef) {
-		$ctr_perf = sprintf "%x", $ctr;
-		$ctr_num = $ctr < (1 << 16) ? $ctr : "";
-		$name = $ctrdef->{$ctr}->{name};
-		$desc = $ctrdef->{$ctr}->{shortdesc} ?
-				  $ctrdef->{$ctr}->{shortdesc}
-				: $ctrdef->{$ctr}->{desc};
-		$desc .= ".";
-		$set = $set_name_map->{$ctrdef->{$ctr}->{set}};
-		if ($set) {
-			$set = "Counter $ctr_num / $set.";
-		} else {
-			$set = "This event is not associated with a counter set.";
-		}
-		write;
-	}
-}
-
-sub do_show_ctr($;$)
-{
-	my $c = shift();
-
-	# Check if counter facility is available
-	unless (exists $c->{cpumf}->{cf}) {
-		print STDERR "No CPU-measurement counter facility detected\n";
-		return 2;
-	}
-
-	# Retrieve counter authorization ("all" or authorized counters only)
-	my $auth = @_ ? hex("0xFFFF") : $c->{cpumf}->{cf}->{auth};
-
-	# Retrieve counter information
-	my $ctrs = invoke_cpumf_helper("-c $auth");
-	unless ($ctrs) {
-		print STDERR "No counters are available or authorized\n";
-		return 3;
-	}
-
-	# Retrieve hardware type
-	my $hwtype = invoke_cpumf_helper("--hardware-type");
-	my $model = length $hwtype->[1] ? "for $hwtype->[1]" : "";
-	my $header = <<"EoHeader";
-Perf event counter list $model
-==============================================================================
-
-Raw
-event	Name	Description
-------------------------------------------------------------------------------
-EoHeader
-	print_counters($ctrs, $header);
-
-	return 0;
-}
-
-sub do_show_sf_events($)
-{
-	my $c = shift();
-
-	# Check if sampling facility is available
-	unless (exists $c->{cpumf}->{sf}) {
-		print STDERR "No CPU-measurement sampling facility detected\n";
-		return 2;
-	}
-	my $sf = $c->{cpumf}->{sf};
-	my $events = invoke_cpumf_helper("--ctr-sf");
-
-	# Remove events with missing authorization
-	delete $events->{0xB0000} unless exists $sf->{modes}->{basic};
-	delete $events->{0xBD000} unless exists $sf->{modes}->{diagnostic};
-
-	unless ($events) {
-		print STDERR "Sampling facility is not authorized\n";
-		return 3;
-	}
-
-	# Display sampling facility events (aka. counters)
-	my $header = <<"EoHeader";
-Perf events for activating the sampling facility
-==============================================================================
-
-Raw
-event	Name	Description
-------------------------------------------------------------------------------
-EoHeader
-	print_counters($events, $header);
-
-	return 0;
-}
-
-sub invoke_cpumf_helper($)
-{
-	my $parms = shift();
-	my $result;
-
-	# Call helper module
-	my $output = qx"$CPUMF_HELPER $parms";
-	die "Failed to run helper module for '$parms'\n" if $? >> 8;
-	$result = eval "$output";
-	die "Failed to parse helper module data\n" if $@;
-
-	return $result;
-}
-
-&main();
-__DATA__
-__END__

cpumf/chcpumf.c

@@ -0,0 +1,220 @@
+/*
+ * chcpumf -  Change CPU Measurement Facility Characteristics
+ *
+ * Copyright IBM Corp. 2020
+ *
+ * s390-tools is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+#include "lib/util_opt.h"
+#include "lib/util_prg.h"
+#include "lib/util_base.h"
+
+#include "defines.h"
+
+static int verbose;
+static unsigned long min_sdb, max_sdb;
+
+static struct util_opt opt_vec[] = {
+	UTIL_OPT_SECTION("OPTIONS"),
+	{
+		.option = { "min", required_argument, NULL, 'm' },
+		.argument = "num_sdb",
+		.desc = "Specifies the initial size of the sampling buffer.\n"
+			"A sample-data-block (SDB) consumes about 4 kilobytes.",
+	},
+	{
+		.option = { "max", required_argument, NULL, 'x' },
+		.argument = "num_sdb",
+		.desc = "Specifies the maximum size of the sampling buffer.\n"
+			"A sample-data-block (SDB) consumes about 4 kilobytes.",
+	},
+	{
+		.option = { "verbose", no_argument, NULL, 'V' },
+		.desc = "Verbose, display new sample-data-block values.",
+	},
+	UTIL_OPT_HELP,
+	UTIL_OPT_VERSION,
+	UTIL_OPT_END
+};
+
+static const struct util_prg prg = {
+	.desc = "Change CPU Measurement facility charactertics",
+	.copyright_vec = {
+		{
+			.owner = "IBM Corp.",
+			.pub_first = 2020,
+			.pub_last = 2020,
+		},
+		UTIL_PRG_COPYRIGHT_END
+	}
+};
+
+static long parse_buffersize(char *string)
+{
+	char *suffix;
+	long bytes;
+
+	bytes = strtol(string, &suffix, 10);
+	if (strlen(suffix) > 1)
+		return -1;
+	switch (*suffix) {
+	case 'k':
+	case 'K':
+		bytes *= 1024;
+		break;
+	case 'm':
+	case 'M':
+		bytes *= 1048576;
+		break;
+	case '\0':
+		break;
+	default:
+		return 0;
+	}
+	return bytes;
+}
+
+static int read_sfb(unsigned long *min, unsigned long *max)
+{
+	unsigned long cur_min_sdb, cur_max_sdb;
+	int rc = EXIT_SUCCESS;
+	FILE *fp;
+
+	if (geteuid()) {
+		fprintf(stderr, "Error: Must run as root\n");
+		return EXIT_FAILURE;
+	}
+	fp = fopen(PERF_SFB_SIZE, "r");
+	if (fp == NULL) {
+		linux_error(PERF_SFB_SIZE);
+		return EXIT_FAILURE;
+	}
+	if (fscanf(fp, "%ld,%ld", &cur_min_sdb, &cur_max_sdb) != 2) {
+		fprintf(stderr, "Error: Can not parse file " PERF_SFB_SIZE
+				"\n");
+		rc = EXIT_FAILURE;
+	} else {
+		if (*min == 0)
+			*min = cur_min_sdb;
+		if (*max == 0)
+			*max = cur_max_sdb;
+	}
+	fclose(fp);
+	return rc;
+}
+
+static int write_sfb(unsigned long min, unsigned long max)
+{
+	int rc = EXIT_SUCCESS;
+	char text[64];
+	size_t len;
+	FILE *fp;
+
+	fp = fopen(PERF_SFB_SIZE, "w");
+	if (fp == NULL) {
+		linux_error(PERF_SFB_SIZE);
+		return EXIT_FAILURE;
+	}
+	snprintf(text, sizeof text, "%ld,%ld", min, max);
+	len = strlen(text) + 1;
+	if (fwrite(text, 1, len, fp) != len) {
+		linux_error(PERF_SFB_SIZE);
+		rc = EXIT_FAILURE;
+	}
+	if (fclose(fp)) {
+		linux_error(PERF_SFB_SIZE);
+		rc = EXIT_FAILURE;
+	}
+	if (verbose && rc != EXIT_FAILURE)
+		fprintf(stderr, "Sampling buffer sizes:\n"
+				"    Minimum:%7ld sample-data-blocks\n"
+				"    Maximum:%7ld sample-data-blocks\n",
+				min, max);
+	return rc;
+}
+
+static int parse_args(int argc, char **argv)
+{
+	int opt, action = 0;
+	long new;
+
+	while ((opt = util_opt_getopt_long(argc, argv)) != -1) {
+		switch (opt) {
+		case 'h':
+			util_prg_print_help();
+			util_opt_print_help();
+			exit(EXIT_SUCCESS);
+		case 'v':
+			util_prg_print_version();
+			exit(EXIT_SUCCESS);
+		case 'x':
+			new = parse_buffersize(optarg);
+			if (new < 1) {
+				fprintf(stderr, "The specified number(s)"
+						" are not valid\n");
+				exit(EXIT_FAILURE);
+			}
+			max_sdb = new;
+			action = 1;
+			break;
+		case 'm':
+			new = parse_buffersize(optarg);
+			if (new < 1) {
+				fprintf(stderr, "The specified number(s)"
+						" are not valid\n");
+				exit(EXIT_FAILURE);
+			}
+			min_sdb = new;
+			action = 1;
+			break;
+		case 'V':
+			verbose = 1;
+			break;
+		case '?':
+			fprintf(stderr, "One or more options are not valid\n");
+			fprintf(stderr, "Try 'chcpumf --help' for more"
+					" information\n");
+			exit(EXIT_FAILURE);
+		}
+	}
+	if (!action) {
+		fprintf(stderr, "You must specify a valid option\n");
+		exit(EXIT_FAILURE);
+	}
+	return action;
+}
+
+int main(int argc, char **argv)
+{
+	int ret = EXIT_FAILURE;
+	struct stat sbuf;
+
+	util_prg_init(&prg);
+	util_opt_init(opt_vec, NULL);
+
+	parse_args(argc, argv);
+	if (stat(PERF_PATH PERF_SF, &sbuf) != 0) {
+		fprintf(stderr,
+			"No CPU-measurement sampling facility detected\n");
+		return ret;
+	}
+	if (read_sfb(&min_sdb, &max_sdb))
+		return ret;
+	if (min_sdb >= max_sdb) {
+		fprintf(stderr, "The specified maximum must be greater "
+				"than the minimum\n");
+		return ret;
+	}
+	return write_sfb(min_sdb, max_sdb);
+}

cpumf/data/cpum-cf-cfvn-1.ctr

@@ -1,60 +0,0 @@
-Counter:   0	Name:CPU_CYCLES
-Short-Description:CPU Cycles
-Description:
-Cycle Count
-.
-Counter:   1	Name:INSTRUCTIONS
-Short-Description:Instructions
-Description:
-Instruction Count
-.
-Counter:   2	Name:L1I_DIR_WRITES
-Short-Description:L1I Directory Writes
-Description:
-Level-1 I-Cache Directory Write Count
-.
-Counter:   3	Name:L1I_PENALTY_CYCLES
-Short-Description:L1I Penalty Cycles
-Description:
-Level-1 I-Cache Penalty Cycle Count
-.
-Counter:   4	Name:L1D_DIR_WRITES
-Short-Description:L1D Directory Writes
-Description:
-Level-1 D-Cache Directory Write Count
-.
-Counter:   5	Name:L1D_PENALTY_CYCLES
-Short-Description:L1D Penalty Cycles
-Description:
-Level-1 D-Cache Penalty Cycle Count
-.
-Counter:  32	Name:PROBLEM_STATE_CPU_CYCLES
-Short-Description:Problem-State CPU Cycles
-Description:
-Problem-State Cycle Count
-.
-Counter:  33	Name:PROBLEM_STATE_INSTRUCTIONS
-Short-Description:Problem-State Instructions
-Description:
-Problem-State Instruction Count
-.
-Counter:  34	Name:PROBLEM_STATE_L1I_DIR_WRITES
-Short-Description:Problem-State L1I Directory Writes
-Description:
-Problem-State Level-1 I-Cache Directory Write Count
-.
-Counter:  35	Name:PROBLEM_STATE_L1I_PENALTY_CYCLES
-Short-Description:Problem-State L1I Penalty Cycles
-Description:
-Problem-State Level-1 I-Cache Penalty Cycle Count
-.
-Counter:  36	Name:PROBLEM_STATE_L1D_DIR_WRITES
-Short-Description:Problem-State L1D Directory Writes
-Description:
-Problem-State Level-1 D-Cache Directory Write Count
-.
-Counter:  37	Name:PROBLEM_STATE_L1D_PENALTY_CYCLES
-Short-Description:Problem-State L1D Penalty Cycles
-Description:
-Problem-State Level-1 D-Cache Penalty Cycle Count
-.

cpumf/data/cpum-cf-cfvn-3.ctr

@@ -1,40 +0,0 @@
-Counter:   0	Name:CPU_CYCLES
-Short-Description:CPU Cycles
-Description:
-Cycle Count
-.
-Counter:   1	Name:INSTRUCTIONS
-Short-Description:Instructions
-Description:
-Instruction Count
-.
-Counter:   2	Name:L1I_DIR_WRITES
-Short-Description:L1I Directory Writes
-Description:
-Level-1 I-Cache Directory Write Count
-.
-Counter:   3	Name:L1I_PENALTY_CYCLES
-Short-Description:L1I Penalty Cycles
-Description:
-Level-1 I-Cache Penalty Cycle Count
-.
-Counter:   4	Name:L1D_DIR_WRITES
-Short-Description:L1D Directory Writes
-Description:
-Level-1 D-Cache Directory Write Count
-.
-Counter:   5	Name:L1D_PENALTY_CYCLES
-Short-Description:L1D Penalty Cycles
-Description:
-Level-1 D-Cache Penalty Cycle Count
-.
-Counter:  32	Name:PROBLEM_STATE_CPU_CYCLES
-Short-Description:Problem-State CPU Cycles
-Description:
-Problem-State Cycle Count
-.
-Counter:  33	Name:PROBLEM_STATE_INSTRUCTIONS
-Short-Description:Problem-State Instructions
-Description:
-Problem-State Instruction Count
-.

cpumf/data/cpum-cf-csvn-12345.ctr

@@ -1,100 +0,0 @@
-Counter:  64	Name:PRNG_FUNCTIONS
-Short-Description:PRNG Functions
-Description:
-Total number of the PRNG functions issued by the CPU
-.
-Counter:  65	Name:PRNG_CYCLES
-Short-Description:PRNG Cycles
-Description:
-Total number of CPU cycles when the DEA/AES coprocessor is busy
-performing PRNG functions issued by the CPU
-.
-Counter:  66	Name:PRNG_BLOCKED_FUNCTIONS
-Short-Description:PRNG Blocked Functions
-Description:
-Total number of the PRNG functions that are issued by the CPU and are
-blocked because the DEA/AES coprocessor is busy performing a function
-issued by another CPU
-.
-Counter:  67	Name:PRNG_BLOCKED_CYCLES
-Short-Description:PRNG Blocked Cycles
-Description:
-Total number of CPU cycles blocked for the PRNG functions issued by
-the CPU because the DEA/AES coprocessor is busy performing a function
-issued by another CPU
-.
-Counter:  68	Name:SHA_FUNCTIONS
-Short-Description:SHA Functions
-Description:
-Total number of SHA functions issued by the CPU
-.
-Counter:  69	Name:SHA_CYCLES
-Short-Description:SHA Cycles
-Description:
-Total number of CPU cycles when the SHA coprocessor is busy performing
-the SHA functions issued by the CPU
-.
-Counter:  70	Name:SHA_BLOCKED_FUNCTIONS
-Short-Description:SHA Blocked Functions
-Description:
-Total number of the SHA functions that are issued by the CPU and are
-blocked because the SHA coprocessor is busy performing a function issued
-by another CPU
-.
-Counter:  71	Name:SHA_BLOCKED_CYCLES
-Short-Description:SHA Bloced Cycles
-Description:
-Total number of CPU cycles blocked for the SHA functions issued by the
-CPU because the SHA coprocessor is busy performing a function issued
-by another CPU
-.
-Counter:  72	Name:DEA_FUNCTIONS
-Short-Description:DEA Functions
-Description:
-Total number of the DEA functions issued by the CPU
-.
-Counter:  73	Name:DEA_CYCLES
-Short-Description:DEA Cycles
-Description:
-Total number of CPU cycles when the DEA/AES coprocessor is busy
-performing the DEA functions issued by the CPU
-.
-Counter:  74	Name:DEA_BLOCKED_FUNCTIONS
-Short-Description:DEA Blocked Functions
-Description:
-Total number of the DEA functions that are issued by the CPU and are
-blocked because the DEA/AES coprocessor is busy performing a function
-issued by another CPU
-.
-Counter:  75	Name:DEA_BLOCKED_CYCLES
-Short-Description:DEA Blocked Cycles
-Description:
-Total number of CPU cycles blocked for the DEA functions issued by the
-CPU because the DEA/AES coprocessor is busy performing a function issued
-by another CPU
-.
-Counter:  76	Name:AES_FUNCTIONS
-Short-Description:AES Functions
-Description:
-Total number of AES functions issued by the CPU
-.
-Counter:  77	Name:AES_CYCLES
-Short-Description:AES Cycles
-Description:
-Total number of CPU cycles when the DEA/AES coprocessor is busy
-performing the AES functions issued by the CPU
-.
-Counter:  78	Name:AES_BLOCKED_FUNCTIONS
-Short-Description:AES Blocked Functions
-Description:
-Total number of AES functions that are issued by the CPU and are blocked
-because the DEA/AES coprocessor is busy performing a function issued
-by another CPU
-.
-Counter:  79	Name:AES_BLOCKED_CYCLES
-Short-Description:AES Blocked Cycles
-Description:
-Total number of CPU cycles blocked for the AES functions issued by the
-CPU because the DEA/AES coprocessor is busy performing a function issued
-by another CPU
-.

cpumf/data/cpum-cf-csvn-6.ctr

@@ -1,33 +0,0 @@
-Counter:  80	Name:ECC_FUNCTION_COUNT
-Short-Description:ECC Function Count
-Description:
-This counter counts the
-total number of the elliptic-curve cryptography (ECC)
-functions issued by the CPU.
-.
-Counter:  81	Name:ECC_CYCLES_COUNT
-Short-Description:ECC Cycles Count
-Description:
-This counter counts the total
-number of CPU cycles when the ECC coprocessor is
-busy performing the elliptic-curve cryptography
-(ECC) functions issued by the CPU.
-.
-Counter:  82	Name:ECC_BLOCKED_FUNCTION_COUNT
-Short-Description:Ecc Blocked Function Count
-Description:
-This counter
-counts the total number of the elliptic-curve
-cryptography (ECC) functions that are issued by the CPU
-and are blocked because the ECC coprocessor is
-busy performing a function issued by another CPU.
-.
-Counter:  83	Name:ECC_BLOCKED_CYCLES_COUNT
-Short-Description:ECC Blocked Cycles Count
-Description:
-This counter counts
-the total number of CPU cycles blocked for the elliptic-curve
-cryptography (ECC) functions issued by the
-CPU because the ECC coprocessor is busy perform-
-ing a function issued by another CPU.
-.

cpumf/data/cpum-cf-extended-z10.ctr

@@ -1,114 +0,0 @@
-Counter: 128	Name:L1I_L2_SOURCED_WRITES
-Short-Description:L1I L2 Sourced Writes
-Description:
-A directory write to the Level-1 I-Cache directory where the returned
-cache line was sourced from the Level-2 (L1.5) cache
-.
-Counter: 129	Name:L1D_L2_SOURCED_WRITES
-Short-Description:L1D L2 Sourced Writes
-Description:
-A directory write to the Level-1 D-Cache directory where the installed
-cache line was sourced from the Level-2 (L1.5) cache
-.
-Counter: 130	Name:L1I_L3_LOCAL_WRITES
-Short-Description:L1I L3 Local Writes
-Description:
-A directory write to the Level-1 I-Cache directory where the installed
-cache line was sourced from the Level-3 cache that is on the same book
-as the Instruction cache (Local L2 cache)
-.
-Counter: 131	Name:L1D_L3_LOCAL_WRITES
-Short-Description:L1D L3 Local Writes
-Description:
-A directory write to the Level-1 D-Cache directory where the installtion
-cache line was source from the Level-3 cache that is on the same book
-as the Data cache (Local L2 cache)
-.
-Counter: 132	Name:L1I_L3_REMOTE_WRITES
-Short-Description:L1I L3 Remote Writes
-Description:
-A directory write to the Level-1 I-Cache directory where the installed
-cache line was sourced from a Level-3 cache that is not on the same
-book as the Instruction cache (Remote L2 cache)
-.
-Counter: 133	Name:L1D_L3_REMOTE_WRITES
-Short-Description:L1D L3 Remote Writes
-Description:
-A directory write to the Level-1 D-Cache directory where the installed
-cache line was sourced from a Level-3 cache that is not on the same
-book as the Data cache (Remote L2 cache)
-.
-Counter: 134	Name:L1D_LMEM_SOURCED_WRITES
-Short-Description:L1D Local Memory Sourced Writes
-Description:
-A directory write to the Level-1 D-Cache directory where the installed
-cache line was sourced from memory that is attached to the same book
-as the Data cache (Local Memory)
-.
-Counter: 135	Name:L1I_LMEM_SOURCED_WRITES
-Short-Description:L1I Local Memory Sourced Writes
-Description:
-A directory write to the Level-1 I-Cache where the installed cache
-line was sourced from memory that is attached to the s ame book as the
-Instruction cache (Local Memory)
-.
-Counter: 136	Name:L1D_RO_EXCL_WRITES
-Short-Description:L1D Read-only Exclusive Writes
-Description:
-A directory write to the Level-1 D-Cache where the line was originally
-in a Read-Only state in the cache but has been updated to be in the
-Exclusive state that allows stores to the cache line
-.
-Counter: 137	Name:L1I_CACHELINE_INVALIDATES
-Short-Description:L1I Cacheline Invalidates
-Description:
-A cache line in the Level-1 I-Cache has been invalidated by a store on
-the same CPU as the Level-1 I-Cache
-.
-Counter: 138	Name:ITLB1_WRITES
-Short-Description:ITLB1 Writes
-Description:
-A translation entry has been written into the Level-1 Instruction
-Translation Lookaside Buffer
-.
-Counter: 139	Name:DTLB1_WRITES
-Short-Description:DTLB1 Writes
-Description:
-A translation entry has been written to the Level-1 Data Translation
-Lookaside Buffer
-.
-Counter: 140	Name:TLB2_PTE_WRITES
-Short-Description:TLB2 PTE Writes
-Description:
-A translation entry has been written to the Level-2 TLB Page Table
-Entry arrays
-.
-Counter: 141	Name:TLB2_CRSTE_WRITES
-Short-Description:TLB2 CRSTE Writes
-Description:
-A translation entry has been written to the Level-2 TLB Common Region
-Segment Table Entry arrays
-.
-Counter: 142	Name:TLB2_CRSTE_HPAGE_WRITES
-Short-Description:TLB2 CRSTE One-Megabyte Page Writes
-Description:
-A translation entry has been written to the Level-2 TLB Common Region
-Segment Table Entry arrays for a one-megabyte large page translation
-.
-Counter: 145	Name:ITLB1_MISSES
-Short-Description:ITLB1 Misses
-Description:
-Level-1 Instruction TLB miss in progress. Incremented by one for every
-cycle an ITLB1 miss is in progress
-.
-Counter: 146	Name:DTLB1_MISSES
-Short-Description:DTLB1 Misses
-Description:
-Level-1 Data TLB miss in progress. Incremented by one for every cycle
-an DTLB1 miss is in progress
-.
-Counter: 147	Name:L2C_STORES_SENT
-Short-Description:L2C Stores Sent
-Description:
-Incremented by one for every store sent to Level-2 (L1.5) cache
-.

cpumf/data/cpum-cf-extended-z13.ctr

@@ -1,373 +0,0 @@
-# Counter decriptions for the
-#	IBM z13 extended counter and MT-diagnostic counter set
-#
-# Notes for transactional-execution mode symbolic names:
-#	TX .. transactional-execution mode
-#	NC .. nonconstrained
-#	 C .. constrained
-#
-# Undefined counters in the extended counter set:
-#	142
-#	180-217
-#	221-225
-# Undefined counters in the MT-diagnostic counter set:
-#	450-495
-#
-#
-# Extended Counter Set
-# ---------------------------------------------------------------------
-Counter:128	Name:L1D_RO_EXCL_WRITES
-Short-Description:L1D Read-only Exclusive Writes
-Description:
-A directory write to the Level-1 Data cache where the line was
-originally in a Read-Only state in the cache but has been updated
-to be in the Exclusive state that allows stores to the cache line.
-.
-Counter:129	Name:DTLB1_WRITES
-Short-Description:DTLB1 Writes
-Description:
-A translation entry has been written to the Level-1 Data Translation
-Lookaside Buffer
-.
-Counter:130	Name:DTLB1_MISSES
-Short-Description:DTLB1 Misses
-Description:
-Level-1 Data TLB miss in progress. Incremented by one for every cycle
-a DTLB1 miss is in progress.
-.
-Counter:131	Name:DTLB1_HPAGE_WRITES
-Short-Description:DTLB1 One-Megabyte Page Writes
-Description:
-A translation entry has been written to the Level-1 Data Translation
-Lookaside Buffer for a one-megabyte page
-.
-Counter:132	Name:DTLB1_GPAGE_WRITES
-Short-Description:DTLB1 Two-Gigabyte Page Writes
-A translation entry has been written to the Level-1 Data Translation
-Lookaside Buffer for a two-gigabyte page.
-.
-Counter:133	Name:L1D_L2D_SOURCED_WRITES
-Short-Description:L1D L2D Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from the Level-2 Data cache
-.
-Counter:134	Name:ITLB1_WRITES
-Short-Description:ITLB1 Writes
-Description:
-A translation entry has been written to the Level-1 Instruction
-Translation Lookaside Buffer
-.
-Counter:135	Name:ITLB1_MISSES
-Short-Description:ITLB1 Misses
-Description:
-Level-1 Instruction TLB miss in progress. Incremented by one for every
-cycle an ITLB1 miss is in progress
-.
-Counter:136	Name:L1I_L2I_SOURCED_WRITES
-Short-Description:L1I L2I Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from the Level-2 Instruction cache
-.
-Counter:137	Name:TLB2_PTE_WRITES
-Short-Description:TLB2 PTE Writes
-Description:
-A translation entry has been written to the Level-2 TLB Page Table
-Entry arrays
-.
-Counter:138	Name:TLB2_CRSTE_HPAGE_WRITES
-Short-Description:TLB2 CRSTE One-Megabyte Page Writes
-Description:
-A translation entry has been written to the Level-2 TLB Combined Region
-Segment Table Entry arrays for a one-megabyte large page translation
-.
-Counter:139	Name:TLB2_CRSTE_WRITES
-Short-Description:TLB2 CRSTE Writes
-Description:
-A translation entry has been written to the Level-2 TLB Combined Region
-Segment Table Entry arrays
-.
-Counter:140	Name:TX_C_TEND
-Short-Description:Completed TEND instructions in constrained TX mode
-Description:
-A TEND instruction has completed in a constrained transactional-execution
-mode
-.
-Counter:141	Name:TX_NC_TEND
-Short-Description:Completed TEND instructions in non-constrained TX mode
-Description:
-A TEND instruction has completed in a non-constrained
-transactional-execution mode
-.
-Counter:143	Name:L1C_TLB1_MISSES
-Short-Description:L1C TLB1 Misses
-Description:
-Increments by one for any cycle where a Level-1 cache or Level-1 TLB miss
-is in progress.
-.
-Counter:144	Name:L1D_ONCHIP_L3_SOURCED_WRITES
-Short-Description:L1D On-Chip L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Chip Level-3 cache without intervention
-.
-Counter:145	Name:L1D_ONCHIP_L3_SOURCED_WRITES_IV
-Short-Description:L1D On-Chip L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Chip Level-3 cache with intervention
-.
-Counter:146	Name:L1D_ONNODE_L4_SOURCED_WRITES
-Short-Description:L1D On-Node L4 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Node Level-4 cache
-.
-Counter:147	Name:L1D_ONNODE_L3_SOURCED_WRITES_IV
-Short-Description:L1D On-Node L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Node Level-3 cache with intervention
-.
-Counter:148	Name:L1D_ONNODE_L3_SOURCED_WRITES
-Short-Description:L1D On-Node L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Node Level-3 cache without intervention
-.
-Counter:149	Name:L1D_ONDRAWER_L4_SOURCED_WRITES
-Short-Description:L1D On-Drawer L4 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Drawer Level-4 cache
-.
-Counter:150	Name:L1D_ONDRAWER_L3_SOURCED_WRITES_IV
-Short-Description:L1D On-Drawer L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Drawer Level-3 cache with intervention
-.
-Counter:151	Name:L1D_ONDRAWER_L3_SOURCED_WRITES
-Short-Description:L1D On-Drawer L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Drawer Level-3 cache without intervention
-.
-Counter:152	Name:L1D_OFFDRAWER_SCOL_L4_SOURCED_WRITES
-Short-Description:L1D Off-Drawer Same-Column L4 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off-Drawer Same-Column Level-4 cache
-.
-Counter:153	Name:L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV
-Short-Description:L1D Off-Drawer Same-Column L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off-Drawer Same-Column Level-3 cache with
-intervention
-.
-Counter:154	Name:L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES
-Short-Description:L1D Off-Drawer Same-Column L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off-Drawer Same-Column Level-3 cache
-without intervention
-.
-Counter:155	Name:L1D_OFFDRAWER_FCOL_L4_SOURCED_WRITES
-Short-Description:L1D Off-Drawer Far-Column L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off-Drawer Far-Column Level-4 cache
-.
-Counter:156	Name:L1D_OFFDRAWER_FCOL_L3_SOURCED_WRITES_IV
-Short-Description:L1D Off-Drawer Far-Column L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off-Drawer Far-Column Level-3 cache with
-intervention
-.
-Counter:157	Name:L1D_OFFDRAWER_FCOL_L3_SOURCED_WRITES
-Short-Description:L1D Off-Drawer Far-Column L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off-Drawer Far-Column Level-3 cache
-without intervention
-.
-Counter:158	Name:L1D_ONNODE_MEM_SOURCED_WRITES
-Short-Description:L1D On-Node Memory Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from On-Node memory
-.
-Counter:159	Name:L1D_ONDRAWER_MEM_SOURCED_WRITES
-Short-Description:L1D On-Drawer Memory Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from On-Drawer memory
-.
-Counter:160	Name:L1D_OFFDRAWER_MEM_SOURCED_WRITES
-Short-Description:L1D Off-Drawer Memory Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from On-Drawer memory
-.
-Counter:161	Name:L1D_ONCHIP_MEM_SOURCED_WRITES
-Short-Description:L1D On-Chip Memory Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from On-Chip memory
-.
-Counter:162	Name:L1I_ONCHIP_L3_SOURCED_WRITES
-Short-Description:L1I On-Chip L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an On-Chip Level-3 cache without
-intervention
-.
-Counter:163	Name:L1I_ONCHIP_L3_SOURCED_WRITES_IV
-Short-Description:L1I On-Chip L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an On Chip Level-3 cache with
-intervention
-.
-Counter:164	Name:L1I_ONNODE_L4_SOURCED_WRITES
-Short-Description:L1I On-Chip L4 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an On-Node Level-4 cache
-.
-Counter:165	Name:L1I_ONNODE_L3_SOURCED_WRITES_IV
-Short-Description:L1I On-Node L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from an On-Node Level-3 cache
-with intervention
-.
-Counter:166	Name:L1I_ONNODE_L3_SOURCED_WRITES
-Short-Description:L1I On-Node L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from an On-Node Level-3 cache
-without intervention
-.
-Counter:167	Name:L1I_ONDRAWER_L4_SOURCED_WRITES
-Short-Description:L1I On-Drawer L4 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from an On-Drawer Level-4 cache
-.
-Counter:168	Name:L1I_ONDRAWER_L3_SOURCED_WRITES_IV
-Short-Description:L1I On-Drawer L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from an On-Drawer Level-3 cache
-with intervention
-.
-Counter:169	Name:L1I_ONDRAWER_L3_SOURCED_WRITES
-Short-Description:L1I On-Drawer L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from an On-Drawer Level-3 cache
-without intervention
-.
-Counter:170	Name:L1I_OFFDRAWER_SCOL_L4_SOURCED_WRITES
-Short-Description:L1I Off-Drawer Same-Column L4 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from an Off-Drawer Same-Column
-Level-4 cache
-.
-Counter:171	Name:L1I_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV
-Short-Description:L1I Off-Drawer Same-Column L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from an Off-Drawer Same-Column
-Level-3 cache with intervention
-.
-Counter:172	Name:L1I_OFFDRAWER_SCOL_L3_SOURCED_WRITES
-Short-Description:L1I Off-Drawer Same-Column L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from an Off-Drawer Same-Column
-Level-3 cache without intervention
-.
-Counter:173	Name:L1I_OFFDRAWER_FCOL_L4_SOURCED_WRITES
-Short-Description:L1I Off-Drawer Far-Column L4 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from an Off-Drawer Far-Column
-Level-4 cache
-.
-Counter:174	Name:L1I_OFFDRAWER_FCOL_L3_SOURCED_WRITES_IV
-Short-Description:L1I Off-Drawer Far-Column L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from an Off-Drawer Far-Column
-Level-3 cache with intervention
-.
-Counter:175	Name:L1I_OFFDRAWER_FCOL_L3_SOURCED_WRITES
-Short-Description:L1I Off-Drawer Far-Column L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from an Off-Drawer Far-Column
-Level-3 cache without intervention
-.
-Counter:176	Name:L1I_ONNODE_MEM_SOURCED_WRITES
-Short-Description:L1I On-Node Memory Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from On-Node memory
-.
-Counter:177	Name:L1I_ONDRAWER_MEM_SOURCED_WRITES
-Short-Description:L1I On-Drawer Memory Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from On-Drawer memory
-.
-Counter:178	Name:L1I_OFFDRAWER_MEM_SOURCED_WRITES
-Short-Description:L1I Off-Drawer Memory Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from On-Drawer memory
-.
-Counter:179	Name:L1I_ONCHIP_MEM_SOURCED_WRITES
-Short-Description:L1I On-Chip Memory Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where
-the returned cache line was sourced from On-Chip memory
-.
-Counter:218	Name:TX_NC_TABORT
-Short-Description:Aborted transactions in non-constrained TX mode
-Description:
-A transaction abort has occurred in a non-constrained
-transactional-execution mode
-.
-Counter:219	Name:TX_C_TABORT_NO_SPECIAL
-Short-Description:Aborted transactions in constrained TX mode not using special completion logic
-Description:
-A transaction abort has occurred in a constrained transactional-execution
-mode and the CPU is not using any special logic to allow the transaction
-to complete
-.
-Counter:220	Name:TX_C_TABORT_SPECIAL
-Short-Description:Aborted transactions in constrained TX mode using special completion logic
-Description:
-A transaction abort has occurred in a constrained transactional-execution
-mode and the CPU is using special logic to allow the transaction to
-complete
-.
-#
-# MT-diagnostic counter set
-# ---------------------------------------------------------------------
-Counter:448	Name:MT_DIAG_CYCLES_ONE_THR_ACTIVE
-Short-Description:Cycle count with one thread active
-Description:
-Cycle count with one thread active
-.
-Counter:449	Name:MT_DIAG_CYCLES_TWO_THR_ACTIVE
-Short-Description:Cycle count with two threads active
-Description:
-Cycle count with two threads active
-.

cpumf/data/cpum-cf-extended-z14.ctr

@@ -1,357 +0,0 @@
-# Counter decriptions for the
-#	IBM z14 extended counter and MT-diagnostic counter set
-#
-# Notes for transactional-execution mode symbolic names:
-#	TX .. transactional-execution mode
-#	NC .. nonconstrained
-#	 C .. constrained
-#
-# Undefined counters in the extended counter set:
-#	142
-#	158-161
-#	176-223
-#	227-231
-#	233-242
-#	246-255
-# Undefined counters in the MT-diagnostic counter set:
-#	450-495
-#
-#
-# Extended Counter Set
-# ---------------------------------------------------------------------
-Counter:128	Name:L1D_RO_EXCL_WRITES
-Short-Description:L1D Read-only Exclusive Writes
-Description:
-A directory write to the Level-1 Data cache where the line was
-originally in a Read-Only state in the cache but has been updated
-to be in the Exclusive state that allows stores to the cache line
-.
-Counter:129	Name:DTLB2_WRITES
-Short-Description:DTLB2 Writes
-Description:
-A translation has been written into The Translation Lookaside
-Buffer 2 (TLB2) and the request was made by the data cache
-.
-Counter:130	Name:DTLB2_MISSES
-Short-Description:DTLB2 Misses
-Description:
-A TLB2 miss is in progress for a request made by the data cache.
-Incremented by one for every TLB2 miss in progress for the Level-1
-Data cache on this cycle
-.
-Counter:131	Name:DTLB2_HPAGE_WRITES
-Short-Description:DTLB2 One-Megabyte Page Writes
-Description:
-A translation entry was written into the Combined Region and Segment
-Table Entry array in the Level-2 TLB for a one-megabyte page or a
-Last Host Translation was done
-.
-Counter:132	Name:DTLB2_GPAGE_WRITES
-Short-Description:DTLB2 Two-Gigabyte Page Writes
-Description:
-A translation entry for a two-gigabyte page was written into the
-Level-2 TLB
-.
-Counter:133	Name:L1D_L2D_SOURCED_WRITES
-Short-Description:L1D L2D Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the
-returned cache line was sourced from the Level-2 Data cache
-.
-Counter:134	Name:ITLB2_WRITES
-Short-Description:ITLB2 Writes
-Description:
-A translation entry has been written into the Translation Lookaside
-Buffer 2 (TLB2) and the request was made by the instruction cache
-.
-Counter:135	Name:ITLB2_MISSES
-Short-Description:ITLB2 Misses
-Description:
-A TLB2 miss is in progress for a request made by the instruction cache.
-Incremented by one for every TLB2 miss in progress for the Level-1
-Instruction cache in a cycle
-.
-Counter:136	Name:L1I_L2I_SOURCED_WRITES
-Short-Description:L1I L2I Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from the Level-2 Instruction cache
-.
-Counter:137	Name:TLB2_PTE_WRITES
-Short-Description:TLB2 PTE Writes
-Description:
-A translation entry was written into the Page Table Entry array in the
-Level-2 TLB
-.
-Counter:138	Name:TLB2_CRSTE_WRITES
-Short-Description:TLB2 CRSTE Writes
-Description:
-Translation entries were written into the Combined Region and Segment
-Table Entry array and the Page Table Entry array in the Level-2 TLB
-.
-Counter:139	Name:TLB2_ENGINES_BUSY
-Short-Description:TLB2 Engines Busy
-Description:
-The number of Level-2 TLB translation engines busy in a cycle
-.
-Counter:140	Name:TX_C_TEND
-Short-Description:Completed TEND instructions in constrained TX mode
-Description:
-A TEND instruction has completed in a constrained transactional-execution
-mode
-.
-Counter:141	Name:TX_NC_TEND
-Short-Description:Completed TEND instructions in non-constrained TX mode
-Description:
-A TEND instruction has completed in a non-constrained
-transactional-execution mode
-.
-Counter:143	Name:L1C_TLB2_MISSES
-Short-Description:L1C TLB2 Misses
-Description:
-Increments by one for any cycle where a level-1 cache or level-2 TLB miss
-is in progress
-.
-Counter:144	Name:L1D_ONCHIP_L3_SOURCED_WRITES
-Short-Description:L1D On-Chip L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Chip Level-3 cache without intervention
-.
-Counter:145	Name:L1D_ONCHIP_MEMORY_SOURCED_WRITES
-Short-Description:L1D On-Chip Memory Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from On-Chip memory
-.
-Counter:146	Name:L1D_ONCHIP_L3_SOURCED_WRITES_IV
-Short-Description:L1D On-Chip L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Chip Level-3 cache with intervention
-.
-Counter:147	Name:L1D_ONCLUSTER_L3_SOURCED_WRITES
-Short-Description:L1D On-Cluster L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from On-Cluster Level-3 cache withountervention
-.
-Counter:148	Name:L1D_ONCLUSTER_MEMORY_SOURCED_WRITES
-Short-Description:L1D On-Cluster Memory Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Cluster memory
-.
-Counter:149	Name:L1D_ONCLUSTER_L3_SOURCED_WRITES_IV
-Short-Description:L1D On-Cluster L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Cluster Level-3 cache with intervention
-.
-Counter:150	Name:L1D_OFFCLUSTER_L3_SOURCED_WRITES
-Short-Description:L1D Off-Cluster L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off-Cluster Level-3 cache without
-intervention
-.
-Counter:151	Name:L1D_OFFCLUSTER_MEMORY_SOURCED_WRITES
-Short-Description:L1D Off-Cluster Memory Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from Off-Cluster memory
-.
-Counter:152	Name:L1D_OFFCLUSTER_L3_SOURCED_WRITES_IV
-Short-Description:L1D Off-Cluster L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off-Cluster Level-3 cache with intervention
-.
-Counter:153	Name:L1D_OFFDRAWER_L3_SOURCED_WRITES
-Short-Description:L1D Off-Drawer L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off-Drawer Level-3 cache without
-intervention
-.
-Counter:154	Name:L1D_OFFDRAWER_MEMORY_SOURCED_WRITES
-Short-Description:L1D Off-Drawer Memory Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from Off-Drawer memory
-.
-Counter:155	Name:L1D_OFFDRAWER_L3_SOURCED_WRITES_IV
-Short-Description:L1D Off-Drawer L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off-Drawer Level-3 cache with intervention
-.
-Counter:156	Name:L1D_ONDRAWER_L4_SOURCED_WRITES
-Short-Description:L1D On-Drawer L4 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from On-Drawer Level-4 cache
-.
-Counter:157	Name:L1D_OFFDRAWER_L4_SOURCED_WRITES
-Short-Description:L1D Off-Drawer L4 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from Off-Drawer Level-4 cache
-.
-Counter:158	Name:L1D_ONCHIP_L3_SOURCED_WRITES_RO
-Short-Description:L1D On-Chip L3 Sourced Writes read-only
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from On-Chip L3 but a read-only invalidate was
-done to remove other copies of the cache line
-.
-Counter:162	Name:L1I_ONCHIP_L3_SOURCED_WRITES
-Short-Description:L1I On-Chip L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache ine was sourced from an On-Chip Level-3 cache without
-intervention
-.
-Counter:163	Name:L1I_ONCHIP_MEMORY_SOURCED_WRITES
-Short-Description:L1I On-Chip Memory Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache ine was sourced from On-Chip memory
-.
-Counter:164	Name:L1I_ONCHIP_L3_SOURCED_WRITES_IV
-Short-Description:L1I On-Chip L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache ine was sourced from an On-Chip Level-3 cache with
-intervention
-.
-Counter:165	Name:L1I_ONCLUSTER_L3_SOURCED_WRITES
-Short-Description:L1I On-Cluster L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an On-Cluster Level-3 cache without
-intervention
-.
-Counter:166	Name:L1I_ONCLUSTER_MEMORY_SOURCED_WRITES
-Short-Description:L1I On-Cluster Memory Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an On-Cluster memory
-.
-Counter:167	Name:L1I_ONCLUSTER_L3_SOURCED_WRITES_IV
-Short-Description:L1I On-Cluster L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from On-Cluster Level-3 cache with
-intervention
-.
-Counter:168	Name:L1I_OFFCLUSTER_L3_SOURCED_WRITES
-Short-Description:L1I Off-Cluster L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an Off-Cluster Level-3 cache without
-intervention
-.
-Counter:169	Name:L1I_OFFCLUSTER_MEMORY_SOURCED_WRITES
-Short-Description:L1I Off-Cluster Memory Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from Off-Cluster memory
-.
-Counter:170	Name:L1I_OFFCLUSTER_L3_SOURCED_WRITES_IV
-Short-Description:L1I Off-Cluster L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an Off-Cluster Level-3 cache with
-intervention
-.
-Counter:171	Name:L1I_OFFDRAWER_L3_SOURCED_WRITES
-Short-Description:L1I Off-Drawer L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an Off-Drawer Level-3 cache without
-intervention
-.
-Counter:172	Name:L1I_OFFDRAWER_MEMORY_SOURCED_WRITES
-Short-Description:L1I Off-Drawer Memory Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from Off-Drawer memory
-.
-Counter:173	Name:L1I_OFFDRAWER_L3_SOURCED_WRITES_IV
-Short-Description:L1I Off-Drawer L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an Off-Drawer Level-3 cache with
-intervention
-.
-Counter:174	Name:L1I_ONDRAWER_L4_SOURCED_WRITES
-Short-Description:L1I On-Drawer L4 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from On-Drawer Level-4 cache
-.
-Counter:175	Name:L1I_OFFDRAWER_L4_SOURCED_WRITES
-Short-Description:L1I Off-Drawer L4 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from Off-Drawer Level-4 cache
-.
-Counter:224	Name:BCD_DFP_EXECUTION_SLOTS
-Short-Description:BCD DFP Execution Slots
-Description:
-Count of floating point execution slots used for finished Binary Coded
-Decimal to Decimal Floating Point conversions. Instructions: CDZT,
-CXZT, CZDT, CZXT
-.
-Counter:225	Name:VX_BCD_EXECUTION_SLOTS
-Short-Description:VX BCD Execution Slots
-Description:
-Count of floating point execution slots used for finished vector arithmetic
-Binary Coded Decimal instructions. Instructions: VAP, VSP, VMPVMSP, VDP,
-VSDP, VRP, VLIP, VSRP, VPSOPVCP, VTP, VPKZ, VUPKZ, VCVB, VCVBG, VCVDVCVDG
-.
-Counter:226	Name:DECIMAL_INSTRUCTIONS
-Short-Description:Decimal Instructions
-Description:
-Decimal instructions dispatched. Instructions: CVB, CVD, AP, CP, DP, ED,
-EDMK, MP, SRP, SP, ZAP
-.
-Counter:232	Name:LAST_HOST_TRANSLATIONS
-Short-Description:Last host translation done
-Description:
-Last Host Translation done
-.
-Counter:243	Name:TX_NC_TABORT
-Short-Description:Aborted transactions in non-constrained TX mode
-Description:
-A transaction abort has occurred in a non-constrained
-transactional-execution mode
-.
-Counter:244	Name:TX_C_TABORT_NO_SPECIAL
-Short-Description:Aborted transactions in constrained TX mode not using special completion logic
-Description:
-A transaction abort has occurred in a constrained transactional-execution
-mode and the CPU is not using any special logic to allow the transaction
-to complete
-.
-Counter:245	Name:TX_C_TABORT_SPECIAL
-Short-Description:Aborted transactions in constrained TX mode using special completion logic
-Description:
-A transaction abort has occurred in a constrained transactional-execution
-mode and the CPU is using special logic to allow the transaction to
-complete
-.
-#
-# MT-diagnostic counter set
-# ---------------------------------------------------------------------
-Counter:448	Name:MT_DIAG_CYCLES_ONE_THR_ACTIVE
-Short-Description:Cycle count with one thread active
-Description:
-Cycle count with one thread active
-.
-Counter:449	Name:MT_DIAG_CYCLES_TWO_THR_ACTIVE
-Short-Description:Cycle count with two threads active
-Description:
-Cycle count with two threads active
-.

cpumf/data/cpum-cf-extended-z15.ctr

@@ -1,376 +0,0 @@
-# Counter decriptions for the
-#	IBM z14 extended counter and MT-diagnostic counter set
-#
-# Notes for transactional-execution mode symbolic names:
-#	TX .. transactional-execution mode
-#	NC .. nonconstrained
-#	 C .. constrained
-#
-# Undefined counters in the extended counter set:
-#	142
-#	158-161
-#	176-223
-#	227-231
-#	233-242
-#	246-255
-# Undefined counters in the MT-diagnostic counter set:
-#	450-495
-#
-#
-# Extended Counter Set
-# ---------------------------------------------------------------------
-Counter:128	Name:L1D_RO_EXCL_WRITES
-Short-Description:L1D Read-only Exclusive Writes
-Description:
-A directory write to the Level-1 Data cache where the line was
-originally in a Read-Only state in the cache but has been updated
-to be in the Exclusive state that allows stores to the cache line
-.
-Counter:129	Name:DTLB2_WRITES
-Short-Description:DTLB2 Writes
-Description:
-A translation has been written into The Translation Lookaside
-Buffer 2 (TLB2) and the request was made by the data cache
-.
-Counter:130	Name:DTLB2_MISSES
-Short-Description:DTLB2 Misses
-Description:
-A TLB2 miss is in progress for a request made by the data cache.
-Incremented by one for every TLB2 miss in progress for the Level-1
-Data cache on this cycle
-.
-Counter:131	Name:DTLB2_HPAGE_WRITES
-Short-Description:DTLB2 One-Megabyte Page Writes
-Description:
-A translation entry was written into the Combined Region and Segment
-Table Entry array in the Level-2 TLB for a one-megabyte page
-.
-Counter:132	Name:DTLB2_GPAGE_WRITES
-Short-Description:DTLB2 Two-Gigabyte Page Writes
-Description:
-A translation entry for a two-gigabyte page was written into the
-Level-2 TLB
-.
-Counter:133	Name:L1D_L2D_SOURCED_WRITES
-Short-Description:L1D L2D Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the
-returned cache line was sourced from the Level-2 Data cache
-.
-Counter:134	Name:ITLB2_WRITES
-Short-Description:ITLB2 Writes
-Description:
-A translation entry has been written into the Translation Lookaside
-Buffer 2 (TLB2) and the request was made by the instruction cache
-.
-Counter:135	Name:ITLB2_MISSES
-Short-Description:ITLB2 Misses
-Description:
-A TLB2 miss is in progress for a request made by the instruction cache.
-Incremented by one for every TLB2 miss in progress for the Level-1
-Instruction cache in a cycle
-.
-Counter:136	Name:L1I_L2I_SOURCED_WRITES
-Short-Description:L1I L2I Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from the Level-2 Instruction cache
-.
-Counter:137	Name:TLB2_PTE_WRITES
-Short-Description:TLB2 PTE Writes
-Description:
-A translation entry was written into the Page Table Entry array in the
-Level-2 TLB
-.
-Counter:138	Name:TLB2_CRSTE_WRITES
-Short-Description:TLB2 CRSTE Writes
-Description:
-Translation entries were written into the Combined Region and Segment
-Table Entry array and the Page Table Entry array in the Level-2 TLB
-.
-Counter:139	Name:TLB2_ENGINES_BUSY
-Short-Description:TLB2 Engines Busy
-Description:
-The number of Level-2 TLB translation engines busy in a cycle
-.
-Counter:140	Name:TX_C_TEND
-Short-Description:Completed TEND instructions in constrained TX mode
-Description:
-A TEND instruction has completed in a constrained transactional-execution
-mode
-.
-Counter:141	Name:TX_NC_TEND
-Short-Description:Completed TEND instructions in non-constrained TX mode
-Description:
-A TEND instruction has completed in a non-constrained
-transactional-execution mode
-.
-Counter:143	Name:L1C_TLB2_MISSES
-Short-Description:L1C TLB2 Misses
-Description:
-Increments by one for any cycle where a level-1 cache or level-2 TLB miss
-is in progress
-.
-Counter:144	Name:L1D_ONCHIP_L3_SOURCED_WRITES
-Short-Description:L1D On-Chip L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Chip Level-3 cache without intervention
-.
-Counter:145	Name:L1D_ONCHIP_MEMORY_SOURCED_WRITES
-Short-Description:L1D On-Chip Memory Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from On-Chip memory
-.
-Counter:146	Name:L1D_ONCHIP_L3_SOURCED_WRITES_IV
-Short-Description:L1D On-Chip L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Chip Level-3 cache with intervention
-.
-Counter:147	Name:L1D_ONCLUSTER_L3_SOURCED_WRITES
-Short-Description:L1D On-Cluster L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from On-Cluster Level-3 cache withountervention
-.
-Counter:148	Name:L1D_ONCLUSTER_MEMORY_SOURCED_WRITES
-Short-Description:L1D On-Cluster Memory Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Cluster memory
-.
-Counter:149	Name:L1D_ONCLUSTER_L3_SOURCED_WRITES_IV
-Short-Description:L1D On-Cluster L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On-Cluster Level-3 cache with intervention
-.
-Counter:150	Name:L1D_OFFCLUSTER_L3_SOURCED_WRITES
-Short-Description:L1D Off-Cluster L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off-Cluster Level-3 cache without
-intervention
-.
-Counter:151	Name:L1D_OFFCLUSTER_MEMORY_SOURCED_WRITES
-Short-Description:L1D Off-Cluster Memory Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from Off-Cluster memory
-.
-Counter:152	Name:L1D_OFFCLUSTER_L3_SOURCED_WRITES_IV
-Short-Description:L1D Off-Cluster L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off-Cluster Level-3 cache with intervention
-.
-Counter:153	Name:L1D_OFFDRAWER_L3_SOURCED_WRITES
-Short-Description:L1D Off-Drawer L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off-Drawer Level-3 cache without
-intervention
-.
-Counter:154	Name:L1D_OFFDRAWER_MEMORY_SOURCED_WRITES
-Short-Description:L1D Off-Drawer Memory Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from Off-Drawer memory
-.
-Counter:155	Name:L1D_OFFDRAWER_L3_SOURCED_WRITES_IV
-Short-Description:L1D Off-Drawer L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off-Drawer Level-3 cache with intervention
-.
-Counter:156	Name:L1D_ONDRAWER_L4_SOURCED_WRITES
-Short-Description:L1D On-Drawer L4 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from On-Drawer Level-4 cache
-.
-Counter:157	Name:L1D_OFFDRAWER_L4_SOURCED_WRITES
-Short-Description:L1D Off-Drawer L4 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from Off-Drawer Level-4 cache
-.
-Counter:158	Name:L1D_ONCHIP_L3_SOURCED_WRITES_RO
-Short-Description:L1D On-Chip L3 Sourced Writes read-only
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from On-Chip L3 but a read-only invalidate was
-done to remove other copies of the cache line
-.
-Counter:162	Name:L1I_ONCHIP_L3_SOURCED_WRITES
-Short-Description:L1I On-Chip L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache ine was sourced from an On-Chip Level-3 cache without
-intervention
-.
-Counter:163	Name:L1I_ONCHIP_MEMORY_SOURCED_WRITES
-Short-Description:L1I On-Chip Memory Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache ine was sourced from On-Chip memory
-.
-Counter:164	Name:L1I_ONCHIP_L3_SOURCED_WRITES_IV
-Short-Description:L1I On-Chip L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache ine was sourced from an On-Chip Level-3 cache with
-intervention
-.
-Counter:165	Name:L1I_ONCLUSTER_L3_SOURCED_WRITES
-Short-Description:L1I On-Cluster L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an On-Cluster Level-3 cache without
-intervention
-.
-Counter:166	Name:L1I_ONCLUSTER_MEMORY_SOURCED_WRITES
-Short-Description:L1I On-Cluster Memory Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an On-Cluster memory
-.
-Counter:167	Name:L1I_ONCLUSTER_L3_SOURCED_WRITES_IV
-Short-Description:L1I On-Cluster L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from On-Cluster Level-3 cache with
-intervention
-.
-Counter:168	Name:L1I_OFFCLUSTER_L3_SOURCED_WRITES
-Short-Description:L1I Off-Cluster L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an Off-Cluster Level-3 cache without
-intervention
-.
-Counter:169	Name:L1I_OFFCLUSTER_MEMORY_SOURCED_WRITES
-Short-Description:L1I Off-Cluster Memory Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from Off-Cluster memory
-.
-Counter:170	Name:L1I_OFFCLUSTER_L3_SOURCED_WRITES_IV
-Short-Description:L1I Off-Cluster L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an Off-Cluster Level-3 cache with
-intervention
-.
-Counter:171	Name:L1I_OFFDRAWER_L3_SOURCED_WRITES
-Short-Description:L1I Off-Drawer L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an Off-Drawer Level-3 cache without
-intervention
-.
-Counter:172	Name:L1I_OFFDRAWER_MEMORY_SOURCED_WRITES
-Short-Description:L1I Off-Drawer Memory Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from Off-Drawer memory
-.
-Counter:173	Name:L1I_OFFDRAWER_L3_SOURCED_WRITES_IV
-Short-Description:L1I Off-Drawer L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an Off-Drawer Level-3 cache with
-intervention
-.
-Counter:174	Name:L1I_ONDRAWER_L4_SOURCED_WRITES
-Short-Description:L1I On-Drawer L4 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from On-Drawer Level-4 cache
-.
-Counter:175	Name:L1I_OFFDRAWER_L4_SOURCED_WRITES
-Short-Description:L1I Off-Drawer L4 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from Off-Drawer Level-4 cache
-.
-Counter:224	Name:BCD_DFP_EXECUTION_SLOTS
-Short-Description:BCD DFP Execution Slots
-Description:
-Count of floating point execution slots used for finished Binary Coded
-Decimal to Decimal Floating Point conversions. Instructions: CDZT,
-CXZT, CZDT, CZXT
-.
-Counter:225	Name:VX_BCD_EXECUTION_SLOTS
-Short-Description:VX BCD Execution Slots
-Description:
-Count of floating point execution slots used for finished vector arithmetic
-Binary Coded Decimal instructions. Instructions: VAP, VSP, VMPVMSP, VDP,
-VSDP, VRP, VLIP, VSRP, VPSOPVCP, VTP, VPKZ, VUPKZ, VCVB, VCVBG, VCVDVCVDG
-.
-Counter:226	Name:DECIMAL_INSTRUCTIONS
-Short-Description:Decimal Instructions
-Description:
-Decimal instructions dispatched. Instructions: CVB, CVD, AP, CP, DP, ED,
-EDMK, MP, SRP, SP, ZAP
-.
-Counter:232	Name:LAST_HOST_TRANSLATIONS
-Short-Description:Last host translation done
-Description:
-Last Host Translation done
-.
-Counter:243	Name:TX_NC_TABORT
-Short-Description:Aborted transactions in non-constrained TX mode
-Description:
-A transaction abort has occurred in a non-constrained
-transactional-execution mode
-.
-Counter:244	Name:TX_C_TABORT_NO_SPECIAL
-Short-Description:Aborted transactions in constrained TX mode not using special completion logic
-Description:
-A transaction abort has occurred in a constrained transactional-execution
-mode and the CPU is not using any special logic to allow the transaction
-to complete
-.
-Counter:245	Name:TX_C_TABORT_SPECIAL
-Short-Description:Aborted transactions in constrained TX mode using special completion logic
-Description:
-A transaction abort has occurred in a constrained transactional-execution
-mode and the CPU is using special logic to allow the transaction to
-complete
-.
-Counter:247     Name:DFLT_ACCESS
-Short-Description:Cycles CPU spent obtaining access to Deflate unit
-Description:
-Cycles CPU spent obtaining access to Deflate unit
-.
-Counter:252     Name:DFLT_CYCLES
-Short-Description:Cycles CPU is using Deflate unit
-Description:
-Cycles CPU is using Deflate unit
-.
-Counter:264     Name:DFLT_CC
-Short-Description:Increments by one for every DEFLATE CONVERSION CALL instruction executed
-Description:
-Increments by one for every DEFLATE CONVERSION CALL instruction executed
-.
-Counter:265     Name:DFLT_CCERROR
-Short-Description:Increments by one for every DEFLATE CONVERSION CALL instruction executed that ended in Condition Codes 0, 1 or 2
-Description:
-Increments by one for every DEFLATE CONVERSION CALL instruction executed that ended in Condition Codes 0, 1 or 2
-.
-#
-# MT-diagnostic counter set
-# ---------------------------------------------------------------------
-Counter:448	Name:MT_DIAG_CYCLES_ONE_THR_ACTIVE
-Short-Description:Cycle count with one thread active
-Description:
-Cycle count with one thread active
-.
-Counter:449	Name:MT_DIAG_CYCLES_TWO_THR_ACTIVE
-Short-Description:Cycle count with two threads active
-Description:
-Cycle count with two threads active
-.

cpumf/data/cpum-cf-extended-z196.ctr

@@ -1,146 +0,0 @@
-Counter: 128	Name:L1D_L2_SOURCED_WRITES
-Short-Description:L1D L2 Sourced Writes
-Description:
-A directory write to the Level-1 D-Cache directory where the returned
-cache line was sourced from the Level-2 cache
-.
-Counter: 129	Name:L1I_L2_SOURCED_WRITES
-Short-Description:L1I L2 Sourced Writes
-Description:
-A directory write to the Level-1 I-Cache directory where the returned
-cache line was sourced from the Level-2 cache
-.
-Counter: 130	Name:DTLB1_MISSES
-Short-Description:DTLB1 Misses
-Description:
-Level-1 Data TLB miss in progress. Incremented by one for every cycle
-a DTLB1 miss is in progress.
-.
-Counter: 131	Name:ITLB1_MISSES
-Short-Description:ITLB1 Misses
-Description:
-Level-1 Instruction TLB miss in progress. Incremented by one for every
-cycle a ITLB1 miss is in progress.
-.
-Counter: 133	Name:L2C_STORES_SENT
-Short-Description:L2C Stores Sent
-Description:
-Incremented by one for every store sent to Level-2 cache
-.
-Counter: 134	Name:L1D_OFFBOOK_L3_SOURCED_WRITES
-Short-Description:L1D Off-Book L3 Sourced Writes
-Description:
-A directory write to the Level-1 D-Cache directory where the returned
-cache line was sourced from an Off Book Level-3 cache
-.
-Counter: 135	Name:L1D_ONBOOK_L4_SOURCED_WRITES
-Short-Description:L1D On-Book L4 Sourced Writes
-Description:
-A directory write to the Level-1 D-Cache directory where the returned
-cache line was sourced from an On Book Level-4 cache
-.
-Counter: 136	Name:L1I_ONBOOK_L4_SOURCED_WRITES
-Short-Description:L1I On-Book L4 Sourced Writes
-Description:
-A directory write to the Level-1 I-Cache directory where the returned
-cache line was sourced from an On Book Level-4 cache
-.
-Counter: 137	Name:L1D_RO_EXCL_WRITES
-Short-Description:L1D Read-only Exclusive Writes
-Description:
-A directory write to the Level-1 D-Cache where the line was originally
-in a Read-Only state in the cache but has been updated to be in the
-Exclusive state that allows stores to the cache line
-.
-Counter: 138	Name:L1D_OFFBOOK_L4_SOURCED_WRITES
-Short-Description:L1D Off-Book L4 Sourced Writes
-Description:
-A directory write to the Level-1 D-Cache directory where the returned
-cache line was sourced from an Off Book Level-4 cache
-.
-Counter: 139	Name:L1I_OFFBOOK_L4_SOURCED_WRITES
-Short-Description:L1I Off-Book L4 Sourced Writes
-Description:
-A directory write to the Level-1 I-Cache directory where the returned
-cache line was sourced from an Off Book Level-4 cache
-.
-Counter: 140	Name:DTLB1_HPAGE_WRITES
-Short-Description:DTLB1 One-Megabyte Page Writes
-Description:
-A translation entry has been written to the Level-1 Data Translation
-Lookaside Buffer for a one-megabyte page
-.
-Counter: 141	Name:L1D_LMEM_SOURCED_WRITES
-Short-Description:L1D Local Memory Sourced Writes
-Description:
-A directory write to the Level-1 D-Cache where the installed cache line
-was sourced from memory that is attached to the same book as the Data
-cache (Local Memory)
-.
-Counter: 142	Name:L1I_LMEM_SOURCED_WRITES
-Short-Description:L1I Local Memory Sourced Writes
-Description:
-A directory write to the Level-1 I-Cache where the installed cache
-line was sourced from memory that is attached to the same book as the
-Instruction cache (Local Memory)
-.
-Counter: 143	Name:L1I_OFFBOOK_L3_SOURCED_WRITES
-Short-Description:L1I Off-Book L3 Sourced Writes
-Description:
-A directory write to the Level-1 I-Cache directory where the returned
-cache line was sourced from an Off Book Level-3 cache
-.
-Counter: 144	Name:DTLB1_WRITES
-Short-Description:DTLB1 Writes
-Description:
-A translation entry has been written to the Level-1 Data Translation
-Lookaside Buffer
-.
-Counter: 145	Name:ITLB1_WRITES
-Short-Description:ITLB1 Writes
-Description:
-A translation entry has been written to the Level-1 Instruction
-Translation Lookaside Buffer
-.
-Counter: 146	Name:TLB2_PTE_WRITES
-Short-Description:TLB2 PTE Writes
-Description:
-A translation entry has been written to the Level-2 TLB Page Table
-Entry arrays
-.
-Counter: 147	Name:TLB2_CRSTE_HPAGE_WRITES
-Short-Description:TLB2 CRSTE One-Megabyte Page Writes
-Description:
-A translation entry has been written to the Level-2 TLB Common Region
-Segment Table Entry arrays for a one-megabyte large page translation
-.
-Counter: 148	Name:TLB2_CRSTE_WRITES
-Short-Description:TLB2 CRSTE Writes
-Description:
-A translation entry has been written to the Level-2 TLB Common Region
-Segment Table Entry arrays
-.
-Counter: 150	Name:L1D_ONCHIP_L3_SOURCED_WRITES
-Short-Description:L1D On-Chip L3 Sourced Writes
-Description:
-A directory write to the Level-1 D-Cache directory where the returned
-cache line was sourced from an On Chip Level-3 cache
-.
-Counter: 152	Name:L1D_OFFCHIP_L3_SOURCED_WRITES
-Short-Description:L1D Off-Chip L3 Sourced Writes
-Description:
-A directory write to the Level-1 D-Cache directory where the returned
-cache line was sourced from an Off Chip/On Book Level-3 cache
-.
-Counter: 153	Name:L1I_ONCHIP_L3_SOURCED_WRITES
-Short-Description:L1I On-Chip L3 Sourced Writes
-Description:
-A directory write to the Level-1 I-Cache directory where the returned
-cache line was sourced from an On Chip Level-3 cache
-.
-Counter: 155	Name:L1I_OFFCHIP_L3_SOURCED_WRITES
-Short-Description:L1I Off-Chip L3 Sourced Writes
-Description:
-A directory write to the Level-1 I-Cache directory where the returned
-cache line was sourced from an Off Chip/On Book Level-3 cache
-.

cpumf/data/cpum-cf-extended-zEC12.ctr

@@ -1,230 +0,0 @@
-Counter: 128	Name:DTLB1_MISSES
-Short-Description:DTLB1 Misses
-Description:
-Level-1 Data TLB miss in progress. Incremented by one for every cycle
-a DTLB1 miss is in progress.
-.
-Counter:129	Name:ITLB1_MISSES
-Short-Description:ITLB1 Misses
-Description:
-Level-1 Instruction TLB miss in progress. Incremented by one for every
-cycle a ITLB1 miss is in progress.
-.
-Counter:130	Name:L1D_L2I_SOURCED_WRITES
-Short-Description:L1D L2I Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from the Level-2 Instruction cache
-.
-Counter:131	Name:L1I_L2I_SOURCED_WRITES
-Short-Description:L1I L2I Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from the Level-2 Instruction cache
-.
-Counter:132	Name:L1D_L2D_SOURCED_WRITES
-Short-Description:L1D L2D Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from the Level-2 Data cache
-.
-Counter:133	Name:DTLB1_WRITES
-Short-Description:DTLB1 Writes
-Description:
-A translation entry has been written to the Level-1 Data Translation
-Lookaside Buffer
-.
-Counter:135	Name:L1D_LMEM_SOURCED_WRITES
-Short-Description:L1D Local Memory Sourced Writes
-Description:
-A directory write to the Level-1 Data cache where the installed cache line
-was sourced from memory that is attached to the same book as the Data
-cache (Local Memory)
-.
-Counter:137	Name:L1I_LMEM_SOURCED_WRITES
-Short-Description:L1I Local Memory Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache where the installed cache
-line was sourced from memory that is attached to the same book as the
-Instruction cache (Local Memory)
-.
-Counter:138	Name:L1D_RO_EXCL_WRITES
-Short-Description:L1D Read-only Exclusive Writes
-Description:
-A directory write to the Level-1 D-Cache where the line was originally
-in a Read-Only state in the cache but has been updated to be in the
-Exclusive state that allows stores to the cache line
-.
-Counter:139	Name:DTLB1_HPAGE_WRITES
-Short-Description:DTLB1 One-Megabyte Page Writes
-Description:
-A translation entry has been written to the Level-1 Data Translation
-Lookaside Buffer for a one-megabyte page
-.
-Counter:140	Name:ITLB1_WRITES
-Short-Description:ITLB1 Writes
-Description:
-A translation entry has been written to the Level-1 Instruction
-Translation Lookaside Buffer
-.
-Counter:141	Name:TLB2_PTE_WRITES
-Short-Description:TLB2 PTE Writes
-Description:
-A translation entry has been written to the Level-2 TLB Page Table
-Entry arrays
-.
-Counter:142	Name:TLB2_CRSTE_HPAGE_WRITES
-Short-Description:TLB2 CRSTE One-Megabyte Page Writes
-Description:
-A translation entry has been written to the Level-2 TLB Common Region
-Segment Table Entry arrays for a one-megabyte large page translation
-.
-Counter:143	Name:TLB2_CRSTE_WRITES
-Short-Description:TLB2 CRSTE Writes
-Description:
-A translation entry has been written to the Level-2 TLB Common Region
-Segment Table Entry arrays
-.
-Counter:144	Name:L1D_ONCHIP_L3_SOURCED_WRITES
-Short-Description:L1D On-Chip L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On Chip Level-3 cache without intervention
-.
-Counter:145	Name:L1D_OFFCHIP_L3_SOURCED_WRITES
-Short-Description:L1D Off-Chip L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off Chip/On Book Level-3 cache without
-intervention
-.
-Counter:146	Name:L1D_OFFBOOK_L3_SOURCED_WRITES
-Short-Description:L1D Off-Book L3 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off Book Level-3 cache without intervention
-.
-Counter:147	Name:L1D_ONBOOK_L4_SOURCED_WRITES
-Short-Description:L1D On-Book L4 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an On Book Level-4 cache
-.
-Counter:148	Name:L1D_OFFBOOK_L4_SOURCED_WRITES
-Short-Description:L1D Off-Book L4 Sourced Writes
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off Book Level-4 cache
-.
-#
-# Notes for the transactional-execution mode notations:
-#   TX .. transactional-execution mode
-#   NC .. nonconstrained
-#    C .. constrained
-#
-Counter:149	Name:TX_NC_TEND
-Short-Description:Completed TEND instructions in non-constrained TX mode
-Description:
-A TEND instruction has completed in a nonconstrained
-transactional-execution mode
-.
-Counter:150	Name:L1D_ONCHIP_L3_SOURCED_WRITES_IV
-Short-Description:L1D On-Chip L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from a On Chip Level-3 cache with intervention
-.
-Counter:151	Name:L1D_OFFCHIP_L3_SOURCED_WRITES_IV
-Short-Description:L1D Off-Chip L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off Chip/On Book Level-3 cache with
-intervention
-.
-# XXX Remove SOURCED from L1D_OFFBOOK_L3_SOURCED_WRITES...
-Counter:152	Name:L1D_OFFBOOK_L3_SOURCED_WRITES_IV
-Short-Description:L1D Off-Book L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Data cache directory where the returned
-cache line was sourced from an Off Book Level-3 cache with intervention
-.
-Counter:153	Name:L1I_ONCHIP_L3_SOURCED_WRITES
-Short-Description:L1I On-Chip L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an On Chip Level-3 cache without
-intervention
-.
-Counter:154	Name:L1I_OFFCHIP_L3_SOURCED_WRITES
-Short-Description:L1I Off-Chip L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an Off Chip/On Book Level-3 cache
-without intervention
-.
-Counter:155	Name:L1I_OFFBOOK_L3_SOURCED_WRITES
-Short-Description:L1I Off-Book L3 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an Off Book Level-3 cache without
-intervention
-.
-Counter:156	Name:L1I_ONBOOK_L4_SOURCED_WRITES
-Short-Description:L1I On-Book L4 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an On Book Level-4 cache
-.
-Counter:157	Name:L1I_OFFBOOK_L4_SOURCED_WRITES
-Short-Description:L1I Off-Book L4 Sourced Writes
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an Off Book Level-4 cache
-.
-Counter:158	Name:TX_C_TEND
-Short-Description:Completed TEND instructions in constrained TX mode
-Description:
-A TEND instruction has completed in a constrained transactional-execution
-mode
-.
-Counter:159	Name:L1I_ONCHIP_L3_SOURCED_WRITES_IV
-Short-Description:L1I On-Chip L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an On Chip Level-3 cache with
-intervention
-.
-Counter:160	Name:L1I_OFFCHIP_L3_SOURCED_WRITES_IV
-Short-Description:L1I Off-Chip L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an Off Chip/On Book Level-3 cache
-with intervention
-.
-Counter:161	Name:L1I_OFFBOOK_L3_SOURCED_WRITES_IV
-Short-Description:L1I Off-Book L3 Sourced Writes with Intervention
-Description:
-A directory write to the Level-1 Instruction cache directory where the
-returned cache line was sourced from an Off Book Level-3 cache with
-intervention
-.
-Counter:177	Name:TX_NC_TABORT
-Short-Description:Aborted transactions in non-constrained TX mode
-Description:
-A transaction abort has occurred in a nonconstrained
-transactional-execution mode
-.
-Counter:178	Name:TX_C_TABORT_NO_SPECIAL
-Short-Description:Aborted transactions in constrained TX mode not using special completion logic
-Description:
-A transaction abort has occurred in a constrained transactional-execution
-mode and the CPU is not using any special logic to allow the transaction
-to complete
-.
-Counter:179	Name:TX_C_TABORT_SPECIAL
-Short-Description:Aborted transactions in constrained TX mode using special completion logic
-Description:
-A transaction abort has occurred in a constrained transactional-execution
-mode and the CPU is using special logic to allow the transaction to
-complete
-.

cpumf/data/cpum-cf-hw-counter.map

@@ -1,33 +0,0 @@
-# CPU-measurement facilities
-#
-# Mapping of:
-#   1. CPU-MF counter first/second version numbers to "generic" counter
-#      definitions
-#   2. IBM z Systems hardware to respective extended counter set definitions
-#
-#
-{
-	# Definition	   # File name
-
-	# CFVN
-	'cfvn-1'      	=> 'cpum-cf-cfvn-1.ctr',
-	'cfvn-3'	=> 'cpum-cf-cfvn-3.ctr',
-
-	# CSVN
-	'csvn-12345'	=> 'cpum-cf-csvn-12345.ctr',
-	'csvn-6'	=> 'cpum-cf-csvn-6.ctr',
-
-	# Extended counters
-	2097		=> 'cpum-cf-extended-z10.ctr',
-	2098		=> 'cpum-cf-extended-z10.ctr',
-	2817		=> 'cpum-cf-extended-z196.ctr',
-	2818		=> 'cpum-cf-extended-z196.ctr',
-	2827		=> 'cpum-cf-extended-zEC12.ctr',
-	2828		=> 'cpum-cf-extended-zEC12.ctr',
-	2964		=> 'cpum-cf-extended-z13.ctr',
-	2965		=> 'cpum-cf-extended-z13.ctr',
-	3906		=> 'cpum-cf-extended-z14.ctr',
-	3907		=> 'cpum-cf-extended-z14.ctr',
-	8561		=> 'cpum-cf-extended-z15.ctr',
-	8562		=> 'cpum-cf-extended-z15.ctr',
-};

cpumf/data/cpum-sf-modes.ctr

@@ -1,15 +0,0 @@
-# Perf raw event counter definitions for the
-#   CPU-measurment sampling facility
-#
-# Basic-sampling mode
-Counter: 0xB0000  Name:SF_CYCLES_BASIC
-Short-Description:Sample CPU Cycles Using Basic-sampling Mode
-Description:
-Sample CPU cycles using basic-sampling mode
-.
-# Diagnostic-sampling mode (includes basic-sampling)
-Counter: 0xBD000  Name:SF_CYCLES_BASIC_DIAG
-Short-Description:Sample CPU Cycle Using Diagnostic-sampling Mode (not for ordinary use)
-Description:
-Sample CPU cycle using diagnostic-sampling mode (not for ordinary use)
-.

cpumf/defines.h

@@ -0,0 +1,23 @@
+/*
+ * Defines for CPU Measurement Facility Characteristics
+ *
+ * Copyright IBM Corp. 2020
+ *
+ * s390-tools is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef DEFINES_H
+#define	DEFINES_H
+
+#define	PERF_SFB_SIZE	"/sys/module/kernel/parameters/cpum_sfb_size"
+#define	PERF_PATH	"/sys/bus/event_source/devices/"
+#define	PERF_SF		"cpum_sf"
+#define	PERF_CF		"cpum_cf"
+
+static inline void linux_error(const char *message)
+{
+	fprintf(stderr, "Error: %s: %s\n", message, strerror(errno));
+}
+
+#endif

cpumf/man/chcpumf.8

@@ -20,6 +20,7 @@ chcpumf \- manage the CPU-measurement facilities support
 .IR num_sdb ]
 .RB [ \-x | \-\-max
 .IR num_sdb ]
+.RB [ \-V |  \-\-verbose ]
 .br
 .B chcpumf
 .BR \-h | \-\-help

cpumf/man/lscpumf.1

@@ -1,11 +1,11 @@
 \" lscpumf.1
 .\"
 .\"
-.\" Copyright IBM Corp. 2014, 2017
+.\" Copyright IBM Corp. 2014, 2020
 .\" s390-tools is free software; you can redistribute it and/or modify
 .\" it under the terms of the MIT license. See LICENSE for details.
 .\" ----------------------------------------------------------------------
-.TH lscpumf "1" "February 2014" "s390-tools" "CPU-MF management programs"
+.TH lscpumf "1" "May 2020" "s390-tools" "CPU-MF management programs"
 .
 .ds c \fBlscpumf\fP
 .
@@ -19,9 +19,11 @@ lscpumf \- display information about CPU-measurement facilities
 .RB [ \-i | \-\-info ]
 .br
 .B lscpumf
-.RB [ \-c | \-\-list\-counters ]
+.RB \-c | \-\-list\-counters | \-C | \-\-list\-all\-counters
-.RB [ \-C | \-\-list\-all\-counters ]
+.RB [ \-n ]
-.RB [ \-s | \-\-list\-sampling\-events ]
+.br
+.B lscpumf
+.RB \-s | \-\-list\-sampling\-events
 .br
 .B lscpumf
 .BR \-h | \-\-help
@@ -46,12 +48,25 @@ facilities.
 Lists counters that are provided by the CPU-measurement facility, omitting
 counters for which the LPAR is not authorized. For counter measurements with
 the perf program, the raw event identifier is displayed.
+For Linux version 5.5 and later, the raw event identifier is
+displayed as <type>:<number>, where type is an integer that the kernel
+assignes to the CPU Measurement counter facility device driver.
+For earlier Linux versions the raw event identifier is displayed as r<number>.
 .
 .TP
 .BR \-C ", " \-\-list\-all\-counters
 Lists all counters that are provided by the CPU-measurement counter facility,
 regardless of LPAR authorization. To list only those counters for which the
 LPAR is authorized, use the -c option.
+For linux version 5.5 and later the raw event identifier is
+displayed as <type>:<number>, where type is the number the CPU Measurement
+counter facility device driver was assigned to by the kernel.
+For earlier linux versions the raw event identifier is displayed as r<number>.
+.
+.TP
+.BR \-n ", " \-\-name
+.
+Display the counter name together with the raw event identifier.
 .
 .TP
 .BR \-s ", " \-\-list\-sampling\-events

dasdfmt/dasdfmt.h

@@ -41,6 +41,10 @@ static const char mode_str[3][10] = {
 	"Full", "Quick", "Expand"
 };
 
+/* Report error, free memory, and exit */
+static void error(const char *format, ...)
+	__attribute__((__noreturn__, __format__(__printf__, 1, 2)));
+
 #define DASD_PARTN_BITS 2
 #define PARTN_MASK ((1 << DASD_PARTN_BITS) - 1)
 
@@ -65,47 +69,24 @@ static const char mode_str[3][10] = {
 	"is in invalid format\n",prog_name);}
 
 typedef struct bootstrap1 {
-        u_int32_t key;
+	u_int32_t key;
-        u_int32_t data[6];
+	u_int32_t data[6];
 } __attribute__ ((packed)) bootstrap1_t;
 
 typedef struct bootstrap2 {
-        u_int32_t key;
+	u_int32_t key;
-        u_int32_t data[36];
+	u_int32_t data[36];
 } __attribute__ ((packed)) bootstrap2_t;
 
-typedef struct dasdfmt_info {
-	dasd_information2_t dasd_info;
-        int   verbosity;
-        int   testmode;
-        int   withoutprompt;
-        int   print_progressbar;
-        int   print_hashmarks, hashstep;
-	int   print_percentage;
-        int   force;
-        int   writenolabel;
-        int   labelspec;
-        int   cdl_format;
-        int   blksize_specified;
-	int   reqsize_specified;
-        int   keep_volser;
-	int   force_host;
-	int   layout_specified;
-	int   check;
-	int   mode_specified;
-	int   ese;
-	int   no_discard;
-} dasdfmt_info_t;
-
 
 /*
 C9D7D3F1 000A0000 0000000F 03000000  00000001 00000000 00000000
 */
 static bootstrap1_t ipl1 = {
-        0xC9D7D3F1, {
+	0xC9D7D3F1, {
-                0x000A0000, 0x0000000F, 0x03000000,
+		0x000A0000, 0x0000000F, 0x03000000,
-                0x00000001, 0x00000000, 0x00000000
+		0x00000001, 0x00000000, 0x00000000
-        }
+	}
 };
 
 /*
@@ -116,21 +97,20 @@ C9D7D3F2 07003AB8 40000006 31003ABE  40000005 08003AA0 00000000 06000000
 00000000 00000000 00000000 00000000  00000000
 */
 static bootstrap2_t ipl2 = {
-        0xC9D7D3F2, {
+	0xC9D7D3F2, {
-                0x07003AB8, 0x40000006, 0x31003ABE,
+		0x07003AB8, 0x40000006, 0x31003ABE,
-                0x40000005, 0x08003AA0, 0x00000000,
+		0x40000005, 0x08003AA0, 0x00000000,
-                0x06000000, 0x20000000, 0x00000000,
+		0x06000000, 0x20000000, 0x00000000,
-                0x00000000, 0x00000400, 0x00000000,
+		0x00000000, 0x00000400, 0x00000000,
-                0x00000000, 0x00000000, 0x00000000,
+		0x00000000, 0x00000000, 0x00000000,
-                0x00000000, 0x00000000, 0x00000000,
+		0x00000000, 0x00000000, 0x00000000,
-                0x00000000, 0x00000000, 0x00000000,
+		0x00000000, 0x00000000, 0x00000000,
-                0x00000000, 0x00000000, 0x00000000,
+		0x00000000, 0x00000000, 0x00000000,
-                0x00000000, 0x00000000, 0x00000000,
+		0x00000000, 0x00000000, 0x00000000,
-                0x00000000, 0x00000000, 0x00000000,
+		0x00000000, 0x00000000, 0x00000000,
-                0x00000000, 0x00000000, 0x00000000,
+		0x00000000, 0x00000000, 0x00000000,
-                0x00000000, 0x00000000, 0x00000000
+		0x00000000, 0x00000000, 0x00000000
-        }
+	}
 };
 
 #endif /* DASDFMT_H */
-

dasdview/Makefile

@@ -1,14 +1,39 @@
 include ../common.mak
 
-ALL_CPPFLAGS += -DSYSFS
-
-all: dasdview
-
 libs =	$(rootdir)/libdasd/libdasd.a \
 	$(rootdir)/libzds/libzds.a \
 	$(rootdir)/libvtoc/libvtoc.a \
 	$(rootdir)/libutil/libutil.a
 
+ifneq (${HAVE_CURL},0)
+
+check_dep:
+	$(call check_dep, \
+		"dasdview", \
+		"curl/curl.h", \
+		"curl-devel or libcurl-dev", \
+		"HAVE_CURL=0")
+
+BUILDTARGET = check_dep
+
+ifneq ($(shell sh -c 'command -v pkg-config'),)
+CURL_CFLAGS = $(shell pkg-config --silence-errors --cflags libcurl)
+CURL_LDLIBS = $(shell pkg-config --silence-errors --libs libcurl)
+else
+CURL_CFLAGS = -I/usr/include/s390x-linux-gnu/curl
+CURL_LDLIBS = -lcurl
+endif # shell
+
+endif # HAVE_CURL
+
+BUILDTARGET += dasdview
+
+ALL_CPPFLAGS += -DSYSFS
+ALL_CFLAGS += $(CURL_CFLAGS)
+LDLIBS += $(CURL_LDLIBS)
+
+all: $(BUILDTARGET)
+
 dasdview: dasdview.o $(libs)
 
 install: all

etc/init.d/dumpconf

@@ -225,7 +225,7 @@ function CheckDeviceString() {
 	fi
 }
 
-setup_device()
+setup_ccw_device()
 {
 	DEV="$(CheckDeviceString $DEVICE)"
 	if [ "$DEV" != "" ]; then
@@ -235,27 +235,37 @@ setup_device()
 		pr_error "ERROR: Invalid DEVICE '$DEVICE'." $ERRMSG
 		return
 	fi
-	if [ $2 == "fcp" ]; then
+}
-		echo $WWPN > $1/fcp/wwpn 2>/dev/null || RETVAL=1
+
-		if [ $RETVAL -eq 1 ]; then
+setup_fcp_device()
-			pr_error "ERROR: Invalid WWPN '$WWPN'." $ERRMSG
+{
-			return
+	DEV="$(CheckDeviceString $DEVICE)"
-		fi
+	if [ "$DEV" != "" ]; then
-		echo $LUN > $1/fcp/lun 2>/dev/null || RETVAL=1
+		echo $DEV > $1/$2/device
-		if [ $RETVAL -eq 1 ]; then
+	else
-			pr_error "ERROR: Invalid LUN '$LUN'." $ERRMSG
+		RETVAL=1
-			return
+		pr_error "ERROR: Invalid DEVICE '$DEVICE'." $ERRMSG
-		fi
+		return
-		echo $BOOTPROG > $1/fcp/bootprog 2>/dev/null || RETVAL=1
+	fi
-		if [ $RETVAL -eq 1 ]; then
+	echo $WWPN > $1/fcp/wwpn 2>/dev/null || RETVAL=1
-			pr_error "ERROR: Invalid BOOTPROG '$BOOTPROG'." $ERRMSG
+	if [ $RETVAL -eq 1 ]; then
-			return
+		pr_error "ERROR: Invalid WWPN '$WWPN'." $ERRMSG
-		fi
+		return
-		echo $BR_LBA > $1/fcp/br_lba 2>/dev/null || RETVAL=1
+	fi
-		if [ $RETVAL -eq 1 ]; then
+	echo $LUN > $1/fcp/lun 2>/dev/null || RETVAL=1
-			pr_error "ERROR: Invalid BR_LBA '$BR_LBA'." $ERRMSG
+	if [ $RETVAL -eq 1 ]; then
-			return
+		pr_error "ERROR: Invalid LUN '$LUN'." $ERRMSG
-		fi
+		return
+	fi
+	echo $BOOTPROG > $1/fcp/bootprog 2>/dev/null || RETVAL=1
+	if [ $RETVAL -eq 1 ]; then
+		pr_error "ERROR: Invalid BOOTPROG '$BOOTPROG'." $ERRMSG
+		return
+	fi
+	echo $BR_LBA > $1/fcp/br_lba 2>/dev/null || RETVAL=1
+	if [ $RETVAL -eq 1 ]; then
+		pr_error "ERROR: Invalid BR_LBA '$BR_LBA'." $ERRMSG
+		return
 	fi
 }
 
@@ -264,6 +274,30 @@ setup_nss_device()
 	echo $NSS_NAME > $1/nss/name || RETVAL=1
 }
 
+setup_nvme_device()
+{
+	echo $FID > $1/nvme/fid 2>/dev/null || RETVAL=1
+	if [ $RETVAL -eq 1 ]; then
+		pr_error "ERROR: Invalid FID '$FID'." $ERRMSG
+		return
+	fi
+	echo $NSID > $1/nvme/nsid 2>/dev/null || RETVAL=1
+	if [ $RETVAL -eq 1 ]; then
+		pr_error "ERROR: Invalid NSID '$NSID'." $ERRMSG
+		return
+	fi
+	echo $BOOTPROG > $1/nvme/bootprog 2>/dev/null || RETVAL=1
+	if [ $RETVAL -eq 1 ]; then
+		pr_error "ERROR: Invalid BOOTPROG '$BOOTPROG'." $ERRMSG
+		return
+	fi
+	echo $BR_LBA > $1/nvme/br_lba 2>/dev/null || RETVAL=1
+	if [ $RETVAL -eq 1 ]; then
+		pr_error "ERROR: Invalid BR_LBA '$BR_LBA'." $ERRMSG
+		return
+	fi
+}
+
 setup_reipl()
 {
 	if [ "$REIPL_TYPE" == "" ]; then
@@ -271,15 +305,25 @@ setup_reipl()
 		return
 	fi
 
-	if [ "$REIPL_TYPE" == "ccw" ] || [ "$REIPL_TYPE" == "fcp" ]; then
+	case "$REIPL_TYPE" in
-		setup_device $REIPL_CONFIG_DIR $REIPL_TYPE
+		ccw)
-	elif [ "$REIPL_TYPE" == "nss" ]; then
+			setup_ccw_device $REIPL_CONFIG_DIR $REIPL_TYPE
-		setup_nss_device $REIPL_CONFIG_DIR
+			;;
-	else
+		fcp)
-		pr_error "ERROR: Unknown reipl type '$REIPL_TYPE'." $ERRMSG
+			setup_fcp_device $REIPL_CONFIG_DIR $REIPL_TYPE
-		RETVAL=1
+			;;
-		return
+		nvme)
-	fi
+			setup_nvme_device $REIPL_CONFIG_DIR
+			;;
+		nss)
+			setup_nss_device $REIPL_CONFIG_DIR
+			;;
+		*)
+			pr_error "ERROR: Unknown reipl type '$REIPL_TYPE'." $ERRMSG
+			RETVAL=1
+			return
+			;;
+	esac
 
 	echo $REIPL_TYPE > $REIPL_CONFIG_DIR/reipl_type || RETVAL=1
 
@@ -292,13 +336,24 @@ setup_reipl()
 
 setup_dump()
 {
-	if [ "$DUMP_TYPE" == "ccw" ] || [ "$DUMP_TYPE" == "fcp" ]; then
+	case "$DUMP_TYPE" in
-		setup_device $DUMP_CONFIG_DIR $DUMP_TYPE
+		ccw)
-	elif [ "$DUMP_TYPE" != "none" ]; then
+			setup_ccw_device $DUMP_CONFIG_DIR $DUMP_TYPE
-		pr_error "ERROR: Unknown dump type '$DUMP_TYPE'." $ERRMSG
+			;;
-		RETVAL=1
+		fcp)
-		return
+			setup_fcp_device $DUMP_CONFIG_DIR $DUMP_TYPE
-	fi
+			;;
+		nvme)
+			setup_nvme_device $DUMP_CONFIG_DIR
+			;;
+		none)
+			;;
+		*)
+			pr_error "ERROR: Unknown dump type '$DUMP_TYPE'." $ERRMSG
+			RETVAL=1
+			return
+			;;
+	esac
 
 	echo $DUMP_TYPE > $DUMP_CONFIG_DIR/dump_type || RETVAL=1
 
@@ -358,6 +413,18 @@ print_ccw_device()
 	pr_info "device..: $DEVICE"
 }
 
+print_nvme_device()
+{
+	FID=$(cat $1/nvme/fid) || RETVAL=1
+	pr_info "fid.....: $FID"
+	NSID=$(cat $1/nvme/nsid) || RETVAL=1
+	pr_info "nsid....: $NSID"
+	BOOTPROG=$(cat $1/nvme/bootprog) || RETVAL=1
+	pr_info "bootprog: $BOOTPROG"
+	BR_LBA=$(cat $1/nvme/br_lba) || RETVAL=1
+	pr_info "br_lba..: $BR_LBA"
+}
+
 print_nss_name()
 {
 	NAME=$(cat $1/nss/device) || RETVAL=1
@@ -367,35 +434,52 @@ print_nss_name()
 status_dump()
 {
 	CONF_DUMP_TYPE=$(cat $DUMP_CONFIG_DIR/dump_type) || RETVAL=1
-	if [ "$CONF_DUMP_TYPE" == "none" ]; then
+	case "$CONF_DUMP_TYPE" in
-		pr_info "type....: no dump device configured"
+		none)
-	elif [ "$CONF_DUMP_TYPE" == "ccw" ]; then
+			pr_info "type....: no dump device configured"
-		pr_info "type....: ccw"
+			;;
-		print_ccw_device $DUMP_CONFIG_DIR
+		ccw)
-		verify_ccw_dump_device $(cat $DUMP_CONFIG_DIR/ccw/device)
+			pr_info "type....: ccw"
-	elif [ "$CONF_DUMP_TYPE" == "fcp" ]; then
+			print_ccw_device $DUMP_CONFIG_DIR
-		pr_info "type....: fcp"
+			verify_ccw_dump_device $(cat $DUMP_CONFIG_DIR/ccw/device)
-		print_fcp_device $DUMP_CONFIG_DIR
+			;;
-	else
+		fcp)
-		pr_error "ERROR: Unknown dump device type '$CONF_DUMP_TYPE'!"
+			pr_info "type....: fcp"
-		pr_error "       Please check if you have the latest dumpconf package!"
+			print_fcp_device $DUMP_CONFIG_DIR
-	fi
+			;;
+		nvme)
+			pr_info "type....: nvme"
+			print_nvme_device $DUMP_CONFIG_DIR
+			;;
+		*)
+			pr_error "ERROR: Unknown dump device type '$CONF_DUMP_TYPE'!"
+			pr_error "       Please check if you have the latest dumpconf package!"
+			;;
+	esac
 }
 
 status_reipl()
 {
 	REIPL_TYPE=$(cat $REIPL_CONFIG_DIR/reipl_type) || RETVAL=1
 	pr_info "type....: $REIPL_TYPE"
-	if [ "$REIPL_TYPE" == "ccw" ]; then
+	case "$REIPL_TYPE" in
-		print_ccw_device $REIPL_CONFIG_DIR
+		ccw)
-	elif [ "$REIPL_TYPE" == "fcp" ]; then
+			print_ccw_device $REIPL_CONFIG_DIR
-		print_fcp_device $REIPL_CONFIG_DIR
+			;;
-	elif [ "$REIPL_TYPE" == "nss" ]; then
+		fcp)
-		print_nss_name $REIPL_CONFIG_DIR
+			print_fcp_device $REIPL_CONFIG_DIR
-	else
+			;;
-		pr_error "ERROR: Unknown reipl device type '$REIPL_TYPE'!"
+		nvme)
-		pr_error "       Please check if you have the latest dumpconf package!"
+			print_nvme_device $REIPL_CONFIG_DIR
-	fi
+			;;
+		nss)
+			print_nss_name $REIPL_CONFIG_DIR
+			;;
+		*)
+			pr_error "ERROR: Unknown reipl device type '$REIPL_TYPE'!"
+			pr_error "       Please check if you have the latest dumpconf package!"
+			;;
+	esac
 }
 
 status_dump_reipl()

etc/init.d/mon_statd

@@ -31,7 +31,7 @@ if [ -f $CONFIG_FILE ]; then
 	. $CONFIG_FILE
 fi
 
-UDEVSETTLE=/sbin/udevadm
+UDEVSETTLE=/usr/bin/udevadm
 if [ ! -e $UDEVSETTLE ]
 then
 	UDEVSETTLE=/sbin/udevsettle

etc/sysconfig/dumpconf

@@ -39,6 +39,16 @@
 # BOOTPROG=0
 # BR_LBA=0
 
+#
+# Dump on nvme device (NVMe Disk)
+#
+# ON_PANIC=dump
+# DUMP_TYPE=nvme
+# FID=0x00000300
+# NSID=0x00000001
+# BOOTPROG=3
+# BR_LBA=0
+
 #
 # Use VMDUMP
 #

fdasd/fdasd.c

@@ -1232,7 +1232,7 @@ static void fdasd_reread_partition_table(fdasd_anchor_t *anc)
 	if (!anc->silent)
 		printf("rereading partition table...\n");
 
-	if (dasd_reread_partition_table(options.device, 1) != 0) {
+	if (dasd_reread_partition_table(options.device, 5) != 0) {
 		fdasd_error(anc, unable_to_ioctl, "Error while rereading "
 			    "partition table.\nPlease reboot!");
 	}

genprotimg/Makefile

@@ -21,7 +21,7 @@ clean: clean-recursive
 $(RECURSIVE_TARGETS):
 	@target=`echo $@ |sed s/-recursive//`; \
 		for d in $(SUBDIRS); do \
-			$(MAKE) -C $$d $$target; \
+			$(MAKE) -C $$d $$target || exit 1; \
 		done
 
 .PHONY: all install clean $(RECURSIVE_TARGETS)

genprotimg/boot/Makefile

@@ -12,7 +12,7 @@ ALL_CFLAGS := $(NO_PIE_CFLAGS) -Os -g \
 	-DENABLE_SCLP_ASCII=1 \
 	-DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
 	-fno-builtin -ffreestanding -fno-asynchronous-unwind-tables \
-	-fno-delete-null-pointer-checks \
+	-fno-delete-null-pointer-checks -fno-stack-protector \
 	-fexec-charset=IBM1047 -m64 -mpacked-stack \
 	-mstack-size=4096 -mstack-guard=128 -msoft-float \
 	-Wall -Wformat-security -Wextra -Werror

genprotimg/boot/head.S

@@ -1,5 +1,5 @@
 /*
- * Entry code for stage 3a boot loader
+ * Entry code for stage 3a and stage 3b boot loader
  *
  * Copyright IBM Corp. 2020
  *
@@ -24,6 +24,8 @@ _start:
 	sam64
 
 	/* Initialize stack */
-	lgfi	%r15, STACK_ADDRESS + STACK_SIZE - STACK_FRAME_OVERHEAD
+	basr	%r13, 0
+.Lbase:	llgf	%r15, .Lstack - .Lbase(%r13)
 	brasl	%r14, initialize
+.Lstack: .long STACK_ADDRESS + STACK_SIZE - STACK_FRAME_OVERHEAD
 .previous

genprotimg/boot/stage3a_init.S

@@ -21,6 +21,8 @@ _init:
 	 * kernel command line and the address and size of the
 	 * ramdisk. Simply ignore this by starting at 0x11000.
 	 */
-	lgfi	%r1, STAGE3A_ENTRY
+	basr	%r13, 0
+.Lbase:	llgf	%r1, .Lstage3a_entry - .Lbase(%r13)
 	br	%r1
+.Lstage3a_entry: .long STAGE3A_ENTRY
 .previous

genprotimg/boot/stage3b_reloc.S

@@ -31,12 +31,12 @@ stage3b_reloc_start:
 	sigp	%r1, %r0, SIGP_SET_ARCHITECTURE
 	sam64
 
-.copy_stage3b:
 	/* Location of stage3b in memory */
 	larl	%r8, stage3b_start
 
 	/* Destination for stage3b */
-	lgfi	%r9, STAGE3B_LOAD_ADDRESS
+	basr	%r13, 0
+.Lbase:	llgf	%r9, .Lstage3b_load_address - .Lbase(%r13)
 
 	/* Size of stage3b */
 	lghi	%r11, stage3b_end - stage3b_start
@@ -45,8 +45,10 @@ stage3b_reloc_start:
 	MEMCPY	%r9, %r8, %r11
 
 	/* Branch to STAGE3B_ENTRY */
-	lgfi	%r9, STAGE3B_ENTRY
+	llgf	%r9, .Lstage3b_entry - .Lbase(%r13)
 	br	%r9
+.Lstage3b_load_address:	.long STAGE3B_LOAD_ADDRESS
+.Lstage3b_entry:	.long STAGE3B_ENTRY
 stage3b_start:
 	.incbin	"stage3b.bin"
 stage3b_end:

genprotimg/man/genprotimg.8

@@ -2,7 +2,7 @@
 .\" s390-tools is free software; you can redistribute it and/or modify
 .\" it under the terms of the MIT license. See LICENSE for details.
 .\"
-.TH GENPROTIMG 8 "March 2020" "s390-tools"
+.TH GENPROTIMG 8 "November 2020" "s390-tools"
 .SH NAME
 genprotimg \- Create a protected virtualization image
 
@@ -10,6 +10,7 @@ genprotimg \- Create a protected virtualization image
 .SY
 .B genprotimg
 \fB\-k\fR \fIHOST_KEY_DOCUMENT\fR...
+\fB\-C\fR \fICERTIFICATE\fR...
 \fB\-i\fR \fIVMLINUZ\fR
 [\fB\-r\fR \fIRAMDISK\fR]
 [\fB\-p\fR \fIPARMFILE\fR]
@@ -21,15 +22,19 @@ genprotimg \- Create a protected virtualization image
 .PP
 Use \fBgenprotimg\fR to generate a single bootable image file with
 encrypted and integrity-protected parts. The command requires a kernel
-image, a host-key document, and an output file name. Optionally,
+image, a host-key document, certificates for the host-key document
-specify an initial RAM filesystem, and a file containing the kernel
+verification, and an output file name. Optionally, specify an initial
-parameters. Should special circumstances require it, you can
+RAM filesystem, and a file containing the kernel parameters. If the
+command should be run offline, use the \fB\-\-offline\fR option and
+specify the certificate revocation lists (CRLs) by using the
+\fB\-\-crl\fR option. Should special circumstances require it, you can
 optionally specify your own keys for the encryption by using the
-experimental options. In the resulting image file, a plain text boot
+experimental options. For all certificates, CRLs, and host-key
-loader, the encrypted components for kernel, initial RAM disk, kernel
+documents, both the PEM and DER input formats are supported. In the
-parameters, and the encrypted and integrity-protected header are
+resulting image file, a plain text boot loader, the encrypted
-concatenated. The header contains metadata necessary for running the
+components for kernel, initial RAM disk, kernel parameters, and the
-guest in protected mode.
+encrypted and integrity-protected header are concatenated. The header
+contains metadata necessary for running the guest in protected mode.
 .PP
 Use this image file as a kernel image for zipl or for a direct kernel
 boot using QEMU.
@@ -53,6 +58,12 @@ Specifies a host-key document. At least one is required. Specify this
 option multiple times to enable the image to run on more than one
 host.
 .TP
+\fB\-C\fR, \fB\-\-cert\fR=\fI\,FILE\/\fR
+Specifies the certificate that is used to establish a chain of trust
+for the verification of the host-key documents. Specify this option
+twice to specify the IBM Z signing key and the intermediate CA
+certificate (signed by the root CA). Required.
+.TP
 \fB\-o\fR, \fB\-\-output\fR=\fI\,OUTPUT_FILE\/\fR
 Specifies the output file. Required.
 .TP
@@ -65,6 +76,20 @@ Specifies the RAM disk image. Optional.
 \fB\-p\fR, \fB\-\-parmfile\fR=\fI\,PARMFILE\/\fR
 Specifies the kernel command line stored in \fI\,PARMFILE\/\fR. Optional.
 .TP
+\fB\-\-crl\fR=\fI\,FILE\/\fR
+Specifies the revocation list that is used to check whether a
+certificate of the chain of trust is revoked. Specify this option
+multiple times to use multiple CRLs. Optional.
+.TP
+\fB\-\-offline\fR
+Specifies offline mode, in which no attempt is made to download
+CRLs. Optional.
+.TP
+\fB\-\-root\-ca\fR=\fI\,FILE\/\fR
+Specifies the root CA certificate for the verification. If omitted,
+the DigiCert root CA certificate installed on the system is used. Use
+this only if you trust the specified certificate. Optional.
+.TP
 \fB\-\-no-verify\fR
 Do not require the host-key documents to be valid. For testing
 purposes, do not use for a production image. Optional.
@@ -77,11 +102,13 @@ Prints version information, then exits.
 Generate a protected virtualization image in
 \fI\,/boot/vmlinuz.pv\/\fR, using the kernel file \fI\,vmlinuz\/\fR,
 the initrd in \fI\,initramfs\/\fR, the kernel parameters contained in
-\fI\,parmfile\/\fR, and the host-key document in \fI\,host_key.crt\/\fR:
+\fI\,parmfile\/\fR, the intermediate CA in \fI\,DigiCertCA.crt\/\fR,
+the IBM Z signing key in \fI\,ibm-z-host-key-signing.crt\/\fR, and the
+host-key document in \fI\,host_key.crt\/\fR:
 .PP
 .Vb 1
 .EX
-\&        genprotimg \-i \fI\,vmlinuz\/\fR \-r \fI\,initramfs\/\fR \-p \fI\,parmfile\/\fR \-k \fI\,host_key.crt\/\fR \-o \fI\,/boot/vmlinuz.pv\/\fR
+\&        genprotimg \-i \fI\,vmlinuz\/\fR \-r \fI\,initramfs\/\fR \-p \fI\,parmfile\/\fR \-k \fI\,host_key.crt\/\fR \-C \fI\,ibm-z-host-key-signing.crt\/\fR \-C \fI\,DigiCertCA.crt \-o \fI\,/boot/vmlinuz.pv\/\fR
 .EE
 .Ve
 .PP

genprotimg/samples/check_hostkeydoc

@@ -6,11 +6,9 @@
 # verifying the issuer, the validity date and the signature.
 # Optionally verify the full trust chain using a CA certficate.
 #
-# Revocation list checking not yet implemented.
-#
 # Sample invocation:
 #
-# ./check_hostkeydoc HKD1234.crt signing-key.crt
+# ./check_hostkeydoc HKD1234.crt ibm-z-host-key-signing.crt -c DigiCertCA.crt -r ibm-z-host-key.crl
 #
 # Copyright IBM Corp. 2020
 #
@@ -37,8 +35,9 @@ cleanup()
 trap cleanup EXIT
 
 # Enhanced error checking for bash
-if echo $SHELL | grep /bin/bash > /dev/null
+if [ -n "${BASH}" ]
 then
+    set -o posix
     set -o pipefail
     set -o nounset
 fi
@@ -101,7 +100,7 @@ extract_body()
 
 verify_signature()
 {
-    # Assuming that the signature algorith is SHA512 with RSA
+    # Assuming that the signature algorithm is SHA512 with RSA
     openssl sha512 -verify $1 -signature $2 $3
 }
 

genprotimg/src/Makefile

@@ -15,24 +15,24 @@ INCLUDE_PARMS = $(addprefix -I,$(INCLUDE_PATHS))
 
 WARNINGS := -Wall -Wextra -Wshadow \
 	-Wcast-align -Wwrite-strings -Wmissing-prototypes \
-	-Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline \
+	-Wmissing-declarations -Wredundant-decls -Wnested-externs \
 	-Wno-long-long -Wuninitialized -Wconversion -Wstrict-prototypes \
-	-Wpointer-arith -Werror \
+	-Wpointer-arith -Werror -Wno-error=inline \
 	$(NULL)
 
 $(bin_PROGRAM)_SRCS := $(bin_PROGRAM).c pv/pv_stage3.c pv/pv_image.c \
 	pv/pv_comp.c pv/pv_hdr.c pv/pv_ipib.c utils/crypto.c utils/file_utils.c \
 	pv/pv_args.c utils/buffer.c pv/pv_comps.c pv/pv_error.c \
-	pv/pv_opt_item.c \
+	pv/pv_opt_item.c utils/curl.c \
 	$(NULL)
 $(bin_PROGRAM)_OBJS := $($(bin_PROGRAM)_SRCS:.c=.o)
 
 ALL_CFLAGS += -std=gnu11 -DPKGDATADIR=$(PKGDATADIR) \
-	$(GLIB2_CFLAGS) $(LIBCRYPTO_CFLAGS) \
+	$(GLIB2_CFLAGS) $(LIBCRYPTO_CFLAGS) $(LIBCURL_CFLAGS) \
 	$(WARNINGS) \
 	$(NULL)
 ALL_CPPFLAGS += $(INCLUDE_PARMS)
-LDLIBS += $(GLIB2_LIBS) $(LIBCRYPTO_LIBS)
+LDLIBS += $(GLIB2_LIBS) $(LIBCRYPTO_LIBS) $(LIBCURL_LIBS)
 
 
 ifneq ($(shell sh -c 'command -v pkg-config'),)
@@ -40,21 +40,27 @@ GLIB2_CFLAGS := $(shell pkg-config --silence-errors --cflags glib-2.0)
 GLIB2_LIBS := $(shell pkg-config --silence-errors --libs glib-2.0)
 LIBCRYPTO_CFLAGS := $(shell pkg-config --silence-errors --cflags libcrypto)
 LIBCRYPTO_LIBS := $(shell pkg-config --silence-errors --libs libcrypto)
+LIBCURL_CFLAGS := $(shell pkg-config --silence-errors --cflags libcurl)
+LIBCURL_LIBS := $(shell pkg-config --silence-errors --libs libcurl)
 else
 GLIB2_CFLAGS := -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
 GLIB2_LIBS := -lglib-2.0
 LIBCRYPTO_CFLAGS :=
 LIBCRYPTO_LIBS := -lcrypto
+LIBCURL_CFLAGS :=
+LIBCURL_LIBS := -lcurl
 endif
 
 BUILD_TARGETS := skip-$(bin_PROGRAM)
 INSTALL_TARGETS := skip-$(bin_PROGRAM)
 ifneq (${HAVE_OPENSSL},0)
 ifneq (${HAVE_GLIB2},0)
+ifneq (${HAVE_LIBCURL},0)
 BUILD_TARGETS := $(bin_PROGRAM)
 INSTALL_TARGETS := install-$(bin_PROGRAM)
 endif
 endif
+endif
 
 all: $(BUILD_TARGETS)
 
@@ -98,4 +104,9 @@ $($(bin_PROGRAM)_OBJS): .check-dep-$(bin_PROGRAM)
 		"openssl-devel / libssl-dev version >= 1.1.0", \
 		"HAVE_OPENSSL=0", \
 		"-I.")
+	$(call check_dep, \
+		"$(bin_PROGRAM)", \
+		"curl/curl.h", \
+		"libcurl-devel", \
+		"HAVE_LIBCURL=0")
 	touch $@

genprotimg/src/genprotimg.c

@@ -18,6 +18,8 @@
 #include "common.h"
 #include "pv/pv_args.h"
 #include "pv/pv_image.h"
+#include "utils/crypto.h"
+#include "utils/curl.h"
 
 enum {
 	LOG_LEVEL_CRITICAL = 0,
@@ -117,6 +119,8 @@ static void remove_signal_handler(const gint *signals, const gsize signals_n)
 		signal(signals[i], SIG_DFL);
 }
 
+static void __attribute__((constructor)) __init(void);
+static void __attribute__((destructor)) __cleanup(void);
 gint main(gint argc, gchar *argv[])
 {
 	g_autoptr(PvArgs) args = pv_args_new();
@@ -177,5 +181,20 @@ error:
 	rmdir_recursive(tmp_dir, NULL);
 	remove_signal_handler(signals, G_N_ELEMENTS(signals));
 	g_free(tmp_dir);
+	g_clear_pointer(&img, pv_img_free);
+	g_clear_pointer(&args, pv_args_free);
 	exit(ret);
 }
+
+static void __init(void)
+{
+	pv_crypto_init();
+	if (curl_init() != 0)
+		g_abort();
+}
+
+static void __cleanup(void)
+{
+	curl_cleanup();
+	pv_crypto_cleanup();
+}

genprotimg/src/include/pv_crypto_def.h

@@ -14,6 +14,24 @@
 
 #include "lib/zt_common.h"
 
+/* IBM signing key subject */
+#define PV_IBM_Z_SUBJECT_COMMON_NAME "International Business Machines Corporation"
+#define PV_IBM_Z_SUBJECT_COUNTRY_NAME "US"
+#define PV_IBM_Z_SUBJECT_LOCALITY_NAME "Poughkeepsie"
+#define PV_IBM_Z_SUBJECT_ORGANIZATIONONAL_UNIT_NAME_SUFFIX "Key Signing Service"
+#define PV_IBM_Z_SUBJECT_ORGANIZATION_NAME "International Business Machines Corporation"
+#define PV_IBM_Z_SUBJECT_STATE "New York"
+#define PV_IMB_Z_SUBJECT_ENTRY_COUNT 6
+
+/* Minimum security level for the keys/certificates used to establish a chain of
+ * trust (see https://www.openssl.org/docs/man1.1.1/man3/X509_VERIFY_PARAM_set_auth_level.html
+ * for details).
+ */
+#define PV_CERTS_SECURITY_LEVEL 2
+
+/* SKID for DigiCert Assured ID Root CA */
+#define DIGICERT_ASSURED_ID_ROOT_CA_SKID "45EBA2AFF492CB82312D518BA7A7219DF36DC80F"
+
 union ecdh_pub_key {
 	struct {
 		uint8_t x[80];

genprotimg/src/pv/pv_args.c

@@ -18,7 +18,9 @@
 
 static gchar summary[] =
 	"Use genprotimg to create a protected virtualization kernel image file,\n"
-	"which can be loaded using zipl or QEMU.";
+	"which can be loaded using zipl or QEMU. For all certificates, revocation\n"
+	"lists, and host-key documents, both the PEM and DER input formats are\n"
+	"supported.";
 
 static gint pv_arg_compare(gconstpointer arg_1, gconstpointer arg_2)
 {
@@ -97,9 +99,14 @@ static gint pv_args_validate_options(PvArgs *args, GError **err)
 		return -1;
 	}
 
-	if (!args->no_verify) {
+	if (!args->no_verify &&
-		g_set_error(err, PV_PARSE_ERROR, PR_PARSE_ERROR_MISSING_ARGUMENT,
+	    (!args->untrusted_cert_paths ||
-			    _("Use the option '--no-verify' as the verification support is not available yet."));
+	     g_strv_length(args->untrusted_cert_paths) == 0)) {
+		g_set_error(
+			err, PV_PARSE_ERROR, PR_PARSE_ERROR_MISSING_ARGUMENT,
+			_("Either specify the IBM Z signing key and (DigiCert) intermediate CA certificate\n"
+			  "by using the '--cert' option, or use the '--no-verify' flag to disable the\n"
+			  "host-key document verification completely (at your own risk)."));
 		return -1;
 	}
 
@@ -141,6 +148,8 @@ static gboolean cb_set_string_option(const gchar *option, const gchar *value,
 {
 	gchar **args_option = NULL;
 
+	if (g_str_equal(option, "--root-ca"))
+		args_option = &args->root_ca_path;
 	if (g_str_equal(option, "-o") || g_str_equal(option, "--output"))
 		args_option = &args->output_path;
 	if (g_str_equal(option, "--x-comp-key"))
@@ -211,6 +220,18 @@ gint pv_args_parse_options(PvArgs *args, gint *argc, gchar **argv[],
 			_("FILE specifies a host-key document. At least\n" INDENT
 			  "one is required."),
 		  .arg_description = _("FILE") },
+		{ .long_name = "cert",
+		  .short_name = 'C',
+		  .flags = G_OPTION_FLAG_NONE,
+		  .arg = G_OPTION_ARG_FILENAME_ARRAY,
+		  .arg_data = &args->untrusted_cert_paths,
+		  .description = _(
+			  "FILE contains a certificate that is used to\n" INDENT
+			  "establish a chain of trust for the verification\n" INDENT
+			  "of the host-key documents. The IBM Z signing\n" INDENT
+			  "key and intermediate CA certificate (signed\n" INDENT
+			  "by the root CA) are required."),
+		  .arg_description = _("FILE") },
 		{ .long_name = "output",
 		  .short_name = 'o',
 		  .flags = G_OPTION_FLAG_FILENAME,
@@ -227,7 +248,7 @@ gint pv_args_parse_options(PvArgs *args, gint *argc, gchar **argv[],
 		  .arg_description = _("IMAGE") },
 		{ .long_name = "ramdisk",
 		  .short_name = 'r',
-		  .flags = G_OPTION_FLAG_OPTIONAL_ARG | G_OPTION_FLAG_FILENAME,
+		  .flags = G_OPTION_FLAG_FILENAME,
 		  .arg = G_OPTION_ARG_CALLBACK,
 		  .arg_data = cb_add_component,
 		  .description = _("Use RAMDISK as the initial RAM disk\n" INDENT
@@ -235,12 +256,37 @@ gint pv_args_parse_options(PvArgs *args, gint *argc, gchar **argv[],
 		  .arg_description = _("RAMDISK") },
 		{ .long_name = "parmfile",
 		  .short_name = 'p',
-		  .flags = G_OPTION_FLAG_OPTIONAL_ARG | G_OPTION_FLAG_FILENAME,
+		  .flags = G_OPTION_FLAG_FILENAME,
 		  .arg = G_OPTION_ARG_CALLBACK,
 		  .arg_data = cb_add_component,
 		  .description = _("Use the kernel parameters stored in PARMFILE\n" INDENT
 				   "(optional)."),
 		  .arg_description = _("PARMFILE") },
+		{ .long_name = "crl",
+		  .short_name = 0,
+		  .flags = G_OPTION_FLAG_NONE,
+		  .arg = G_OPTION_ARG_FILENAME_ARRAY,
+		  .arg_data = &args->crl_paths,
+		  .description = _(
+			  "FILE contains a certificate revocation list\n" INDENT
+			  "(optional)."),
+		  .arg_description = _("FILE") },
+		{ .long_name = "offline",
+		  .short_name = 0,
+		  .flags = G_OPTION_FLAG_NONE,
+		  .arg = G_OPTION_ARG_NONE,
+		  .arg_data = &args->offline,
+		  .description = _("Don't download CRLs (optional)."),
+		  .arg_description = NULL },
+		{ .long_name = "root-ca",
+		  .short_name = 0,
+		  .flags = G_OPTION_FLAG_FILENAME,
+		  .arg = G_OPTION_ARG_CALLBACK,
+		  .arg_data = cb_set_string_option,
+		  .description = _(
+			  "Set FILE as the trusted root CA and don't use the\n" INDENT
+			  "root CAs that are installed on the system (optional)."),
+		  .arg_description = _("FILE") },
 		{ .long_name = "no-verify",
 		  .short_name = 0,
 		  .flags = G_OPTION_FLAG_NONE,
@@ -378,6 +424,9 @@ void pv_args_free(PvArgs *args)
 	g_free(args->cust_root_key_path);
 	g_free(args->cust_comm_key_path);
 	g_free(args->gcm_iv_path);
+	g_free(args->root_ca_path);
+	g_strfreev(args->crl_paths);
+	g_strfreev(args->untrusted_cert_paths);
 	g_strfreev(args->host_keys);
 	g_free(args->xts_key_path);
 	g_slist_free_full(args->comps, (GDestroyNotify)pv_arg_free);

genprotimg/src/pv/pv_args.h

@@ -25,6 +25,7 @@ void pv_arg_free(PvArg *arg);
 typedef struct {
 	gint log_level;
 	gint no_verify;
+	gboolean offline;
 	gchar *pcf;
 	gchar *scf;
 	gchar *psw_addr; /* PSW address which will be used for the start of
@@ -34,6 +35,11 @@ typedef struct {
 	gchar *cust_comm_key_path;
 	gchar *gcm_iv_path;
 	gchar **host_keys;
+	gchar *root_ca_path; /* Trusted root CA used for the verification of the
+			      * chain of trust (if specified).
+			      */
+	gchar **untrusted_cert_paths;
+	gchar **crl_paths;
 	gchar *xts_key_path;
 	GSList *comps;
 	gchar *output_path;

genprotimg/src/pv/pv_error.h

@@ -28,6 +28,8 @@ typedef enum {
 	PV_ERROR_IPIB_SIZE,
 	PV_ERROR_PV_HDR_SIZE,
 	PV_ERROR_INTERNAL,
+	PV_ERROR_CURL_INIT_FAILED,
+	PV_ERROR_DOWNLOAD_FAILED,
 } PvErrors;
 
 typedef enum {
@@ -57,6 +59,31 @@ typedef enum {
 	PV_CRYPTO_ERROR_RANDOMIZATION,
 	PV_CRYPTO_ERROR_INVALID_PARM,
 	PV_CRYPTO_ERROR_INVALID_KEY_SIZE,
+	PV_CRYPTO_ERROR_INVALID_VALIDITY_PERIOD,
+	PV_CRYPTO_ERROR_EXPIRED,
+	PV_CRYPTO_ERROR_NOT_VALID_YET,
+	PV_CRYPTO_ERROR_LOAD_CRL,
+	PV_CRYPTO_ERROR_NO_PUBLIC_KEY,
+	PV_CRYPTO_ERROR_INVALID_SIGNATURE_ALGORITHM,
+	PV_CRYPTO_ERROR_SIGNATURE_ALGORITHM_MISMATCH,
+	PV_CRYPTO_ERROR_INVALID_URI,
+	PV_CRYPTO_ERROR_CRL_DOWNLOAD_FAILED,
+	PV_CRYPTO_ERROR_CERT_SIGNATURE_INVALID,
+	PV_CRYPTO_ERROR_CRL_SIGNATURE_INVALID,
+	PV_CRYPTO_ERROR_CERT_SUBJECT_ISSUER_MISMATCH,
+	PV_CRYPTO_ERROR_CRL_SUBJECT_ISSUER_MISMATCH,
+	PV_CRYPTO_ERROR_NO_IBM_Z_SIGNING_KEY,
+	PV_CRYPTO_ERROR_MALFORMED_CERTIFICATE,
+	PV_CRYPTO_ERROR_NO_CRL,
+	PV_CRYPTO_ERROR_LOAD_ROOT_CA,
+	PV_CRYPTO_ERROR_LOAD_DEFAULT_CA,
+	PV_CRYPTO_ERROR_MALFORMED_ROOT_CA,
+	PV_CRYPTO_ERROR_WRONG_CA_USED,
+	PV_CRYPTO_ERROR_SKID_AKID_MISMATCH,
+	PV_CRYPTO_ERROR_NO_ISSUER_IBM_Z_FOUND,
+	PV_CRYPTO_ERROR_FAILED_DOWNLOAD_CRL,
+	PV_CRYPTO_ERROR_NO_CRLDP,
+	PV_CRYPTO_ERROR_CERT_REVOKED,
 } PvCryptoErrors;
 
 #endif

genprotimg/src/pv/pv_image.c

@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <glib.h>
 #include <openssl/evp.h>
+#include <openssl/x509.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -138,22 +139,18 @@ static EVP_PKEY *pv_img_get_cust_pub_priv_key(gint nid, GError **err)
 	return generate_ec_key(nid, err);
 }
 
-static HostKeyList *pv_img_get_host_keys(gchar **host_cert_paths,
+static HostKeyList *pv_img_get_host_keys(GSList *host_keys_with_path, gint nid,
-					 X509_STORE *store, gint nid,
 					 GError **err)
 {
 	g_autoslist(EVP_PKEY) ret = NULL;
 
-	g_assert(host_cert_paths);
+	for (GSList *iterator = host_keys_with_path; iterator;
-
+	     iterator = iterator->next) {
-	for (gchar **iterator = host_cert_paths; iterator != NULL && *iterator != NULL;
+		x509_with_path *cert_with_path = iterator->data;
-	     iterator++) {
 		g_autoptr(EVP_PKEY) host_key = NULL;
-		const gchar *path = *iterator;
+		X509 *cert = cert_with_path->cert;
 
-		g_assert(path);
+		host_key = read_ec_pubkey_cert(cert, nid, err);
-
-		host_key = read_ec_pubkey_cert(store, nid, path, err);
 		if (!host_key)
 			return NULL;
 
@@ -253,10 +250,172 @@ static gint pv_img_set_control_flags(PvImage *img, const gchar *pcf_s,
 	return 0;
 }
 
+static gint pv_img_hostkey_verify(GSList *host_key_certs,
+				  const gchar *root_ca_path,
+				  const gchar *const *crl_paths,
+				  const gchar *const *untrusted_cert_paths,
+				  gboolean offline, GError **err)
+{
+	g_autoslist(x509_with_path) untrusted_certs_with_path = NULL;
+	g_autoptr(STACK_OF_X509) ibm_signing_certs = NULL;
+	g_autoptr(STACK_OF_X509) untrusted_certs = NULL;
+	g_autoslist(x509_pair) ibm_z_pairs = NULL;
+	g_autoptr(X509_STORE) trusted = NULL;
+	gint ibm_signing_certs_count;
+
+	/* Load trusted root CAs of the system if and only if @root_ca_path is
+	 * NULL, otherwise use the root CA specified by @root_ca_path.
+	 */
+	trusted = store_setup(root_ca_path, crl_paths, err);
+	if (!trusted)
+		goto error;
+
+	if (!offline) {
+		g_autoptr(STACK_OF_X509_CRL) downloaded_ibm_signing_crls = NULL;
+
+		/* Set up the download routine for the lookup of CRLs. */
+		store_setup_crl_download(trusted);
+
+		/* Try to download the CRLs of the IBM Z signing certificates
+		 * specified in the host-key documents. Ignore download errors
+		 * as it's still possible that a CRL is specified via command
+		 * line.
+		 */
+		downloaded_ibm_signing_crls = try_load_crls_by_certs(host_key_certs);
+
+		/* Add the downloaded CRLs to the store so they can be used for
+		 * the verification later.
+		 */
+		for (int i = 0; i < sk_X509_CRL_num(downloaded_ibm_signing_crls); i++) {
+			X509_CRL *crl = sk_X509_CRL_value(downloaded_ibm_signing_crls, i);
+
+			if (X509_STORE_add_crl(trusted, crl) != 1) {
+				g_set_error(err, PV_CRYPTO_ERROR,
+					    PV_CRYPTO_ERROR_INTERNAL,
+					    _("failed to load CRL"));
+				goto error;
+			}
+		}
+	}
+
+	/* Load all untrusted certificates (e.g. IBM Z signing key and
+	 * DigiCert intermediate CA) that are required to establish a chain of
+	 * trust starting from the host-key document up to the root CA (if not
+	 * otherwise specified that's the DigiCert Assured ID Root CA).
+	 */
+	untrusted_certs_with_path = load_certificates(untrusted_cert_paths, err);
+	if (!untrusted_certs_with_path)
+		goto error;
+
+	/* Convert to STACK_OF(X509) */
+	untrusted_certs = get_x509_stack(untrusted_certs_with_path);
+
+	/* Find all IBM Z signing keys and remove them from the chain as we
+	 * have to verify that they're valid. The last step of the chain of
+	 * trust verification must be done manually, as the IBM Z signing keys
+	 * are not marked as (intermediate) CA and therefore the standard
+	 * `X509_verify_cert` function of OpenSSL cannot be used to verify the
+	 * actual host-key documents.
+	 */
+	ibm_signing_certs = delete_ibm_signing_certs(untrusted_certs);
+	ibm_signing_certs_count = sk_X509_num(ibm_signing_certs);
+	if (ibm_signing_certs_count < 1) {
+		g_set_error(err, PV_CRYPTO_ERROR, PV_CRYPTO_ERROR_NO_IBM_Z_SIGNING_KEY,
+			    _("please specify at least one IBM Z signing key"));
+		goto error;
+	} else if (ibm_signing_certs_count > 1) {
+		g_set_error(err, PV_CRYPTO_ERROR, PV_CRYPTO_ERROR_NO_IBM_Z_SIGNING_KEY,
+			    _("please specify only one IBM Z signing key"));
+		goto error;
+	}
+
+	if (store_set_verify_param(trusted, err) < 0)
+		goto error;
+
+	/* Verify that the IBM Z signing keys are trustable.
+	 * For this we must check:
+	 *
+	 * 1. Can a chain of trust be established ending in a root CA
+	 * 2. Is the correct root CA ued? It has either to be the
+	 *    'DigiCert Assured ID Root CA' or the root CA specified via
+	 *    command line.
+	 */
+	for (gint i = 0; i < sk_X509_num(ibm_signing_certs); ++i) {
+		X509 *ibm_signing_cert = sk_X509_value(ibm_signing_certs, i);
+		g_autoptr(STACK_OF_X509_CRL) ibm_signing_crls = NULL;
+		g_autoptr(X509_STORE_CTX) ctx = NULL;
+		x509_pair *pair = NULL;
+
+		g_assert(ibm_signing_cert);
+
+		/* Create the verification context and set the trusted
+		 * and chain parameters.
+		 */
+		ctx = create_store_ctx(trusted, untrusted_certs, err);
+		if (!ctx)
+			goto error;
+
+		/* Verify the IBM Z signing key */
+		if (verify_cert(ibm_signing_cert, ctx, err) < 0)
+			goto error;
+
+		/* Verify the build chain of trust chain. If the user passes a
+		 * trusted root CA on the command line then the check for the
+		 * Subject Key Identifier (SKID) is skipped, otherwise let's
+		 * check if the SKID meets our expectation.
+		 */
+		if (!root_ca_path &&
+		    check_chain_parameters(X509_STORE_CTX_get0_chain(ctx),
+					   get_digicert_assured_id_root_ca_skid(),
+					   err) < 0) {
+			goto error;
+		}
+
+		ibm_signing_crls = store_ctx_find_valid_crls(ctx, ibm_signing_cert, err);
+		if (!ibm_signing_crls) {
+			g_prefix_error(err, _("IBM Z signing key: "));
+			goto error;
+		}
+
+		/* Increment reference counter of @ibm_signing_cert as the
+		 * certificate will now also be owned by @ibm_z_pairs.
+		 */
+		if (X509_up_ref(ibm_signing_cert) != 1)
+			g_abort();
+
+		pair = x509_pair_new(&ibm_signing_cert, &ibm_signing_crls);
+		ibm_z_pairs = g_slist_append(ibm_z_pairs, pair);
+		g_assert(!ibm_signing_cert);
+		g_assert(!ibm_signing_crls);
+	}
+
+	/* Verify host-key documents by using the IBM Z signing
+	 * certificates and the corresponding certificate revocation
+	 * lists.
+	 */
+	for (GSList *iterator = host_key_certs; iterator; iterator = iterator->next) {
+		x509_with_path *host_key_with_path = iterator->data;
+		const gchar *host_key_path = host_key_with_path->path;
+		X509 *host_key = host_key_with_path->cert;
+		gint flags = X509_V_FLAG_CRL_CHECK;
+
+		if (verify_host_key(host_key, ibm_z_pairs, flags,
+				    PV_CERTS_SECURITY_LEVEL, err) < 0) {
+			g_prefix_error(err, "'%s': ", host_key_path);
+			goto error;
+		}
+	}
+
+	return 0;
+error:
+	g_prefix_error(err, _("Failed to verify host-key document: "));
+	return -1;
+}
+
 /* read in the keys or auto-generate them */
 static gint pv_img_set_keys(PvImage *img, const PvArgs *args, GError **err)
 {
-	g_autoptr(X509_STORE) store = NULL;
+	g_autoslist(x509_with_path) host_key_certs = NULL;
 
 	g_assert(img->xts_cipher);
 	g_assert(img->cust_comm_cipher);
@@ -285,8 +444,25 @@ static gint pv_img_set_keys(PvImage *img, const PvArgs *args, GError **err)
 	if (!img->cust_pub_priv_key)
 		return -1;
 
+	/* Load all host-key documents specified on the command line */
+	host_key_certs = load_certificates((const gchar **)args->host_keys,
+					   err);
+	if (!host_key_certs)
+		return -1;
+
+	if (!args->no_verify &&
+	    pv_img_hostkey_verify(host_key_certs, args->root_ca_path,
+				  (const gchar * const *)args->crl_paths,
+				  (const gchar * const *)args->untrusted_cert_paths,
+				  args->offline, err) < 0) {
+		return -1;
+	}
+
+	/* Loads the public keys stored in the host-key documents and verify
+	 * that the correct elliptic curve is used.
+	 */
 	img->host_pub_keys =
-		pv_img_get_host_keys(args->host_keys, store, img->nid, err);
+		pv_img_get_host_keys(host_key_certs, img->nid, err);
 	if (!img->host_pub_keys)
 		return -1;
 
@@ -406,6 +582,9 @@ PvImage *pv_img_new(PvArgs *args, const gchar *stage3a_path, GError **err)
 	if (args->no_verify)
 		g_warning(_("host-key document verification is disabled. Your workload is not secured."));
 
+	if (args->root_ca_path)
+		g_warning(_("A different root CA than the default DigiCert root CA is selected. Ensure that this root CA is trusted."));
+
 	ret->comps = pv_img_comps_new(EVP_sha512(), EVP_sha512(), EVP_sha512(), err);
 	if (!ret->comps)
 		return NULL;

genprotimg/src/utils/crypto.h

@@ -11,14 +11,18 @@
 #define PV_UTILS_CRYPTO_H
 
 #include <glib.h>
+#include <openssl/asn1.h>
 #include <openssl/bio.h>
 #include <openssl/bn.h>
 #include <openssl/ec.h>
 #include <openssl/ecdh.h>
 #include <openssl/evp.h>
+#include <openssl/ossl_typ.h>
 #include <openssl/rand.h>
+#include <openssl/safestack.h>
 #include <openssl/sha.h>
 #include <openssl/x509.h>
+#include <openssl/x509v3.h>
 #include <stdint.h>
 
 #include "common.h"
@@ -33,6 +37,9 @@
 #define AES_256_XTS_TWEAK_SIZE 16
 #define AES_256_XTS_KEY_SIZE   64
 
+#define CRL_DOWNLOAD_TIMEOUT_MS 3000
+#define CRL_DOWNLOAD_MAX_SIZE	(1024 * 1024) /* in bytes */
+
 enum PvCryptoMode {
 	PV_ENCRYPT,
 	PV_DECRYPT,
@@ -40,7 +47,34 @@ enum PvCryptoMode {
 
 typedef GSList HostKeyList;
 
+/* play nice with g_autoptr */
+typedef STACK_OF(DIST_POINT) STACK_OF_DIST_POINT;
+typedef STACK_OF(X509) STACK_OF_X509;
+typedef STACK_OF(X509_CRL) STACK_OF_X509_CRL;
+
+void STACK_OF_DIST_POINT_free(STACK_OF_DIST_POINT *stack);
+void STACK_OF_X509_free(STACK_OF_X509 *stack);
+void STACK_OF_X509_CRL_free(STACK_OF_X509_CRL *stack);
+
+typedef struct {
+	X509 *cert;
+	const gchar *path;
+} x509_with_path;
+
+x509_with_path *x509_with_path_new(X509 *cert, const gchar *path);
+void x509_with_path_free(x509_with_path *cert);
+
+typedef struct {
+	X509 *cert;
+	STACK_OF_X509_CRL *crls;
+} x509_pair;
+
+x509_pair *x509_pair_new(X509 **cert, STACK_OF_X509_CRL **crls);
+void x509_pair_free(x509_pair *pair);
+
 /* Register auto cleanup functions */
+WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(ASN1_INTEGER, ASN1_INTEGER_free)
+WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(ASN1_OCTET_STRING, ASN1_OCTET_STRING_free)
 WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(BIGNUM, BN_free)
 WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(BIO, BIO_free_all)
 WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(BN_CTX, BN_CTX_free)
@@ -51,10 +85,18 @@ WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(EVP_CIPHER_CTX, EVP_CIPHER_CTX_free)
 WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(EVP_MD_CTX, EVP_MD_CTX_free)
 WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(EVP_PKEY, EVP_PKEY_free)
 WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(EVP_PKEY_CTX, EVP_PKEY_CTX_free)
+WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(STACK_OF_DIST_POINT, STACK_OF_DIST_POINT_free);
+WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(STACK_OF_X509, STACK_OF_X509_free);
+WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(STACK_OF_X509_CRL, STACK_OF_X509_CRL_free);
 WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(X509, X509_free)
+WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(X509_CRL, X509_CRL_free)
 WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(X509_LOOKUP, X509_LOOKUP_free)
+WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(X509_NAME, X509_NAME_free)
+WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(x509_pair, x509_pair_free)
 WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(X509_STORE, X509_STORE_free)
 WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(X509_STORE_CTX, X509_STORE_CTX_free)
+WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(X509_VERIFY_PARAM, X509_VERIFY_PARAM_free)
+WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(x509_with_path, x509_with_path_free)
 
 union cmp_index {
 	struct {
@@ -79,8 +121,37 @@ struct cipher_parms {
 	const Buffer *iv_or_tweak;
 };
 
-EVP_PKEY *read_ec_pubkey_cert(X509_STORE *store, gint nid, const gchar *path,
+int check_crl_valid_for_cert(X509_CRL *crl, X509 *cert,
-			      GError **err);
+			     gint verify_flags, GError **err);
+void pv_crypto_init(void);
+void pv_crypto_cleanup(void);
+const ASN1_OCTET_STRING *get_digicert_assured_id_root_ca_skid(void);
+gint verify_host_key(X509 *host_key, GSList *issuer_pairs,
+		     gint verify_flags, int level, GError **err);
+X509 *load_cert_from_file(const char *path, GError **err);
+X509_CRL *load_crl_from_file(const gchar *path, GError **err);
+GSList *load_certificates(const gchar *const *cert_paths, GError **err);
+STACK_OF_X509 *get_x509_stack(const GSList *x509_with_path_list);
+X509_STORE *store_setup(const gchar *root_ca_path,
+			const gchar * const *crl_paths,
+			GError **err);
+int store_set_verify_param(X509_STORE *store, GError **err);
+X509_CRL *load_crl_by_cert(X509 *cert, GError **err);
+STACK_OF_X509_CRL *try_load_crls_by_certs(GSList *certs_with_path);
+gint check_chain_parameters(const STACK_OF_X509 *chain,
+			    const ASN1_OCTET_STRING *skid, GError **err);
+X509_NAME *c2b_name(const X509_NAME *name);
+
+STACK_OF_X509 *delete_ibm_signing_certs(STACK_OF_X509 *certs);
+STACK_OF_X509_CRL *store_ctx_find_valid_crls(X509_STORE_CTX *ctx, X509 *cert,
+					     GError **err);
+X509_STORE_CTX *create_store_ctx(X509_STORE *trusted, STACK_OF_X509 *chain,
+				 GError **err);
+gint verify_cert(X509 *cert, X509_STORE_CTX *ctx, GError **err);
+X509_CRL *get_first_valid_crl(X509_STORE_CTX *ctx, X509 *cert, GError **err);
+void store_setup_crl_download(X509_STORE *st);
+EVP_PKEY *read_ec_pubkey_cert(X509 *cert, gint nid, GError **err);
+
 Buffer *compute_exchange_key(EVP_PKEY *cust, EVP_PKEY *host, GError **err);
 Buffer *generate_aes_key(guint size, GError **err);
 Buffer *generate_aes_iv(guint size, GError **err);

genprotimg/src/utils/curl.c

@@ -0,0 +1,121 @@
+/*
+ * Libcurl utils
+ *
+ * Copyright IBM Corp. 2020
+ *
+ * s390-tools is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#include <stdio.h>
+#include <glib.h>
+#include <glib/gtypes.h>
+#include <curl/curl.h>
+
+#include "lib/zt_common.h"
+#include "pv/pv_error.h"
+
+#include "curl.h"
+
+struct UserData {
+	GByteArray *buffer;
+	guint max_size;
+};
+
+static size_t write_callback(char *ptr, size_t size, size_t nmemb, void *userdata)
+{
+	g_assert(userdata);
+	struct UserData *data = (struct UserData *)userdata;
+	GByteArray *buffer = data->buffer;
+	guint64 actual_size;
+	size_t err;
+
+	g_assert(buffer);
+
+	if (!g_uint64_checked_mul(&actual_size, size, nmemb))
+		g_abort();
+
+	/* Signal an error condition by returning a amount that differs
+	 * from the amount passed to the callback. This results in a
+	 * CURLE_WRITE_ERROR.
+	 */
+	err = actual_size + 1;
+
+	if (actual_size > G_MAXUINT)
+		return err;
+
+	data->buffer = g_byte_array_append(buffer, (guchar *)ptr, (guint)actual_size);
+	if (data->buffer->len > data->max_size)
+		return err;
+
+	return actual_size;
+}
+
+gint curl_init(void)
+{
+	if (curl_global_init(CURL_GLOBAL_ALL) != 0)
+		return -1;
+	return 0;
+}
+
+void curl_cleanup(void)
+{
+	curl_global_cleanup();
+}
+
+GByteArray *curl_download(const gchar *url, long timeout_ms, guint max_size,
+			  GError **err)
+{
+	g_autoptr(GByteArray) ret = NULL;
+	g_autoptr(CURL) handle = NULL;
+	g_autofree gchar *agent = NULL;
+	struct UserData userdata;
+	CURLcode rc;
+
+	/* set up curl session */
+	handle = curl_easy_init();
+	if (!handle)
+		g_abort();
+
+	/* follow redirection */
+	rc = curl_easy_setopt(handle, CURLOPT_FOLLOWLOCATION, 1l);
+	if (rc != CURLE_OK)
+		goto curl_err;
+	rc = curl_easy_setopt(handle, CURLOPT_TIMEOUT_MS, timeout_ms);
+	if (rc != CURLE_OK)
+		goto curl_err;
+	rc = curl_easy_setopt(handle, CURLOPT_NOSIGNAL, 1l);
+	if (rc != CURLE_OK)
+		goto curl_err;
+	agent = g_strdup_printf("%s/%s", tool_name, RELEASE_STRING);
+	rc = curl_easy_setopt(handle, CURLOPT_USERAGENT, agent);
+	if (rc != CURLE_OK)
+		goto curl_err;
+	rc = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, write_callback);
+	if (rc != CURLE_OK)
+		goto curl_err;
+	ret = g_byte_array_new();
+	userdata.buffer = ret;
+	userdata.max_size = max_size;
+	rc =  curl_easy_setopt(handle, CURLOPT_WRITEDATA, (void *)&userdata);
+	if (rc != CURLE_OK)
+		goto curl_err;
+	rc =  curl_easy_setopt(handle, CURLOPT_URL, url);
+	if (rc != CURLE_OK)
+		goto curl_err;
+
+	rc = curl_easy_perform(handle);
+	if (rc != CURLE_OK) {
+		g_set_error(err, PV_ERROR, PV_ERROR_DOWNLOAD_FAILED,
+			    _("download failed: %s"), curl_easy_strerror(rc));
+		return NULL;
+	}
+
+	return g_steal_pointer(&ret);
+curl_err:
+	g_set_error(err, PV_ERROR,
+		    PV_ERROR_CURL_INIT_FAILED,
+		    _("cURL initialization failed: %s"),
+		    curl_easy_strerror(rc));
+	return NULL;
+}

genprotimg/src/utils/curl.h

@@ -0,0 +1,25 @@
+/*
+ * Libcurl utils
+ *
+ * Copyright IBM Corp. 2020
+ *
+ * s390-tools is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef PV_UTILS_LIBCURL_H
+#define PV_UTILS_LIBCURL_H
+
+#include <glib.h>
+#include <curl/curl.h>
+
+#include "common.h"
+
+WRAPPED_G_DEFINE_AUTOPTR_CLEANUP_FUNC(CURL, curl_easy_cleanup)
+
+GByteArray *curl_download(const gchar *url, long timeout_ms, guint max_size,
+			  GError **err);
+gint curl_init(void);
+void curl_cleanup(void);
+
+#endif /* PV_UTILS_LIBCURL_H */

hsci/Makefile

@@ -0,0 +1,16 @@
+include ../common.mak
+
+all:
+
+install: hsci
+	$(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
+	< hsci >$(DESTDIR)$(BINDIR)/hsci; \
+	chown $(OWNER).$(GROUP) $(DESTDIR)$(BINDIR)/hsci; \
+	chmod 755 $(DESTDIR)$(BINDIR)/hsci; \
+	$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man8
+	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 hsci.8 \
+		$(DESTDIR)$(MANDIR)/man8
+
+clean:
+
+.PHONY: all install clean

hsci/hsci

@@ -0,0 +1,436 @@
+#!/bin/bash
+#
+# hsci - Tool to manage HiperSockets Converged Interfaces (HSCI)
+#
+# Copyright IBM Corp. 2020
+#
+# s390-tools is free software; you can redistribute it and/or modify
+# it under the terms of the MIT license. See LICENSE for details.
+#
+
+hsdev=""
+ndev=""
+hsci=""
+hsdev_mac=""
+hsif_pnetid=""
+netif_pnetid=""
+hsci_pnetid=""
+
+function usage {
+cat <<-EOD
+Usage: hsci COMMAND [OPTION]
+
+This tool is designed to control and show HSCI (HiperSockets Converged
+Interfaces) settings. A HiperSockets interface and an external network
+interface are converged into an HSCI interface.
+
+COMMANDS
+        add HIPERSOCKETS_DEV NET_DEV    Adds an HSCI interface
+        del HSCI_NAME                   Deletes an HSCI interface
+        show                            Lists the configured HSCI interfaces
+
+OPTIONS:
+        -v, --version                   Prints the version number of the hsci tool and exits
+        -h, --help                      Displays the help information for the command
+EOD
+}
+
+function prereqs_check {
+	if ! [ -x "$(command -v ip)" ]; then
+		echo "Error: No iproute2 installed on this system" >&2
+		return 1
+	fi
+}
+
+function check_pnetids {
+	# get PNETID of the HS
+	local hsif_pnetids=""
+	local netif_pnetids=""
+
+	if [ -e /sys/class/net/$hsdev/device/util_string ]; then
+		hsif_pnetids="$(cat /sys/class/net/$hsdev/device/util_string | tr -d '\000' | iconv -f IBM-1047 -t ASCII)"
+	else
+		if [ -e /sys/class/net/$hsdev/device/chpid ]; then
+			chpid="$(cat /sys/class/net/$hsdev/device/chpid | tr [:upper:] [:lower:])"
+			hsif_pnetids="$(cat /sys/devices/css0/chp0.$chpid/util_string | tr -d '\000' | iconv -f IBM-1047 -t ASCII)"
+		fi
+	fi
+	if [ "$hsif_pnetids" != "" ]; then
+		port_hsif="$(cat /sys/class/net/$hsdev/dev_port)"
+		(( idx=16*$port_hsif+1 ))
+		(( end=$idx+15 ))
+		hsif_pnetid="$(echo "$hsif_pnetids" | cut -c $idx-$end | tr -d ' ')"
+	fi
+
+	# get PNETID of the NET_DEV
+	if [ -e /sys/class/net/$ndev/device/util_string ]; then
+		netif_pnetids="$(cat /sys/class/net/$ndev/device/util_string | tr -d '\000' | iconv -f IBM-1047 -t ASCII)"
+	else
+		if [ -e /sys/class/net/$ndev/device/chpid ]; then
+			chpid="$(cat /sys/class/net/$ndev/device/chpid | tr [:upper:] [:lower:])"
+			netif_pnetids="$(cat /sys/devices/css0/chp0.$chpid/util_string | tr -d '\000' | iconv -f IBM-1047 -t ASCII)"
+		fi
+	fi
+	if [ "$netif_pnetids" != "" ]; then
+		port_netif="$(cat /sys/class/net/$ndev/dev_port)"
+		(( idx=16*$port_netif+1 ))
+		(( end=$idx+15 ))
+		netif_pnetid="$(echo "$netif_pnetids" | cut -c $idx-$end | tr -d ' ')"
+	fi
+
+	#Check PNETIDs
+	if [ "$hsif_pnetid" != "" ] && [ "$netif_pnetid" != "" ] && [ "$netif_pnetid" != "$hsif_pnetid" ]; then
+		echo "Error: $hsdev and $ndev have different PNETIDs! They are $hsif_pnetid and $netif_pnetid respectively" >&2
+		return 1
+	fi
+
+	if [ "$hsif_pnetid" != "" ] && [ "$netif_pnetid" != "" ] && [ "$netif_pnetid" == "$hsif_pnetid" ]; then
+		hsci_pnetid=$hsif_pnetid
+	fi
+}
+
+function verify_precon {
+	echo "Verifying net dev $ndev and HiperSockets dev $hsdev"
+
+	if [ ! -e /sys/class/net/$hsdev ]; then
+		echo "Error: $hsdev does not exist" >&2
+		return 1
+	fi
+	if [ "$(cat /sys/class/net/$hsdev/device/card_type)" != "HiperSockets" ]; then
+		echo "Error: $hsdev is not a HiperSockets device" >&2
+		return 1
+	fi
+	if [ "$(cat /sys/class/net/$hsdev/device/layer2)" != "1" ]; then
+		echo "Error: $hsdev is not in layer 2 mode" >&2
+		return 1
+	fi
+	if [ ! -e /sys/class/net/$hsdev/device/vnicc/bridge_invisible ]; then
+		echo "Error: Missing vnic-characteristics support" >&2
+		return 1
+	fi
+	if [ "$(cat /sys/class/net/$hsdev/device/vnicc/bridge_invisible)" == "n/a" ]; then
+		echo "Error: $hsdev does not support vnicc" >&2
+		return 1
+	fi
+	if [ $(ip link show $hsdev | grep UP | wc -l) -eq 0 ]; then
+		echo "Error: $hsdev is not in state UP" >&2
+		return 1
+	fi
+	if [ $(bridge -d link show dev $hsdev self | grep learning_sync | wc -l) -eq 0 ]; then
+		echo "Error: $hsdev does not support attribute learning_sync" >&2
+		return 1
+	fi
+	if [ $(ip link show $hsdev | grep master | wc -l) -ne 0 ]; then
+		echo "Error: $hsdev is already a bridge port" >&2
+		return 1
+	fi
+
+	#Pre-verify net_dev
+	if [ ! -e /sys/class/net/$ndev ]; then
+		echo "Error: $ndev does not exist" >&2
+		return 1
+	fi
+	if [ "$(cat /sys/class/net/$ndev/device/card_type)" == "HiperSockets" ]; then
+		echo "Error: $ndev is also a HiperSockets device" >&2
+		return 1
+	fi
+	if [ $(ip link show $ndev | grep UP | wc -l) -eq 0 ]; then
+		echo "Error: $ndev is not in state UP" >&2
+		return 1
+	fi
+	if [ $(ip link show $ndev | grep master | wc -l) -ne 0 ]; then
+		echo "Error: $ndev is already a bridge port" >&2
+		return 1
+	fi
+
+	#Check PNETIDs
+	check_pnetids
+	if [ $? -ne 0 ]; then
+		return 1
+	fi
+
+	return 0
+}
+
+function clean_up {
+	bridge link set dev $hsdev learning_sync off self >/dev/null 2>&1
+	echo 0 > /sys/class/net/$hsdev/device/vnicc/bridge_invisible >/dev/null 2>&1
+	bridge fdb del $hsdev_mac dev $ndev >/dev/null 2>&1
+	ip link del $hsci >/dev/null 2>&1
+}
+
+##############################################################################
+##	add a new HSCI interface
+##############################################################################
+function add_hsci {
+
+	if [ $# != 2 ]; then
+		echo "hsci: Invalid parameters" >&2
+		echo "Use 'hsci --help' for more information" >&2
+		return 1
+	fi
+	hsdev=$1
+	ndev=$2
+
+	#### Verify preconditions
+	verify_precon
+	if [ $? -ne 0 ]; then
+		return 1
+	fi
+
+	hsci_postfix="$(readlink /sys/class/net/$hsdev/device/cdev0 | tail -c5)"
+	hsci=hsci$hsci_postfix
+
+	echo "Adding $hsci with a HiperSockets dev $hsdev and an external dev $ndev"
+
+	#### Create bridge
+	ip link add name $hsci type bridge stp_state 0 >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "Error: Could not create a bridge" >&2
+		return 1
+	fi
+
+	#### Prepare hsdev
+	# Set VNICC of hsdev to invisible
+	#(mandatory for co-existence with HS-OSA bridges!)
+	echo 1 > /sys/class/net/$hsdev/device/vnicc/bridge_invisible
+
+	#### Create bridge ports
+	ip link set dev $ndev master $hsci >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "Error: Could not set master for $ndev" >&2
+		clean_up
+		return 1
+	fi
+	ip link set dev $hsdev master $hsci >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "Error: Could not set master for $hsdev" >&2
+		clean_up
+		return 1
+	fi
+
+	# no forwarding between ndev and hsdev -> isolated on
+	# ndev is default for outgoing unknown targets -> flood on
+	# no need to learn external LAN targets into fdb -> learning off
+	bridge link set dev $ndev isolated on learning off flood on mcast_flood on >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "Error: Failed to set bridge attributes on $ndev" >&2
+		clean_up
+		return 1
+	fi
+
+	# no forwarding between ndev and hsdev -> isolated on
+	# fdb will be populated by dev-to-bridge-notification, no need to learn
+	#	-> learning off
+	# only send to hsdev, if listed in fdb -> flood off
+	# don't send MC/BC on hsdev -> mcast_flood off
+	bridge link set dev $hsdev isolated on learning off flood off mcast_flood off >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "Error: Failed to set bridge attributes on $hsdev" >&2
+		clean_up
+		return 1
+	fi
+
+	# NOTE: Although not required, BCs will be sent out on hsdev.
+	# NOTE: We need to receive BCs on hsdev, as z/OS HSCI does ARP requests on HS.
+
+	hsdev_mac="$(cat /sys/class/net/$hsdev/address)"
+	echo "Set $hsdev MAC $hsdev_mac on $ndev and $hsci"
+
+	# set HS MAC on OSA as secondary MAC
+	bridge fdb add $hsdev_mac dev $ndev >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "Error: Failed to set HS MAC on OSA as secondary MAC" >&2
+		clean_up
+		return 1
+	fi
+
+	# set HS MAC (common MAC) on HSCI as primary MAC
+	ip link set address $hsdev_mac dev $hsci >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "Error: Failed to set HiperSockets MAC (common MAC) on HSCI as primary MAC" >&2
+		clean_up
+		return 1
+	fi
+
+	ip link set dev $hsci up >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "Error: Failed to set $hsci up" >&2
+		clean_up
+		return 1
+	fi
+
+	# Turn on device for bridge notification
+	bridge link set dev $hsdev learning_sync on self >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "Error: Failed to turn on device for bridge notification" >&2
+		clean_up
+		return 1
+	fi
+	echo "Successfully added HSCI interface $hsci"
+	return 0
+}
+
+##############################################################################
+##	Delete HSCI
+##############################################################################
+
+function del_hsci {
+	if [ $# != 1 ]; then
+		echo "hsci: invalid parameters" >&2
+		echo "Use 'hsci --help' for more information" >&2
+		return 1
+	fi
+	hsci=$1
+	if [ $(ip link show dev $hsci | wc -l) -eq 0 ]; then
+		echo "Error: $hsci does not exit" >&2
+		return 1
+	fi
+	if [ $(ip link show | grep "master $hsci" | wc -l) -eq 0 ]; then
+		echo "Error: $hsci is not an active HSCI interface" >&2
+		return 1
+	fi
+
+	bports="$(ip link show | grep "master $hsci" | awk '{print $2}')"
+	for bport in $bports; do
+		bport=${bport%:}
+			if [[ $bport == *@* ]]; then
+				bport=${bport%@*}
+			fi
+		if [ $(bridge -d link show dev $bport | grep "learning_sync on" | wc -l) -ne 0 ]; then
+			hsdev=$bport
+		else
+			ndev=$bport
+		fi
+	done
+	if [ "$hsdev" == "" ]; then
+		echo "Error: $hsci has no active HiperSockets port" >&2
+		return 1
+	fi
+	echo "Deleting HSCI interface $hsci with the HiperSockets $hsdev and the external $ndev"
+
+	bridge link set dev $hsdev learning_sync off self >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "Error: Failed to turn off learning_sync on $hsdev" >&2
+		return 1
+	fi
+	echo 0 > /sys/class/net/$hsdev/device/vnicc/bridge_invisible
+
+	hsdev_mac="$(cat /sys/class/net/$hsdev/address)"
+	echo "Deleting $hsev MAC $hsdev_mac on $ndev"
+	bridge fdb del $hsdev_mac dev $ndev >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "Error: Failed to delete $hsev MAC $hsdev_mac on $ndev" >&2
+		return 1
+	fi
+
+	ip link del $hsci >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		echo "Error: Failed to delete $hsci" >&2
+		return 1
+	fi
+	echo "Successfully deleted device $hsci"
+
+	return 0
+}
+
+##############################################################################
+##	Show HSCI
+##############################################################################
+
+function list_active {
+	hsdev=$1
+	local ext=""
+
+	hsci="$(ip link show dev $hsdev | awk '{for(x=1;x<NF;x++) if($x~/master/) print $(x+1)}')"
+	ext="$(ip link show | grep "master $hsci" | grep --invert-match $hsdev | awk '{print $2}')"
+	# remove trailing ':'
+	ndev="${ext%:}"
+
+	check_pnetids
+
+	printf '%-8s  %-16s  %-15s  %-15s\n' "$hsci" "$hsci_pnetid" "$hsdev" "$ndev"
+
+	return 0
+}
+
+function print_header {
+	if [ $header -eq 0 ]; then
+		echo "HSCI      PNET_ID           HiperSockets     External       "
+		echo "------------------------------------------------------------"
+	fi
+}
+
+function list_one {
+	local hsnetdev=$1
+
+	if [ $(bridge -d link show dev $hsnetdev | grep	 "learning_sync on" | wc -l) -ne 0 ]; then
+		print_header
+		list_active $hsnetdev
+	fi
+
+	return 0
+}
+
+function show_hsci {
+	if [ $# != 0 ]; then
+		echo "hsci: invalid parameters" >&2
+		echo "Use 'hsci --help' for more information" >&2
+		return 1
+	fi
+	header=0
+
+	for hs_net_dev in $(ls -1 /sys/class/net/); do
+		list_one $hs_net_dev
+	done
+
+	return 0
+}
+
+#==============================================================================
+
+function print_version()
+{
+	echo "hsci utility: version %S390_TOOLS_VERSION%"
+	echo "Copyright IBM Corp. 2020"
+}
+
+##############################################################################
+##### Main
+##############################################################################
+prereqs_check
+
+args="$(getopt -u -o hv -l help,version -- $*)"
+[ $? -ne 0 ] && exit 2
+set -- $args
+while true; do
+	case $1 in
+		-v | --version)
+			print_version
+			exit 0
+			;;
+		-h | --help)
+			usage
+			exit 0
+			;;
+		--)
+			;;
+		add)	shift
+			add_hsci "$@"
+			exit $?
+			;;
+		del)	shift
+			del_hsci "$@"
+			exit $?
+			;;
+		show)	shift
+			show_hsci "$@"
+			exit $?
+			;;
+		*)	echo "hsci: Please specify a valid command or option" >&2
+			echo "Use 'hsci --help' for more information" >&2
+			exit 1
+	esac
+	shift
+done
+

hsci/hsci.8

@@ -0,0 +1,100 @@
+.\" Copyright IBM Corp. 2020
+
+.TH HSCI 8 "November 2020" "s390-tools" "Linux Programmer's Manual"
+
+
+.SH NAME
+.B hsci
+\- control and show HSCI settings.
+
+
+.SH SYNOPSIS
+.B hsci add
+.I HSDEV
+.I NETDEV
+.br
+.B hsci del
+.I HSCINAME
+.br
+.B hsci show
+.br
+.B hsci [\-hv]
+
+.SH DESCRIPTION
+.BI hsci
+is used to control and show HSCI (HiperSockets Converged Interfaces) settings. A HiperSockets interface and an external network interface are converged into an HSCI interface.
+
+.SH COMMANDS
+.TP
+.B add \fIHSDEV\fR \fINETDEV\fR
+.RS .4i
+.PP
+Adds an HSCI interface
+.PP
+.I HSDEV
+is the interface name of the HiperSockets device to be converged into the HSCI interface.
+.PP
+.I NETDEV
+is the interface name of the external network device to be converged into the HSCI interface.
+.RE
+
+.TP
+.B del \fIHSCINAME\fR
+.RS .4i
+.PP
+Deletes an HSCI interface
+.PP
+.I HSCINAME
+is the name of the HSCI interface for the HiperSockets device and the external network device.
+.RE
+
+.TP
+.B show
+.RS .4i
+.PP
+Lists the configured HSCI interfaces.
+.RE
+
+.SH OPTIONS
+.TP
+.BR \-v ", " \-\-version
+Prints the version number of hsci and exits.
+.TP
+.BR \-h ", " \-\-help
+Displays the help information for the command.
+
+.SH EXIT CODES
+.TP
+.BR "0"
+The hsci command ran successfully.
+
+.TP
+.BR "1"
+An error occurred.
+
+.SH EXAMPLE
+.BR "hsci show"
+.TP
+.RB
+Lists the configured HSCI interfaces:
+.RS 1.2i
+
+HSCI      PNET_ID  HiperSockets  External
+.br
+-----------------------------------------
+.br
+hsci8410  NET1     enc8410       encb040
+
+.RE
+
+.SH SEE ALSO
+.nf
+ip(8), bridge(8)
+.fi
+
+.SH AUTHOR
+.nf
+Written by Alexandra Winter <wintera@linux.ibm.com>
+           Wenjia Zhang <wenjia@linux.ibm.com>
+.fi
+

include/boot/s390.h

@@ -286,6 +286,7 @@ enum diag308_subcode {
 
 enum diag308_rc {
 	DIAG308_RC_OK	      = 0x0001,
+	DIAG308_RC_NO_CONF    = 0x0102,
 };
 
 static __always_inline unsigned long diag308(unsigned long subcode, void *addr)

include/lib/libzds.h

@@ -191,6 +191,8 @@
 #define ENDTOKEN 0xFFFFFFFFFFFFFFFFULL
 
 
+#define MAX_LINE_LENGTH 512
+#define MAX_SERVER 3
 
 /**
  * @brief This structure represents the count field in an ECKD record.
@@ -854,6 +856,7 @@ int lzds_zdsroot_extract_datasets_from_dasd(struct zdsroot *root,
 
 void lzds_dslist_free(struct zdsroot *root);
 
+int lzds_ping_rest(struct dshandle *dsh, char *server);
 
 /** @} */ /* end of group libzds_functions_high */
 
@@ -878,6 +881,8 @@ int lzds_analyse_open_count(struct zdsroot *root, int warn);
 /** @} */ /* end of group libzds_functions_helper */
 
 
-
+int lzds_rest_get_enq(struct dshandle *dsh, char *server);
+int lzds_rest_release_enq(struct dshandle *dsh, char *server);
+int lzds_rest_ping(struct dshandle *dsh, char *server);
 
 #endif /* LIB_LIBZDS_H */

include/lib/util_file.h

@@ -12,8 +12,10 @@
 #define LIB_UTIL_FILE_H
 
 int util_file_read_line(char *str, size_t size, const char *fmt, ...);
+int util_file_read_i(int *val, int base, const char *fmt, ...);
 int util_file_read_l(long *val, int base, const char *fmt, ...);
 int util_file_read_ll(long long *val, int base, const char *fmt, ...);
+int util_file_read_ui(unsigned int *val, int base, const char *fmt, ...);
 int util_file_read_ul(unsigned long *val, int base, const char *fmt, ...);
 int util_file_read_ull(unsigned long long *val, int base, const char *fmt, ...);
 
@@ -23,4 +25,5 @@ int util_file_write_ll(long long val, int base, const char *fmt, ...);
 int util_file_write_ul(unsigned long val, int base, const char *fmt, ...);
 int util_file_write_ull(unsigned long long val, int base, const char *fmt, ...);
 
+int util_file_read_va(const char *path, const char *fmt, ...);
 #endif /** LIB_UTIL_FILE_H @} */

include/lib/util_sys.h

@@ -12,6 +12,11 @@
 #ifndef LIB_UTIL_SYS_H
 #define LIB_UTIL_SYS_H
 
+#include <stdbool.h>
+
 int util_sys_get_dev_addr(const char *dev, char *addr);
+bool util_sys_dev_is_partition(dev_t dev);
+int util_sys_get_partnum(dev_t dev);
+int util_sys_get_base_dev(dev_t dev, dev_t *base_dev);
 
 #endif /** LIB_UTIL_SYS_H @} */

ipl_tools/Makefile

@@ -4,9 +4,7 @@ libs = $(rootdir)/libutil/libutil.a
 
 all: chreipl lsreipl chshut lsshut
 
-libs =	$(rootdir)/libutil/libutil.a
+objects = main.o ccw.o fcp.o nvme.o system.o shutdown.o \
-
-objects = main.o ccw.o fcp.o system.o shutdown.o \
 	  cmd_lsshut.o cmd_chshut.o cmd_lsreipl.o cmd_chreipl.o proc.o
 
 chreipl: $(objects) $(libs)

ipl_tools/cmd_chreipl.c

@@ -28,12 +28,14 @@ enum target_type {
 	TT_FCP,
 	TT_NSS,
 	TT_NODE,
+	TT_NVME,
 };
 
 enum reipl_type {
 	REIPL_FCP,
 	REIPL_CCW,
-	REIPL_NSS
+	REIPL_NSS,
+	REIPL_NVME,
 };
 
 static const char *const usage_chreipl =
@@ -41,6 +43,7 @@ static const char *const usage_chreipl =
 "\n"
 " chreipl [ccw] [-d] <DEVICE> [OPTIONS]\n"
 " chreipl [fcp] [-d] <DEVICE> [-w] <WWPN> [-l] <LUN> [OPTIONS]\n"
+" chreipl nvme  [-i] <FID> [-s] <NSID> [OPTIONS]\n"
 " chreipl [node] <NODE|DIR> [OPTIONS]\n"
 " chreipl nss [-n] <NAME> [OPTIONS]\n"
 " chreipl [-h] [-v]\n"
@@ -48,6 +51,7 @@ static const char *const usage_chreipl =
 "The following re-IPL targets are supported:\n"
 "  ccw      IPL from CCW device\n"
 "  fcp      IPL from FCP device\n"
+"  nvme     IPL from NVME device\n"
 "  nss      IPL from NSS\n"
 "  node     IPL from device specified by device node or directory\n"
 "\n"
@@ -70,6 +74,13 @@ static const char *const usage_chreipl =
 "  -L, --loadparm <PARM>   Loadparm specification\n"
 "  -c, --clear 0|1         Control if memory is cleared on re-IPL\n"
 "\n"
+"Options for nvme target:\n"
+"  -i, --fid <FUNCTION_ID>   PCI Function ID of NVME IPL device (hex)\n"
+"  -s  --nsid <NAMESPACE_ID> Namespace ID of NVME IPL device (decimal, default 1)\n"
+"  -b, --bootprog <BPROG>    Bootprog specification\n"
+"  -L, --loadparm <PARM>     Loadparm specification\n"
+"  -c, --clear 0|1         Control if memory is cleared on re-IPL\n"
+"\n"
 "Options for nss target:\n"
 "  -n, --name <NAME>       Identifier of the NSS\n"
 "\n"
@@ -86,6 +97,10 @@ static struct locals {
 	char			lun[20];	/* 18 character +0x" */
 	int			lun_set;
 	char			busid[10];	/* Bus ID e.g. 0.0.4711 */
+	int			fid_set;
+	char			fid[FID_MAX_LEN];
+	int			nsid_set;
+	char			nsid[11];	/* 10 decimal chars + null */
 	int			busid_set;
 	char			dev[15];	/* Device (e.g. dasda) */
 	int			dev_set;
@@ -94,10 +109,10 @@ static struct locals {
 	char			bootparms[4096];
 	int			bootparms_set;
 	int			force_set;
-	enum target_type	target_type;	/* CCW, FCP, NSS or NODE */
+	enum target_type	target_type;	/* CCW,FCP,NVME,NSS or NODE */
 	int			target_type_set;
 	int			target_type_auto_mode;
-	enum reipl_type		reipl_type;	/* CCW, FCP, NSS */
+	enum reipl_type		reipl_type;	/* CCW, FCP, NVME, NSS */
 	int			reipl_clear;
 } l;
 
@@ -229,6 +244,34 @@ static void set_wwpn(const char *wwpn)
 	l.wwpn_set = 1;
 }
 
+static void set_nvme_nsid(const char *nsid)
+{
+	unsigned long long nsid_tmp;
+	char *endptr;
+
+	nsid_tmp = strtoull(nsid, &endptr, 10);
+	if (*endptr)
+		ERR_EXIT("NSID \"%s\" is not a decimal number", nsid);
+	snprintf(l.nsid, sizeof(l.nsid), "%08llu", nsid_tmp);
+	l.nsid_set = 1;
+}
+
+static void set_nvme_fid(const char *fid)
+{
+	unsigned long long fid_tmp;
+	char *endptr;
+
+	fid_tmp = strtoull(fid, &endptr, 16);
+	if (*endptr)
+		ERR_EXIT("FID \"%s\" is not a hexadecimal number", fid);
+	snprintf(l.fid, sizeof(l.fid), "0x%08llx", fid_tmp);
+	l.fid_set = 1;
+
+	/* nsid defaults to 1, if not already set */
+	if (!l.nsid_set)
+		set_nvme_nsid("1");
+}
+
 static void parse_fcp_args(char *nargv[], int nargc)
 {
 	/*
@@ -248,6 +291,28 @@ static void parse_fcp_args(char *nargv[], int nargc)
 	set_lun(nargv[2]);
 }
 
+static void parse_nvme_args(char *nargv[], int nargc)
+{
+	/*
+	 * we might be called like this:
+	 * chreipl nvme 0x13 1
+	 */
+	if (l.busid_set || l.fid_set || l.nsid_set || l.dev_set)
+		ERR_EXIT("Use either options or positional parameters");
+	if (nargc > 2)
+		ERR_EXIT("Too many arguments specified for \"nvme\" re-IPL "
+			 "type");
+	else if (nargc < 1)
+		ERR_EXIT("The \"nvme\" re-IPL type requires function id, and "
+			 "optional namespace id");
+	set_nvme_fid(nargv[0]);
+
+	if (nargc == 2)
+		set_nvme_nsid(nargv[1]);
+	else
+		set_nvme_nsid("1");
+}
+
 static void parse_ccw_args(char *nargv[], int nargc)
 {
 	/*
@@ -288,6 +353,13 @@ static void dev_from_part(char *dev_name)
 		dev_name[i] = 0;
 }
 
+static void dev_from_part_nvme(char *dev_name)
+{
+	char *delim = strrchr(dev_name, 'p');
+	if (delim)
+		*delim = 0;
+}
+
 static int set_reipl_type(const char *dev_name)
 {
 	if (strncmp(dev_name, "dasd", strlen("dasd")) == 0 ||
@@ -295,11 +367,18 @@ static int set_reipl_type(const char *dev_name)
 		l.reipl_type = REIPL_CCW;
 	else if (strncmp(dev_name, "sd", strlen("sd")) == 0)
 		l.reipl_type = REIPL_FCP;
+	else if (strncmp(dev_name, "nvme", strlen("nvme")) == 0)
+		l.reipl_type = REIPL_NVME;
 	else
 		return -1;
 
 	util_strlcpy(l.dev, dev_name, sizeof(l.dev));
-	dev_from_part(l.dev);
+
+	if (l.reipl_type == REIPL_NVME)
+		dev_from_part_nvme(l.dev);
+	else
+		dev_from_part(l.dev);
+
 	l.dev_set = 1;
 	return 0;
 }
@@ -402,6 +481,9 @@ static void parse_pos_args(char *nargv[], int nargc)
 	case TT_FCP:
 		parse_fcp_args(nargv, nargc);
 		break;
+	case TT_NVME:
+		parse_nvme_args(nargv, nargc);
+		break;
 	case TT_CCW:
 		parse_ccw_args(nargv, nargc);
 		break;
@@ -423,6 +505,14 @@ static void check_fcp_opts(void)
 			 "and LUN");
 }
 
+static void check_nvme_opts(void)
+{
+	if (l.nss_name_set || l.wwpn_set || l.lun_set || l.busid_set)
+		ERR_EXIT("Invalid option for \"nvme\" target specified");
+	if (!(l.fid_set && l.nsid_set))
+		ERR_EXIT("The \"nvme\" target requires FID, and optional NSID");
+}
+
 static void check_ccw_opts(void)
 {
 	if (l.bootprog_set || l.lun_set || l.wwpn_set || l.nss_name_set)
@@ -482,6 +572,8 @@ static void parse_chreipl_options(int argc, char *argv[])
 		{ "device",	 required_argument,	NULL, 'd' },
 		{ "lun",	 required_argument,	NULL, 'l' },
 		{ "wwpn",	 required_argument,	NULL, 'w' },
+		{ "fid",	 required_argument,	NULL, 'i' },
+		{ "nsid",	 required_argument,	NULL, 's' },
 		{ "loadparm",	 required_argument,	NULL, 'L' },
 		{ "name",	 required_argument,	NULL, 'n' },
 		{ "bootparms",	 required_argument,	NULL, 'p' },
@@ -490,7 +582,7 @@ static void parse_chreipl_options(int argc, char *argv[])
 		{ "clear",	 required_argument,	NULL, 'c' },
 		{ NULL,		 0,			NULL,  0  }
 	};
-	static const char optstr[] = "hd:vw:l:fL:b:n:p:c:";
+	static const char optstr[] = "hd:vw:l:fL:b:n:p:c:i:s:";
 
 	/* dont run without any argument */
 	if (argc == 1)
@@ -502,6 +594,8 @@ static void parse_chreipl_options(int argc, char *argv[])
 		set_target_type(TT_CCW, 0);
 	else if (strcmp(argv[1], "nss") == 0)
 		set_target_type(TT_NSS, 0);
+	else if (strcmp(argv[1], "nvme") == 0)
+		set_target_type(TT_NVME, 0);
 	else if (strcmp(argv[1], "node") == 0)
 		set_target_type(TT_NODE, 0);
 	else
@@ -516,9 +610,15 @@ static void parse_chreipl_options(int argc, char *argv[])
 		case 'd':
 			set_device(optarg);
 			break;
+		case 'i':
+			set_nvme_fid(optarg);
+			break;
 		case 'l':
 			set_lun(optarg);
 			break;
+		case 's':
+			set_nvme_nsid(optarg);
+			break;
 		case 'w':
 			set_wwpn(optarg);
 			break;
@@ -680,6 +780,45 @@ static void chreipl_fcp(void)
 	print_fcp(0, 0);
 }
 
+static void chreipl_nvme(void)
+{
+	check_nvme_opts();
+
+	if (!nvme_is_device(l.fid, l.nsid) && !l.force_set) {
+		ERR_EXIT("Could not find NVME device with fid %s and nsid %s",
+			l.fid, l.nsid);
+	}
+	check_exists("reipl/nvme/fid", "\"nvme\" re-IPL target");
+
+	if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_FCP_MAX) {
+		ERR_EXIT("Maximum boot parameter length exceeded (%zu/%u)",
+			 strlen(l.bootparms), BOOTPARMS_FCP_MAX);
+	}
+
+	if (l.reipl_clear >= 0) {
+		check_exists("reipl/nvme/clear", "NVME re-IPL clear attribute");
+		write_str(l.reipl_clear ? "1" : "0", "reipl/nvme/clear");
+	}
+
+	write_str_optional(l.loadparm, "reipl/nvme/loadparm", l.loadparm_set,
+			   "loadparm");
+	write_str_optional(l.bootparms, "reipl/nvme/scp_data", l.bootparms_set,
+			   "boot parameters");
+	write_str(l.fid, "reipl/nvme/fid");
+	write_str(l.nsid, "reipl/nvme/nsid");
+	/*
+	 * set the boot record logical block address. Master boot
+	 * record. It is always 0 for Linux
+	 */
+	write_str("0", "reipl/nvme/br_lba");
+	if (!l.bootprog_set)
+		sprintf(l.bootprog, "0");
+	write_str(l.bootprog,  "reipl/nvme/bootprog");
+	write_str("nvme", "reipl/reipl_type");
+
+	print_nvme(0, 0);
+}
+
 static void chreipl_nss(void)
 {
 	check_nss_opts();
@@ -720,6 +859,13 @@ static void chreipl_node(void)
 		l.busid_set = 1;
 		chreipl_fcp();
 		break;
+	case REIPL_NVME:
+		nvme_fid_get(l.dev, l.fid);
+		l.fid_set = 1;
+		nvme_nsid_get(l.dev, l.nsid);
+		l.nsid_set = 1;
+		chreipl_nvme();
+		break;
 	default:
 		ERR_EXIT("Internal error: chreipl_node");
 	}
@@ -735,6 +881,9 @@ void cmd_chreipl(int argc, char *argv[])
 	case TT_FCP:
 		chreipl_fcp();
 		break;
+	case TT_NVME:
+		chreipl_nvme();
+		break;
 	case TT_NSS:
 		chreipl_nss();
 		break;

ipl_tools/cmd_lsreipl.c

@@ -84,6 +84,38 @@ void print_fcp(int show_ipl, int dump)
 		print_fw_str("clear:       %s\n", dir, "clear");
 }
 
+void print_nvme(int show_ipl, int dump)
+{
+	char *dir = show_ipl ? "ipl" : "reipl/nvme";
+	char *path_bootparms = show_ipl ? "/sys/firmware/ipl/scp_data" :
+		"/sys/firmware/reipl/nvme/scp_data";
+	char *path_loadparm = show_ipl ? "/sys/firmware/ipl/loadparm" :
+		"/sys/firmware/reipl/nvme/loadparm";
+	char loadparm[9], loadparm_path[PATH_MAX];
+	char *path_reipl_clear = "/sys/firmware/reipl/nvme/clear";
+
+	if (dump)
+		printf("%-12s nvme_dump\n", get_ipl_banner(show_ipl));
+	else
+		printf("%-12s nvme\n", get_ipl_banner(show_ipl));
+
+	print_fw_str("FID:         %s\n", dir, "fid");
+	print_fw_str("NSID:        %s\n", dir, "nsid");
+	print_fw_str("bootprog:    %s\n", dir, "bootprog");
+	print_fw_str("br_lba:      %s\n", dir, "br_lba");
+	if (access(path_loadparm, R_OK) == 0) {
+		sprintf(loadparm_path, "%s/%s", dir, "loadparm");
+		read_fw_str(loadparm, loadparm_path, sizeof(loadparm));
+		if (strcmp(loadparm, "        ") == 0)
+			loadparm[0] = 0;
+		printf("Loadparm:    \"%s\"\n", loadparm);
+	}
+	if (access(path_bootparms, R_OK) == 0)
+		print_fw_str("Bootparms:   \"%s\"\n", dir, "scp_data");
+	if (!show_ipl && access(path_reipl_clear, R_OK) == 0)
+		print_fw_str("clear:       %s\n", dir, "clear");
+}
+
 void print_ccw(int show_ipl)
 {
 	char loadparm[9], loadparm_path[PATH_MAX];
@@ -155,6 +187,10 @@ void cmd_lsreipl(int argc, char *argv[])
 		print_fcp(l.ipl_set, 0);
 	else if (strcmp(reipl_type_str, "fcp_dump") == 0)
 		print_fcp(l.ipl_set, 1);
+	else if (strcmp(reipl_type_str, "nvme") == 0)
+		print_nvme(l.ipl_set, 0);
+	else if (strcmp(reipl_type_str, "nvme_dump") == 0)
+		print_nvme(l.ipl_set, 1);
 	else if (strcmp(reipl_type_str, "ccw") == 0)
 		print_ccw(l.ipl_set);
 	else if (strcmp(reipl_type_str, "nss") == 0)

ipl_tools/ipl_tools.h

@@ -43,6 +43,7 @@ extern void cmd_chreipl(int argc, char *argv[]);
 
 extern void print_ccw(int show_ipl);
 extern void print_fcp(int show_ipl, int dump);
+extern void print_nvme(int show_ipl, int dump);
 extern void print_nss(int show_ipl);
 
 /*
@@ -70,6 +71,16 @@ extern void fcp_lun_get(const char *device, char *lun);
 extern void fcp_wwpn_get(const char *device, char *wwpn);
 extern void fcp_busid_get(const char *device, char *devno);
 
+/*
+ * NVME
+ */
+#define FID_MAX_LEN	11	/* 8 characters + 0x + null */
+#define NVME_PATH_MAX	(PATH_MAX + NAME_MAX + 1)
+
+extern void nvme_fid_get(const char *device, char *fid);
+extern void nvme_nsid_get(const char *device, char *nsid);
+int nvme_is_device(char *fid_str, char *nsid_str);
+
 /*
  * CCW
  */

ipl_tools/man/chreipl.8

@@ -39,6 +39,9 @@ Specify a DASD CCW device for reboot
 .RB "- " fcp :
 Specify a FCP device for reboot
 .TP
+.RB "- " nvme :
+Specify an NVMe device for reboot
+.TP
 .RB "- " nss :
 Specify a named saved system (NSS) for reboot
 .TP
@@ -118,6 +121,11 @@ WWPN 0x500507630300c562, and LUN 0x401040b300000000. In addition to that
 append kernel parameter "mem=" to restrict memory to 512 MB:
 
 \fB# chreipl 0.0.1700 0x500507630300c562 0x401040b300000000 -p "mem=512M"\fP
+
+4. Next time reboot from the NVMe device with function id 0x13, namespace 1:
+
+\fB# chreipl nvme 0x13 1
+
 .SH ccw
 Use the ccw re-IPL target for DASD devices that are accessed by the hardware
 using channel command word (CCW) channels.
@@ -207,6 +215,51 @@ use options instead of positional parameters:
 .br
 
 \fB# chreipl fcp -d 0.0.1700 -w 0x5005076... -l 0x401040b3... -b 2\fP
+.SH nvme
+Use the nvme re-IPL target for specifying an NVMe disk for reboot.
+.TP
+.BR "\-i" " or " "\-\-fid"
+PCI Function ID of NVME IPL device (hex).
+
+.TP
+.BR "\-s" " or " "\-\-nsid"
+Namespace ID of the NVME IPL device (decimal, default 1).
+
+.TP
+.BR "\-b" " or " "\-\-bootprog"
+Specifies an entry in the boot configuration by defining the IPL boot
+program selector. If omitted, '0' will be used.
+
+.TP
+.BR "\-L" " or " "\-\-loadparm"
+The loadparm for the nvme re-IPL target is not used to control the boot
+configuration that is defined by the
+.BR zipl (8)
+boot menu. Instead it can be used to control higher level boot loaders
+like GRUB. For more details refer to distribution specific documentation.
+
+.TP
+.BR "\-c" " or " "\-\-clear"
+Specify whether memory should be cleared on re-IPL. Possible values are 0 to
+disable and 1 to enable memory clearing on re-IPL.
+Memory clearing is supported if the "clear" attribute is present in
+/sys/firmware/reipl/nvme/.
+
+.PP
+\fBExamples:\fP
+.br
+
+1. Next time reboot from the NVMe disk with function-id 0x13 and namespace 1:
+.br
+
+\fB# chreipl nvme 0x13 1\fP
+.br
+
+2. Use same configuration as (1) but choose boot program selector 2 and
+use options instead of positional parameters:
+.br
+
+\fB# chreipl nvme -i 0x13 -s 1 -b 2\fP
 .SH nss
 Use the nss re-IPL target to specify z/VM named saved systems (NSS) for
 reboot.
@@ -221,7 +274,7 @@ Use the NSS named LINUX1 for the next reboot:
 
 \fB# chreipl nss LINUX1\fP
 .SH node
-You can identify DASD or SCSI re-IPL devices indirectly through a device
+You can identify DASD, SCSI, or NVMe re-IPL devices indirectly through a device
 node or directory. The chreipl tool then determines the information
 that you would otherwise have to specify with the ccw or fcp target.
 .PP
@@ -244,6 +297,11 @@ that you would otherwise have to specify with the ccw or fcp target.
 
 \fB# chreipl node /mnt/boot\fP
 
+4. Next time reboot from the NVMe device represented by /dev/nvme0n1
+.br
+
+\fB# chreipl node /dev/nvme0n1\fP
+
 .SH SEE ALSO
 .BR lsreipl (8),
 .BR zipl (8),

ipl_tools/nvme.c

@@ -0,0 +1,169 @@
+/*
+ * ipl_tools - Linux for System z reipl and shutdown tools
+ *
+ * NVMe device functions
+ *
+ * Copyright IBM Corp. 2020
+ *
+ * s390-tools is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+#include <sys/types.h>
+#include <dirent.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "lib/util_libc.h"
+#include "lib/util_file.h"
+#include "ipl_tools.h"
+
+/*
+ * Return the fid of a device
+ */
+void nvme_fid_get(const char *device, char *fid)
+{
+	char path[PATH_MAX], buf[FID_MAX_LEN];
+
+	snprintf(path, PATH_MAX, "/sys/block/%s/device/device/function_id",
+		device);
+	if (util_file_read_line(buf, FID_MAX_LEN, path))
+		ERR_EXIT_ERRNO("Could not read from \"%s\"", path);
+
+	util_strlcpy(fid, buf, FID_MAX_LEN);
+}
+/*
+ * Return the nsid of a device
+ */
+void nvme_nsid_get(const char *device, char *nsid)
+{
+	char path[PATH_MAX], buf[FID_MAX_LEN];
+
+	snprintf(path, PATH_MAX, "/sys/block/%s/nsid", device);
+	if (util_file_read_line(buf, FID_MAX_LEN, path))
+		ERR_EXIT_ERRNO("Could not read from \"%s\"", path);
+
+	util_strlcpy(nsid, buf, FID_MAX_LEN);
+}
+
+static int next_entry(DIR *dir, char *in_path, char *out_path,
+	unsigned char entry_type)
+{
+	struct dirent *dirent;
+	char temp_path[NVME_PATH_MAX];
+
+	while ((dirent = readdir(dir)) != NULL) {
+		if (strcmp(dirent->d_name, ".") == 0 ||
+		    strcmp(dirent->d_name, "..") == 0 ||
+		    dirent->d_type != entry_type)
+			continue;
+
+		/* Resolve the symlink, if needed */
+		if (dirent->d_type == DT_LNK) {
+			snprintf(temp_path, sizeof(temp_path), "%s/%s", in_path,
+				dirent->d_name);
+			if (!realpath(temp_path, out_path))
+				ERR_EXIT_ERRNO("Could not resolve link %s",
+					temp_path);
+			return 1;
+		}
+
+		snprintf(out_path, NVME_PATH_MAX, "%s/%s", in_path,
+			dirent->d_name);
+		return 1;
+	}
+	return 0;
+}
+
+static int nvme_getdev_by_fid(char *fidstr, char *devpath)
+{
+	char temp_path[PATH_MAX+19], real_path[PATH_MAX];
+	char *sys_path = "/sys/class/nvme";
+	u_int64_t target_fid, curfid;
+	DIR *dir;
+	char *end;
+	int rc = -1;
+
+	target_fid = strtoul(fidstr, &end, 16);
+	if (*end)
+		ERR_EXIT("Invalid function_id given %s", fidstr);
+
+	dir = opendir(sys_path);
+	if (!dir)
+		ERR_EXIT("Could not open %s", sys_path);
+
+	errno = 0;
+	while (next_entry(dir, sys_path, real_path, DT_LNK)) {
+		snprintf(temp_path, sizeof(temp_path), "%s/%s", real_path,
+			"device/function_id");
+		if (access(temp_path, F_OK))
+			continue;
+
+		if (util_file_read_ul(&curfid, 16, temp_path))
+			ERR_EXIT("Invalid function_id found in %s", temp_path);
+
+		if (curfid == target_fid) {
+			strncpy(devpath, real_path, PATH_MAX);
+			rc = 0;
+			break;
+		}
+	}
+
+	closedir(dir);
+	return rc;
+}
+
+static int nvme_getdev_by_nsid(char *nsid_str, char *path, char *dev_path)
+{
+	char full_path[NVME_PATH_MAX+1], nsid_path[sizeof(full_path)+5];
+	char *end;
+	u_int64_t nsid, curnsid;
+	DIR *dir;
+
+	nsid = strtoul(nsid_str, &end, 10);
+	if (*end)
+		ERR_EXIT_ERRNO("Invalid namespace id given %s", nsid_str);
+
+	dir = opendir(path);
+	if (!dir)
+		ERR_EXIT_ERRNO("Could not open %s", path);
+
+	errno = 0;
+	while (next_entry(dir, path, full_path, DT_DIR)) {
+		snprintf(nsid_path, sizeof(nsid_path), "%s/%s", full_path,
+			"nsid");
+		if (access(nsid_path, F_OK))
+			continue;
+
+		if (util_file_read_ul(&curnsid, 10, nsid_path))
+			ERR_EXIT("Invalid namespace id found in %s", nsid_path);
+
+		if (curnsid == nsid) {
+			strncpy(dev_path, full_path, NVME_PATH_MAX+1);
+			closedir(dir);
+			return 0;
+		}
+	}
+	closedir(dir);
+	return -1;
+}
+
+static int nvme_getdev(char *fid_str, char *nsid_str, char *dev_path)
+{
+	char path_tmp[NVME_PATH_MAX];
+
+	if (nvme_getdev_by_fid(fid_str, path_tmp))
+		return -1;
+
+	return nvme_getdev_by_nsid(nsid_str, path_tmp, dev_path);
+}
+
+/*
+ * Check if the specified fid and nsid leads to a valid nvme device
+ */
+int nvme_is_device(char *fid_str, char *nsid_str)
+{
+	char path_tmp[NVME_PATH_MAX+1];
+
+	return !(nvme_getdev(fid_str, nsid_str, path_tmp));
+}

iucvterm/Makefile

@@ -21,7 +21,7 @@ clean: clean-recursive
 $(RECURSIVE_TARGETS):
 	@target=`echo $@ |sed s/-recursive//`; \
 	for d in $(SUBDIRS); do \
-		(cd $$d && $(MAKE) $$target) \
+		(cd $$d && $(MAKE) $$target) || exit 1; \
 	done
 
 

libdasd/dasd_sys.c

@@ -214,7 +214,7 @@ int dasd_get_host_access_count(char *device)
 	char *path;
 	long value;
 
-	if (!util_sys_get_dev_addr(device, busid))
+	if (util_sys_get_dev_addr(device, busid) != 0)
 		return 0;
 
 	path = util_path_sysfs("bus/ccw/devices/%s/host_access_count", busid);

libekmfweb/Makefile

@@ -0,0 +1,92 @@
+include ../common.mak
+
+VERSION = 1.0
+VERM = $(shell echo $(VERSION) | cut -d '.' -f 1)
+
+ifneq (${HAVE_OPENSSL},0)
+	ifneq (${HAVE_JSONC},0)
+		ifneq (${HAVE_LIBCURL},0)
+			BUILD_TARGETS += libekmfweb.so.$(VERSION)
+			INSTALL_TARGETS += install-libekmfweb.so.$(VERSION)
+		else
+			BUILD_TARGETS += skip-libekmfweb-curl
+			INSTALL_TARGETS += skip-libekmfweb-curl
+		endif
+	else
+		BUILD_TARGETS += skip-libekmfweb-jsonc
+		INSTALL_TARGETS += skip-libekmfweb-jsonc
+	endif
+else
+	BUILD_TARGETS += skip-libekmfweb-openssl
+	INSTALL_TARGETS += skip-libekmfweb-openssl
+endif
+
+libs = $(rootdir)/libutil/libutil.a
+
+detect-openssl-version.dep:
+	echo "#include <openssl/opensslv.h>" > detect-openssl-version.dep
+	echo "#include <openssl/evp.h>" >> detect-openssl-version.dep
+	echo "#if OPENSSL_VERSION_NUMBER < 0x10101000L" >> detect-openssl-version.dep
+	echo "  #error openssl version 1.1.1 is required" >> detect-openssl-version.dep
+	echo "#endif" >> detect-openssl-version.dep
+	echo "static void __attribute__((unused)) test(void) {" >> detect-openssl-version.dep
+	echo "    EVP_PKEY_meth_remove(NULL);" >> detect-openssl-version.dep
+	echo "}" >> detect-openssl-version.dep
+
+check-dep-libekmfweb: detect-openssl-version.dep
+	$(call check_dep, \
+		"libekmfweb", \
+		"detect-openssl-version.dep", \
+		"openssl-devel version >= 1.1.1", \
+		"HAVE_OPENSSL=0", \
+		-I. -lcrypto)
+	$(call check_dep, \
+		"libekmfweb", \
+		"json-c/json.h", \
+		"json-c-devel", \
+		"HAVE_JSONC=0")
+	$(call check_dep, \
+		"libekmfweb", \
+		"curl/curl.h", \
+		"libcurl-devel", \
+		"HAVE_LIBCURL=0")
+	touch check-dep-libekmfweb
+
+skip-libekmfweb-openssl:
+	echo "  SKIP    libekmfweb due to HAVE_OPENSSL=0"
+
+skip-libekmfweb-jsonc:
+	echo "  SKIP    libekmfweb due to HAVE_JSONC=0"
+
+skip-libekmfweb-curl:
+	echo "  SKIP    libekmfweb due to HAVE_LIBCURL=0"
+
+all: $(BUILD_TARGETS)
+
+ekmfweb.o: check-dep-libekmfweb ekmfweb.c utilities.h cca.h $(rootdir)include/ekmfweb/ekmfweb.h
+utilities.o: check-dep-libekmfweb utilities.c utilities.h $(rootdir)include/ekmfweb/ekmfweb.h
+cca.o: check-dep-libekmfweb cca.c cca.h utilities.h $(rootdir)include/ekmfweb/ekmfweb.h
+
+libekmfweb.so.$(VERSION): ALL_CFLAGS += -fPIC
+libekmfweb.so.$(VERSION): LDLIBS = -ljson-c -lcrypto -lssl -lcurl -ldl
+libekmfweb.so.$(VERSION): ALL_LDFLAGS += -shared -Wl,--version-script=libekmfweb.map \
+	-Wl,-z,defs,-Bsymbolic -Wl,-soname,libekmfweb.so.$(VERM)
+libekmfweb.so.$(VERSION): ekmfweb.o utilities.o cca.o
+	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
+	ln -srf libekmfweb.so.$(VERSION) libekmfweb.so.$(VERM)
+	ln -srf libekmfweb.so.$(VERSION) libekmfweb.so
+
+install-libekmfweb.so.$(VERSION): libekmfweb.so.$(VERSION)
+	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION)
+	ln -srf $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERM)
+	ln -srf $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so
+	$(INSTALL) -d -m 770 $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb
+	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $(rootdir)include/ekmfweb/ekmfweb.h $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb
+
+install: all $(INSTALL_TARGETS)
+
+clean:
+	rm -f *.o libekmfweb.so* check-dep-libekmfweb detect-openssl-version.dep
+
+.PHONY: all install clean skip-libekmfweb-openssl skip-libekmfweb-jsonc \
+	skip-libekmfweb-curl install-libekmfweb.so.$(VERSION)

libekmfweb/cca.h

@@ -0,0 +1,247 @@
+/*
+ * libekmfweb - EKMFWeb client library
+ *
+ * Copyright IBM Corp. 2020
+ *
+ * s390-tools is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef CCA_H
+#define CCA_H
+
+#include <stddef.h>
+#include <stdbool.h>
+
+#include <openssl/evp.h>
+
+#include <json-c/json.h>
+
+#include "ekmfweb/ekmfweb.h"
+
+/* CCA PKA Key Generate function */
+typedef void (*CSNDPKG_t)(long *return_code,
+			  long *reason_code,
+			  long *exit_data_length,
+			  unsigned char *exit_data,
+			  long *rule_array_count,
+			  unsigned char *rule_array,
+			  long *regeneration_data_length,
+			  unsigned char *regeneration_data,
+			  long *skeleton_key_token_length,
+			  unsigned char *skeleton_key_token,
+			  unsigned char *transport_key_identifier,
+			  long *generated_key_identifier_length,
+			  unsigned char *generated_key_identifier);
+
+/* CCA PKA Key Token Build function */
+typedef void (*CSNDPKB_t)(long *return_code,
+			  long *reason_code,
+			  long *exit_data_length,
+			  unsigned char *exit_data,
+			  long *rule_array_count,
+			  unsigned char *rule_array,
+			  long *key_values_structure_length,
+			  unsigned char *key_values_structure,
+			  long *key_name_ln,
+			  unsigned char *key_name,
+			  long *reserved_1_length,
+			  unsigned char *reserved_1,
+			  long *reserved_2_length,
+			  unsigned char *reserved_2,
+			  long *reserved_3_length,
+			  unsigned char *reserved_3,
+			  long *reserved_4_length,
+			  unsigned char *reserved_4,
+			  long *reserved_5_length,
+			  unsigned char *reserved_5,
+			  long *token_length, unsigned char *token);
+
+/* CCA PKA Key Token Change function */
+typedef void (*CSNDKTC_t)(long *return_code,
+			  long *reason_code,
+			  long *exit_data_length,
+			  unsigned char *exit_data,
+			  long *rule_array_count,
+			  unsigned char *rule_array,
+			  long *key_identifier_length,
+			  unsigned char *key_identifier);
+
+/* CCA Digital Signature Generate function */
+typedef void (*CSNDDSG_t)(long *return_code,
+			  long *reason_code,
+			  long *exit_data_length,
+			  unsigned char *exit_data,
+			  long *rule_array_count,
+			  unsigned char *rule_array,
+			  long *PKA_private_key_identifier_length,
+			  unsigned char *PKA_private_key_identifier,
+			  long *hash_length,
+			  unsigned char *hash,
+			  long *signature_field_length,
+			  long *signature_bit_length,
+			  unsigned char *signature_field);
+
+/* CCA Key Token Build2 function */
+typedef void (*CSNBKTB2_t)(long *return_code,
+			   long *reason_code,
+			   long *exit_data_length,
+			   unsigned char *exit_data,
+			   long *rule_array_count,
+			   unsigned char *rule_array,
+			   long *clear_key_bit_length,
+			   unsigned char *clear_key_value,
+			   long *key_name_length,
+			   unsigned char *key_name,
+			   long *user_associated_data_length,
+			   unsigned char *user_associated_data,
+			   long *token_data_length,
+			   unsigned char *token_data,
+			   long *verb_data_length,
+			   unsigned char *verb_data,
+			   long *target_key_token_length,
+			   unsigned char *target_key_token);
+
+/* CCA EC Diffie-Hellman function */
+typedef void (*CSNDEDH_t)(long *return_code,
+			  long *reason_code,
+			  long *exit_data_length,
+			  unsigned char *exit_data,
+			  long *rule_array_count,
+			  unsigned char *rule_array,
+			  long *private_key_identifier_length,
+			  unsigned char *private_key_identifier,
+			  long *private_KEK_key_identifier_length,
+			  unsigned char *private_KEK_key_identifier,
+			  long *public_key_identifier_length,
+			  unsigned char *public_key_identifier,
+			  long *chaining_vector_length,
+			  unsigned char *chaining_vector,
+			  long *party_info_length,
+			  unsigned char *party_info,
+			  long *key_bit_length,
+			  long *reserved_1_length,
+			  unsigned char *reserved_1,
+			  long *reserved_2_length,
+			  unsigned char *reserved_2,
+			  long *reserved_3_length,
+			  unsigned char *reserved_3,
+			  long *reserved_4_length,
+			  unsigned char *reserved_4,
+			  long *reserved_5_length,
+			  unsigned char *reserved_5,
+			  long *output_KEK_key_identifier_length,
+			  unsigned char *output_KEK_key_identifier,
+			  long *output_key_identifier_length,
+			  unsigned char *output_key_identifier);
+
+/* CCA Symmetric Key Import2 function */
+typedef void (*CSNDSYI2_t)(long *return_code,
+			   long *reason_code,
+			   long *exit_data_length,
+			   unsigned char *exit_data,
+			   long *rule_array_count,
+			   unsigned char *rule_array,
+			   long *enciphered_key_length,
+			   unsigned char *enciphered_key,
+			   long *transport_key_identifier_length,
+			   unsigned char *transport_key_identifier,
+			   long *key_name_length,
+			   unsigned char *key_name,
+			   long *target_key_identifier_length,
+			   unsigned char *target_key_identifier);
+
+struct cca_lib {
+	CSNDPKB_t dll_CSNDPKB;
+	CSNDPKG_t dll_CSNDPKG;
+	CSNDKTC_t dll_CSNDKTC;
+	CSNDDSG_t dll_CSNDDSG;
+	CSNBKTB2_t dll_CSNBKTB2;
+	CSNDEDH_t dll_CSNDEDH;
+	CSNDSYI2_t dll_CSNDSYI2;
+};
+
+#define CCA_MAX_PKA_KEY_TOKEN_SIZE	3500
+#define CCA_MAX_SYM_KEY_TOKEN_SIZE	725
+
+int cca_generate_ecc_key_pair(const struct ekmf_cca_lib *cca_lib,
+			      int curve_nid, unsigned char *key_token,
+			      size_t *key_token_length, bool verbose);
+
+int cca_generate_rsa_key_pair(const struct ekmf_cca_lib *cca_lib,
+			      size_t modulus_bits, unsigned int pub_exp,
+			      unsigned char *key_token,
+			      size_t *key_token_length, bool verbose);
+
+int cca_get_key_type(const unsigned char *key_token, size_t key_token_length,
+		     int *pkey_type);
+
+int cca_reencipher_key(const struct ekmf_cca_lib *cca_lib,
+		       const unsigned char *key_token, size_t key_token_length,
+		       bool to_new, bool verbose);
+
+int cca_get_ecc_pub_key_as_pkey(const unsigned char *key_token,
+				size_t key_token_length,
+				EVP_PKEY **pkey, bool verbose);
+
+int cca_get_ecc_pub_key_as_json_web_key(const unsigned char *key_token,
+					size_t key_token_length,
+					json_object **jwk, bool verbose);
+
+int cca_get_rsa_pub_key_as_pkey(const unsigned char *key_token,
+				size_t key_token_length,
+				int pkey_type, EVP_PKEY **pkey, bool verbose);
+
+int cca_import_key_from_json_web_key(const struct ekmf_cca_lib *cca_lib,
+				     json_object *jwk, unsigned char *key_token,
+				     size_t *key_token_length, bool verbose);
+
+enum cca_kdf {
+	CCA_KDF_ANS_X9_63_CCA = 1,     /* CCA DERIVE01 method */
+	CCA_KDF_ANS_X9_63_SHA224 = 2,  /* CCA DERIVE02 method with SHA-224 */
+	CCA_KDF_ANS_X9_63_SHA256 = 3,  /* CCA DERIVE02 method with SHA-256 */
+	CCA_KDF_ANS_X9_63_SHA384 = 4,  /* CCA DERIVE02 method with SHA-284 */
+	CCA_KDF_ANS_X9_63_SHA512 = 5,  /* CCA DERIVE02 method with SHA-512 */
+};
+
+int cca_ec_dh_derive_importer(const struct ekmf_cca_lib *cca_lib,
+			      const unsigned char *priv_ecc_key_token,
+			      size_t priv_ecc_key_token_length,
+			      const unsigned char *pub_ecc_key_token,
+			      size_t pub_ecc_key_token_length,
+			      const unsigned char *party_info,
+			      size_t party_info_length,
+			      enum cca_kdf kdf,
+			      unsigned char *derived_key_token,
+			      size_t *derived_key_token_length,
+			      bool verbose);
+
+int cca_import_external_key(const struct ekmf_cca_lib *cca_lib,
+			    const unsigned char *external_key_token,
+			    size_t external_key_token_length,
+			    const unsigned char *importer_key_token,
+			    size_t importer_key_token_length,
+			    unsigned char *imported_key_token,
+			    size_t *imported_key_token_length,
+			    bool verbose);
+
+int cca_rsa_sign(const struct ekmf_cca_lib *cca_lib,
+		 const unsigned char *key_token, size_t key_token_length,
+		 unsigned char *sig, size_t *siglen,
+		 const unsigned char *tbs, size_t tbslen,
+		 int padding_type, int digest_nid, bool verbose);
+
+int cca_rsa_pss_sign(const struct ekmf_cca_lib *cca_lib,
+		     const unsigned char *key_token, size_t key_token_length,
+		     unsigned char *sig, size_t *siglen,
+		     const unsigned char *tbs, size_t tbslen,
+		     int digest_nid, int mgf_digest_nid, int saltlen,
+		     bool verbose);
+
+int cca_ecdsa_sign(const struct ekmf_cca_lib *cca_lib,
+		   const unsigned char *key_token, size_t key_token_length,
+		   unsigned char *sig, size_t *siglen,
+		   const unsigned char *tbs, size_t tbslen, int digest_nid,
+		   bool verbose);
+
+#endif

libekmfweb/libekmfweb.map

@@ -0,0 +1,30 @@
+LIBEKMFWEB_1.0 {
+    global:
+        ekmf_get_server_cert_chain;
+        ekmf_print_certificates;
+        ekmf_check_login_token;
+        ekmf_login;
+        ekmf_generate_identity_key;
+        ekmf_reencipher_identity_key;
+        ekmf_generate_csr;
+        ekmf_generate_ss_cert;
+        ekmf_get_public_key;
+        ekmf_get_settings;
+        ekmf_check_feature;
+        ekmf_retrieve_key;
+        ekmf_list_templates;
+        ekmf_get_template;
+        ekmf_get_last_seq_no;
+        ekmf_clone_template_info;
+        ekmf_free_template_info;
+        ekmf_list_keys;
+        ekmf_get_key_info;
+        ekmf_set_key_state;
+        ekmf_set_key_tags;
+        ekmf_delete_key_tags;
+        ekmf_clone_key_info;
+        ekmf_free_key_info;
+        ekmf_generate_key;
+        ekmf_curl_destroy;
+    local: *;
+};

libekmfweb/utilities.h

@@ -0,0 +1,179 @@
+/*
+ * libekmfweb - EKMFWeb client library
+ *
+ * Copyright IBM Corp. 2020
+ *
+ * s390-tools is free software; you can redistribute it and/or modify
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+#ifndef UTILITIES_H
+#define UTILITIES_H
+
+#include <stddef.h>
+#include <stdbool.h>
+
+#include <openssl/x509.h>
+#include <openssl/obj_mac.h>
+#include <openssl/evp.h>
+
+#include <json-c/json.h>
+#include <curl/curl.h>
+
+#include "ekmfweb/ekmfweb.h"
+
+int decode_base64url(unsigned char *output, size_t *outlen,
+		     const char *input, size_t inlen);
+
+int encode_base64url(char *output, size_t *outlen,
+		     const unsigned char *input, size_t inlen);
+
+int parse_json_web_token(const char *token, json_object **header_obj,
+			 json_object **payload_obj, unsigned char **signature,
+			 size_t *signature_len);
+
+int create_json_web_signature(const char *algorithm, bool b64, const char *kid,
+			      const unsigned char *payload, size_t payload_len,
+			      bool detached_payload, EVP_MD_CTX *md_ctx,
+			      char **jws);
+
+int verify_json_web_signature(const char *jws, const unsigned char *payload,
+			      size_t payload_len, EVP_PKEY *pkey);
+
+json_object *get_json_timestamp(void);
+
+int json_build_tag_def_list(json_object *array,
+			    struct ekmf_tag_def_list *tag_def_list,
+			    bool copy);
+int clone_tag_def_list(const struct ekmf_tag_def_list *src,
+		       struct ekmf_tag_def_list *dest);
+void free_tag_def_list(struct ekmf_tag_def_list *tag_def_list, bool free_tags);
+
+int json_build_template_info(json_object *obj,
+			     struct ekmf_template_info *template,
+			     bool copy);
+int clone_template_info(const struct ekmf_template_info *src,
+			struct ekmf_template_info *dest);
+void free_template_info(struct ekmf_template_info *template);
+
+int json_build_tag_list(json_object *array, struct ekmf_tag_list *tag_list,
+			bool copy);
+int build_json_tag_list(const struct ekmf_tag_list *tag_list,
+			json_object **tags_obj);
+int clone_tag_list(const struct ekmf_tag_list *src,
+		   struct ekmf_tag_list *dest);
+void free_tag_list(struct ekmf_tag_list *tag_list, bool free_tags);
+
+int json_build_export_control(json_object *export_control,
+			      struct ekmf_export_control *export_info,
+			      bool copy);
+int clone_export_control(const struct ekmf_export_control *src,
+			 struct ekmf_export_control *dest);
+void free_export_control(struct ekmf_export_control *export_control,
+			 bool free_keys);
+
+int json_build_key_info(json_object *obj, json_object *custom_tags,
+			json_object *export_control,
+			struct ekmf_key_info *key, bool copy);
+int clone_key_info(const struct ekmf_key_info *src,
+		   struct ekmf_key_info *dest);
+void free_key_info(struct ekmf_key_info *key);
+
+char *get_http_header_value(const struct curl_slist *headers, const char *name);
+
+size_t ecc_get_curve_prime_bits(int curve_nid);
+size_t ecc_get_curve_prime_length(int curve_nid);
+const char *ecc_get_curve_id(int curve_nid);
+bool ecc_is_prime_curve(int curve_nid);
+bool ecc_is_brainpool_curve(int curve_nid);
+int ecc_get_curve_by_id(const char *curve_id);
+int ecc_get_prime_curve_by_prime_bits(size_t prime_bits);
+int ecc_get_brainpool_curve_by_prime_bits(size_t prime_bits);
+
+int ecc_calculate_y_coordinate(int nid, size_t prime_len,
+			       const unsigned char *x, int y_bit,
+			       unsigned char *y);
+
+int ecc_pub_key_as_pkey(int nid, size_t prime_len, const unsigned char *x,
+			const unsigned char *y, EVP_PKEY **pkey);
+
+int rsa_pub_key_as_pkey(const unsigned char *modulus, size_t modulus_length,
+			const unsigned char *pub_exp, size_t pub_exp_length,
+			int pkey_type, EVP_PKEY **pkey);
+
+int json_web_key_as_pkey(json_object *jwk, int pkey_type, EVP_PKEY **pkey);
+
+int write_key_blob(const char *filename, unsigned char *key_blob,
+		   size_t key_blob_len);
+
+int read_key_blob(const char *filename, unsigned char *key_blob,
+		  size_t *key_blob_len);
+
+int read_x509_certificate(const char *pem_filename, X509 **cert);
+
+int write_x509_certificate(const char *pem_filename, X509 *cert);
+
+int write_x509_request(const char *pem_filename, X509_REQ *req, bool new_hdr);
+
+int read_public_key(const char *pem_filename, EVP_PKEY **pkey);
+
+int write_public_key(const char *pem_filename, EVP_PKEY *pkey);
+
+typedef int (*rsa_sign_t)(const unsigned char *key_blob, size_t key_blob_length,
+			  unsigned char *sig, size_t *siglen,
+			  const unsigned char *tbs, size_t tbslen,
+			  int padding_type, int md_nid,
+			  void *private);
+typedef int (*rsa_pss_sign_t)(const unsigned char *key_blob,
+			      size_t key_blob_length, unsigned char *sig,
+			      size_t *siglen, const unsigned char *tbs,
+			      size_t tbslen, int md_nid, int mfgmd_nid,
+			      int saltlen, void *private);
+typedef int (*ecdsa_sign_t)(const unsigned char *key_blob,
+			    size_t key_blob_length, unsigned char *sig,
+			    size_t *siglen, const unsigned char *tbs,
+			    size_t tbslen, int md_nid, void *private);
+
+struct sk_pkey_sign_func {
+	rsa_sign_t      rsa_sign;
+	rsa_pss_sign_t  rsa_pss_sign;
+	ecdsa_sign_t    ecdsa_sign;
+};
+
+int setup_secure_key_pkey_method(int pkey_id);
+int cleanup_secure_key_pkey_method(int pkey_id);
+int setup_secure_key_pkey_context(EVP_PKEY_CTX *pkey_ctx,
+				  const unsigned char *key_blob,
+				  size_t key_blob_len,
+				  struct sk_pkey_sign_func *sign_funcs,
+				  void *private);
+
+int setup_rsa_pss_pkey_context(EVP_PKEY_CTX *pkey_ctx,
+			       struct ekmf_rsa_pss_params *rsa_pss_params);
+
+int build_subject_name(X509_NAME **name, const char *rdns[], size_t num_rdns,
+		       bool utf8);
+
+int build_certificate_extensions(X509 *cert, X509_REQ *req,
+				 const char *exts[], size_t num_exts,
+				 const STACK_OF(X509_EXTENSION) *addl_exts);
+
+int generate_x509_serial_number(X509 *cert, size_t sn_bit_size);
+
+const char *json_get_string(json_object *obj, const char *name);
+
+int json_object_get_base64url(json_object *obj, const char *name,
+			      unsigned char *data, size_t *data_len);
+
+json_object *json_object_new_base64url(const unsigned char *data, size_t len);
+
+#ifndef JSON_C_OBJECT_ADD_KEY_IS_NEW
+#define JSON_C_OBJECT_ADD_KEY_IS_NEW (1 << 1)
+#define IMPLEMENT_LOCAL_JSON_OBJECT_OBJECT_ADD
+
+int json_object_object_add_ex(struct json_object *obj, const char *const key,
+			      struct json_object *const val,
+			      const unsigned int opts);
+#endif
+
+#endif

libutil/Makefile

@@ -43,6 +43,7 @@ util_prg_example: util_prg_example.o $(lib)
 util_rec_example: util_rec_example.o $(lib)
 
 $(lib): $(objects)
+$(lib): ALL_CFLAGS += -fPIC
 
 install: all
 

libutil/util_file.c

@@ -281,6 +281,44 @@ int util_file_write_ull(unsigned long long val, int base, const char *fmt, ...)
 	return rc;
 }
 
+/**
+ * Read a file and convert it to signed int according to given base
+ *
+ * @param[out] val      Buffer for value
+ * @param[in]  base     Base for conversion, either 8, 10, or 16
+ * @param[in]  fmt      Format string for generation of the path name
+ * @param[in]  ...      Parameters for format string
+ *
+ * @retval     0        Integer has been read correctly
+ * @retval    -1        Error while reading file
+ */
+int util_file_read_i(int *val, int base, const char *fmt, ...)
+{
+	char path[PATH_MAX], buf[512];
+	va_list ap;
+	int count;
+
+	/* Construct the file name */
+	UTIL_VSPRINTF(path, fmt, ap);
+
+	if (file_gets(buf, sizeof(buf), path))
+		return -1;
+	switch (base) {
+	case 8:
+		count = sscanf(buf, "%do", val);
+		break;
+	case 10:
+		count = sscanf(buf, "%dd", val);
+		break;
+	case 16:
+		count = sscanf(buf, "%dx", val);
+		break;
+	default:
+		util_panic("Invalid base: %d\n", base);
+	}
+	return (count == 1) ? 0 : -1;
+}
+
 /**
  * Read a file and convert it to signed long according to given base
  *
@@ -357,6 +395,44 @@ int util_file_read_ll(long long *val, int base, const char *fmt, ...)
 	return (count == 1) ? 0 : -1;
 }
 
+/**
+ * Read a file and convert it to unsigned int according to given base
+ *
+ * @param[out] val      Buffer for value
+ * @param[in]  base     Base for conversion, either 8, 10, or 16
+ * @param[in]  fmt      Format string for generation of the path name
+ * @param[in]  ...      Parameters for format string
+ *
+ * @retval     0        Integer has been read correctly
+ * @retval    -1        Error while reading file
+ */
+int util_file_read_ui(unsigned int *val, int base, const char *fmt, ...)
+{
+	char path[PATH_MAX], buf[512];
+	va_list ap;
+	int count;
+
+	/* Construct the file name */
+	UTIL_VSPRINTF(path, fmt, ap);
+
+	if (file_gets(buf, sizeof(buf), path))
+		return -1;
+	switch (base) {
+	case 8:
+		count = sscanf(buf, "%uo", val);
+		break;
+	case 10:
+		count = sscanf(buf, "%uu", val);
+		break;
+	case 16:
+		count = sscanf(buf, "%ux", val);
+		break;
+	default:
+		util_panic("Invalid base: %d\n", base);
+	}
+	return (count == 1) ? 0 : -1;
+}
+
 /**
  * Read a file and convert it to unsigned long according to given base
  *
@@ -432,3 +508,31 @@ int util_file_read_ull(unsigned long long *val, int base, const char *fmt, ...)
 	}
 	return (count == 1) ? 0 : -1;
 }
+
+/**
+ * Read a file and convert it according to format string
+ *
+ * @param[in]  path     File name to read
+ * @param[in]  fmt      Format string for parsing the content
+ * @param[out] ...      Parameters for format string
+ *
+ * @retval     != -1    Number of values parsed correctly
+ * @retval    -1        Error while reading file
+ */
+
+int util_file_read_va(const char *path, const char *fmt, ...)
+{
+	char buf[512];
+	va_list ap;
+	int ret;
+
+	if (file_gets(buf, sizeof(buf), path))
+		return -1;
+
+	va_start(ap, fmt);
+	ret = vsscanf(buf, fmt, ap);
+	va_end(ap);
+	if (ret == EOF)
+		return -1;
+	return ret;
+}

libutil/util_opt.c

@@ -49,6 +49,7 @@ struct util_opt_l *util_opt_l = &l;
 #define MAX_OPTLEN	256
 
 static int opt_max_len(void);
+static bool opt_is_active(struct util_opt *opt);
 
 /**
  * Initialize the command line options
@@ -68,7 +69,9 @@ void util_opt_init(struct util_opt *opt_vec, const char *opt_prefix)
 
 	opterr = 0;
 	/* Get number of options */
-	for (count = 0; opt_vec[count].desc != NULL; count++);
+	for (i = 0, count = 0; opt_vec[i].desc != NULL; i++)
+		if (opt_is_active(&opt_vec[i]))
+			count++;
 	/*
 	 * Allocate short option string for worst case when all options have
 	 * optional parameters e.g "x::" and long option string.
@@ -85,7 +88,9 @@ void util_opt_init(struct util_opt *opt_vec, const char *opt_prefix)
 	/* Force getopt_long() to return ':' for missing required arguments */
 	*str++ = ':';
 	/* Construction of input structures for getopt_long() function.  */
-	for (i = 0, j = 0; i < count; i++) {
+	for (i = 0, j = 0; opt_vec[i].desc != NULL; i++) {
+		if (!opt_is_active(&opt_vec[i]))
+			continue;
 		if (opt_vec[i].flags & UTIL_OPT_FLAG_SECTION)
 			continue;
 		if (!(opt_vec[i].flags & UTIL_OPT_FLAG_NOLONG)) {

libutil/util_opt_command_example.c

@@ -42,6 +42,12 @@ static struct util_opt opt_vec[] = {
 		.desc = "Option with a required argument REQ_ARG",
 		.command = COMMAND_PULL,
 	},
+	{
+		.option = { "test", required_argument, NULL, 't'},
+		.argument = "TEST",
+		.desc = "Option 'test' with a required argument TEST for pull",
+		.command = COMMAND_PULL,
+	},
 	{
 		.desc = "OPTIONS",
 		.flags = UTIL_OPT_FLAG_SECTION,
@@ -57,7 +63,12 @@ static struct util_opt opt_vec[] = {
 		.option = { NULL, no_argument, NULL, 'l'},
 		.desc = "Option with only a short name",
 		.flags = UTIL_OPT_FLAG_NOLONG,
-		.command = "push",
+		.command = COMMAND_PUSH,
+	},
+	{
+		.option = { "test", no_argument, NULL, 't'},
+		.desc = "Option 'test' without an argument for push",
+		.command = COMMAND_PUSH,
 	},
 	UTIL_OPT_SECTION("COMMON OPTIONS"),
 	/* Standard option: -h,--help */
@@ -122,9 +133,6 @@ int main(int argc, char *argv[])
 	char **my_argv = argv;
 	char *command = NULL;
 
-	/* Install option vector */
-	util_opt_init(opt_vec, NULL);
-
 	/* The command name is the very first argument */
 	if (argc >= 2 && strncmp(argv[1], "-", 1) != 0) {
 		command = argv[1];
@@ -144,6 +152,9 @@ int main(int argc, char *argv[])
 	util_opt_set_command(command);
 	util_prg_set_command(command);
 
+	/* Install option vector */
+	util_opt_init(opt_vec, NULL);
+
 	/* Parse all options specified in my_argv[] */
 	while (1) {
 		/* Get the next option 'c' from my_argv[] */
@@ -173,6 +184,9 @@ int main(int argc, char *argv[])
 		case 'l':
 			printf("Specified: -l\n");
 			break;
+		case 't':
+			printf("Specified: --test %s\n", optarg ? optarg : "");
+			break;
 		default:
 			util_opt_print_parse_error(c, my_argv);
 			return EXIT_FAILURE;

libutil/util_proc.c

@@ -460,7 +460,7 @@ int util_proc_mnt_get_entry(const char *file_name, const char *spec,
 		rc = scan_mnt_entry(&file, entry);
 		if (rc)
 			goto out_free;
-		if (!strcmp(entry->spec, spec)) {
+		if (!strcmp(entry->vfstype, spec)) {
 			rc = 0;
 			goto out_free;
 		}

libutil/util_sys.c

@@ -11,17 +11,114 @@
 
 #include <err.h>
 #include <errno.h>
+#include <linux/fs.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 #include <unistd.h>
 
+#include "lib/util_file.h"
+#include "lib/util_libc.h"
 #include "lib/util_path.h"
 #include "lib/util_sys.h"
 
 /* lstat() doesn't work for sysfs files, a fixed size is therefore inevitable */
 #define READLINK_SIZE	256
+#define PAGE_SIZE	4096
+
+/**
+ * Return the partition number of a given partition.
+ *
+ * @param[in]	dev	Device node of interest
+ *
+ * @retval	int	Partition number of the device
+ * @retval	-1	Error when trying to read the partition number.
+ */
+int util_sys_get_partnum(dev_t dev)
+{
+	int partnum = -1;
+	char *path;
+
+	path = util_path_sysfs("dev/block/%u:%u/partition",
+			       major(dev), minor(dev));
+	if (util_file_read_i(&partnum, 10, path)) {
+		warnx("Could not read from path '%s'", path);
+		goto out;
+	}
+	if (partnum <= 0) {
+		warnx("Bad partition number in '%s'", path);
+		partnum = -1;
+		goto out;
+	}
+
+out:
+	free(path);
+	return partnum;
+}
+
+/**
+ * Determine if the given device is a partition.
+ *
+ * @param[in]	dev	Device node of interest
+ *
+ * @retval	true	Device is partition
+ * @retval	false	Device is not a partition
+ */
+bool util_sys_dev_is_partition(dev_t dev)
+{
+	bool is_part;
+	char *path;
+
+	path = util_path_sysfs("dev/block/%u:%u/partition",
+			       major(dev), minor(dev));
+	is_part = util_path_exists(path);
+	free(path);
+
+	return is_part;
+}
+
+/**
+ * Determine base device
+ *
+ * This function determines the base device \p base_dev of a given
+ * device \p dev. If \p dev is a base device, \p base_dev becomes \p dev.
+ *
+ * @param[in]	dev		Device node of interest
+ * @param[out]	base_dev	Identified base device
+ *
+ * @retval	 0		Success
+ * @retval	-1		Error while reading device information or
+ *				constructed path
+ */
+int util_sys_get_base_dev(dev_t dev, dev_t *base_dev)
+{
+	int base_major, base_minor;
+	char buf[PAGE_SIZE];
+	char *path;
+
+	/* check if the device already is a base device */
+	if (!util_sys_dev_is_partition(dev)) {
+		*base_dev = makedev(major(dev), minor(dev));
+		return 0;
+	}
+	path = util_path_sysfs("dev/block/%d:%d/../dev",
+			       major(dev), minor(dev));
+	if (util_file_read_line(buf, sizeof(buf), path)) {
+		warnx("Could not read from path '%s'", path);
+		free(path);
+		return -1;
+	}
+	free(path);
+	if (sscanf(buf, "%i:%i", &base_major, &base_minor) != 2) {
+		warn("Could not parse major:minor from string '%s'", buf);
+		return -1;
+	}
+	*base_dev = makedev(base_major, base_minor);
+
+	return 0;
+}
 
 /**
  * Identify device address
@@ -44,13 +141,17 @@ int util_sys_get_dev_addr(const char *dev, char *addr)
 	unsigned int maj, min;
 	struct stat s;
 	ssize_t len;
+	dev_t base;
 	char *path;
 
 	if (stat(dev, &s) != 0)
 		return -1;
 
-	maj = major(s.st_rdev);
+	if (util_sys_get_base_dev(s.st_rdev, &base))
-	min = minor(s.st_rdev);
+		return -1;
+
+	maj = major(base);
+	min = minor(base);
 
 	if (S_ISBLK(s.st_mode))
 		path = util_path_sysfs("dev/block/%u:%u/device", maj, min);

libzds/Makefile

@@ -2,6 +2,10 @@ include ../common.mak
 
 ALL_CFLAGS += -D_FILE_OFFSET_BITS=64
 
+ifneq (${HAVE_CURL},0)
+ALL_CFLAGS += -DHAVE_CURL
+endif
+
 lib = libzds.a
 
 all: $(lib)

libzds/libzds.c

@@ -18,7 +18,12 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_CURL
+#include <curl/curl.h>
+#endif /* HAVE_CURL */
 
+#include "lib/util_libc.h"
 #include "lib/dasd_base.h"
 #include "lib/dasd_sys.h"
 #include "lib/libzds.h"
@@ -300,6 +305,8 @@ struct dshandle {
 	unsigned long long skip;
 	/** @brief Detailed error messages in case of a problem */
 	struct errorlog *log;
+
+	char *session_ref;
 };
 
 /** @endcond */
@@ -2942,6 +2949,280 @@ void lzds_dshandle_close(struct dshandle *dsh)
 	dsh->is_open = 0;
 }
 
+#ifdef HAVE_CURL
+
+struct response_data {
+	char *session_ref;
+	unsigned long statuscode;
+};
+
+static size_t
+parse_response_callback(void *data, size_t size, size_t member, void *target)
+{
+	struct response_data *response = target;
+
+	if (strstr(data, "HTTP/1.1 500 Internal Server Error")) {
+		response->statuscode = 500;
+	} else if (strstr(data, "HTTP/1.1 200 OK")) {
+		response->statuscode = 200;
+	} else
+		sscanf(data, "X-IBM-Session-Ref: %m[^\n]\n",
+		       &response->session_ref);
+
+	return size*member;
+}
+
+static size_t write_discard_callback(void *UNUSED(data), size_t size, size_t member,
+				     void *UNUSED(target))
+{
+	/* do nothing just pretend all data has been processed */
+	return size*member;
+}
+
+CURL *lzds_prepare_curl(char *url)
+{
+	CURL *curl;
+
+	curl = curl_easy_init();
+	if (!curl)
+		return NULL;
+
+	curl_easy_setopt(curl, CURLOPT_URL, url);
+	curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
+	curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+	curl_easy_setopt(curl, CURLOPT_CONNECT_ONLY, 0L);
+	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "GET");
+	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_discard_callback);
+
+	return curl;
+}
+
+/**
+ * Ping the z/OSMS REST server.
+ * Used to check if the server is responding and accessible and to prevent
+ * the ENQ from timing out. If not used it would be automatically released
+ * after 10 minutes.
+ *
+ * @param[in]  dsh  The dshandle that keeps track of the I/O operations.
+ *             server The URL to the z/OSMF REST services
+ * @return     1 on success, 0 otherwise
+ */
+int lzds_rest_ping(struct dshandle *dsh, char *server)
+{
+	struct curl_slist *list = NULL;
+	char *release;
+	CURLcode res;
+	size_t size;
+	CURL *curl;
+	char *url;
+
+	url = util_strcat_realloc(NULL, server);
+	url = util_strcat_realloc(url, "restfiles/ping");
+
+	curl = lzds_prepare_curl(url);
+	if (!curl) {
+		free(url);
+		return 0;
+	}
+
+	list = curl_slist_append(list, "X-CSRF-ZOSMF-HEADER: none");
+	if (dsh && dsh->session_ref) {
+		size = sizeof("X-IBM-Session-Ref: ") + strlen(dsh->session_ref);
+		release = util_zalloc(size);
+		snprintf(release, size, "X-IBM-Session-Ref: %s",
+			 dsh->session_ref);
+		list = curl_slist_append(list, release);
+	}
+	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
+	res = curl_easy_perform(curl);
+	curl_slist_free_all(list);
+	curl_easy_cleanup(curl);
+
+	if (res == CURLE_OK) {
+		free(url);
+		return 1;
+	}
+
+	fprintf(stderr, "URL: %s\n", url);
+	fprintf(stderr, "Error: %s\n", curl_easy_strerror(res));
+	free(url);
+	return 0;
+}
+
+/**
+ * Mark the dataset as in use for z/OS.
+ * Use z/OSMF REST services to read a small amount of data and get an exclusive
+ * ENQ that prevents z/OS applications from writing to the dataset in parallel
+ * until the ENQ is released.
+ *
+ * @param[in]  dsh  The dshandle that keeps track of the I/O operations.
+ *             server The URL to the z/OSMF REST services
+ * @return     0 on success, otherwise one of the following error codes:
+ *   - ENOTSUP Unable to setup curl and therefore no further access possible.
+ *   - EPERM ENQ not obtained and therefore access is not allowed.
+ */
+int lzds_rest_get_enq(struct dshandle *dsh, char *server)
+{
+	struct curl_slist *list = NULL;
+	struct response_data response;
+	int first_run;
+	CURLcode res;
+	CURL *curl;
+	char *url;
+	int rc;
+
+	url = util_strcat_realloc(NULL, server);
+	url = util_strcat_realloc(url, "restfiles/ds/");
+	url = util_strcat_realloc(url, dsh->ds->name);
+
+	memset(&response, 0, sizeof(response));
+	/*
+	 * in the first run provide a range statement to read only 1 record of
+	 * the dataset to get an ENQ.
+	 * For the unlikely case that the dataset is empty
+	 * "500 Internal Server Error" will be returned.
+	 * If this is the case give it a second try without a range statement
+	 */
+	first_run = 1;
+	list = curl_slist_append(list, "X-IBM-Record-Range: 0-1");
+retry:
+	rc = 1;
+	curl = lzds_prepare_curl(url);
+	if (!curl) {
+		free(url);
+		return errorlog_add_message(
+			&dsh->log,
+			NULL, ENOTSUP,
+			"curl handle not established for dataset %s\n",
+			dsh->ds->name);
+	}
+
+	curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, parse_response_callback);
+	curl_easy_setopt(curl, CURLOPT_HEADERDATA, &response);
+	list = curl_slist_append(list, "X-CSRF-ZOSMF-HEADER: none");
+	list = curl_slist_append(list, "X-IBM-Obtain-ENQ: EXCLU");
+
+	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
+	res = curl_easy_perform(curl);
+
+	if (res != CURLE_OK) {
+		rc = errorlog_add_message(&dsh->log, NULL, ECONNREFUSED,
+					  "Error: %s\n",
+					  curl_easy_strerror(res));
+	} else {
+		if (first_run && response.statuscode == 500) {
+			curl_slist_free_all(list);
+			curl_easy_cleanup(curl);
+			first_run = 0;
+			list = NULL;
+			goto retry;
+		}
+		/* expect that the callback function found a reference string, double check */
+		if (response.statuscode == 200 && response.session_ref) {
+			dsh->session_ref = response.session_ref;
+			rc = 0;
+		} else {
+			rc = errorlog_add_message(
+				&dsh->log,
+				NULL, EPERM,
+				"no session ref obtained for dataset %s rest rc %ld\n",
+				dsh->ds->name, response.statuscode);
+		}
+	}
+
+	free(url);
+	curl_slist_free_all(list);
+	curl_easy_cleanup(curl);
+
+	return rc;
+}
+
+/**
+ * Mark the dataset as no longer in use for z/OS.
+ * Use z/OSMF REST services to read a small amount of data and release the exclusive
+ * ENQ that was previously obtained.
+ *
+ * @param[in]  dsh  The dshandle that keeps track of the I/O operations.
+ *             server The URL to the z/OSMF REST services
+ * @return     0 on success, otherwise one of the following error codes:
+ *   - ENOTSUP Unable to release the ENQ.
+ */
+int lzds_rest_release_enq(struct dshandle *dsh, char *server)
+{
+	struct curl_slist *list = NULL;
+	struct response_data response;
+	char *release;
+	int first_run;
+	CURLcode res;
+	CURL *curl;
+	char *url;
+
+
+	if (!dsh->session_ref) {
+		fprintf(stderr, "No ENQ to release.\n");
+		return 0;
+	}
+
+	url = util_strcat_realloc(NULL, server);
+	url = util_strcat_realloc(url, "restfiles/ds/");
+	url = util_strcat_realloc(url, dsh->ds->name);
+
+	release = util_strcat_realloc(NULL, "X-IBM-Session-Ref: ");
+	release = util_strcat_realloc(release, dsh->session_ref);
+
+	memset(&response, 0, sizeof(response));
+	/*
+	 * in the first run provide a range statement to read only 1 record of
+	 * the dataset to release the ENQ.
+	 * For the unlikely case that the dataset is empty
+	 * "500 Internal Server Error" will be returned.
+	 * If this is the case give it a second try without a range statement
+	 */
+	first_run = 1;
+	list = curl_slist_append(list, "X-IBM-Record-Range: 0-1");
+retry:
+	curl = lzds_prepare_curl(url);
+	if (!curl) {
+		free(url);
+		free(release);
+		return errorlog_add_message(
+			&dsh->log,
+			NULL, ENOTSUP,
+			"curl handle not established for dataset %s\n",
+			dsh->ds->name);
+	}
+
+	list = curl_slist_append(list, "X-CSRF-ZOSMF-HEADER: none");
+	list = curl_slist_append(list, "X-IBM-Release-ENQ: true");
+	list = curl_slist_append(list, release);
+	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
+	curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, parse_response_callback);
+	curl_easy_setopt(curl, CURLOPT_HEADERDATA, &response);
+	res = curl_easy_perform(curl);
+
+	if (res != CURLE_OK) {
+		errorlog_add_message(&dsh->log, NULL, ENOTSUP, "Error: %s\n",
+				     curl_easy_strerror(res));
+	} else if (first_run && response.statuscode == 500) {
+		curl_slist_free_all(list);
+		curl_easy_cleanup(curl);
+		first_run = 0;
+		list = NULL;
+		goto retry;
+	}
+
+	curl_slist_free_all(list);
+	curl_easy_cleanup(curl);
+	free(dsh->session_ref);
+	free(release);
+	free(url);
+	dsh->session_ref = NULL;
+
+	return res;
+}
+
+#endif /* HAVE_CURL */
+
 
 /**
  * This makes the data set context ready for read operations.

lsstp/Makefile

@@ -0,0 +1,18 @@
+include ../common.mak
+
+libs = $(rootdir)/libutil/libutil.a
+all: lsstp
+
+lsstp: lsstp.o $(libs)
+
+install: all
+	$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) \
+		$(DESTDIR)$(MANDIR)/man8
+	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 lsstp $(DESTDIR)$(BINDIR)
+	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 lsstp.8 \
+		$(DESTDIR)$(MANDIR)/man8
+
+clean:
+	rm -f *.o *~ lsstp core
+
+.PHONY: all install clean

lsstp/lsstp.8

@@ -0,0 +1,79 @@
+.\" Copyright 2020 IBM Corp.
+.\" s390-tools is free software; you can redistribute it and/or modify
+.\" it under the terms of the MIT license. See LICENSE for details.
+.\"
+.TH LSSTP 8 "Jul 2020" "s390-tools" "Linux Administrator's Manual"
+.SH NAME
+.B "lsstp "
+\- Show STP configuration information
+.SH SYNOPSIS
+.BI "lsstp "
+
+.SH DESCRIPTION
+.B lsstp
+displays information about the current Server Time Protocol (STP) configuration
+like coordinated time network (CTN) ID, timing state and leap seconds.
+.SH OUTPUT
+.TP
+.B STP online
+Indication of the online state
+.TP
+.B CTN ID
+The ID of the coordinated time network. If it can be decoded as EBCDIC it is shown as an EBCDIC string, otherwise a hexadecimal representation is shown.
+.TP
+.B CTN Type
+The type of timing network.
+.IP
+.B No CTN
+STP is not configured for attachment to a CTN.
+.IP
+.B STP-only
+STP is configured and attached to a CTN with only STP nodes.
+.IP
+.B Mixed
+STP is configured and attached to a CTN with both STP and external time reference (ETR) nodes.
+.TP
+.B Stratum
+The number of servers in the timing path between the local STP clock and the selected primary time server.
+.TP
+.B Timing mode
+.IP
+.B Local
+The Time-of-day (TOD) clock is stepped by the local hardware oscillator and is not steered by the STP facility.
+.IP
+.B ETR
+The TOD clock is synchronized with an attached 9037 Sysplex Timer.
+.IP
+.B STP
+The TOD clock is steered by the STP facility to maintain synchronization with a Coordinated Server Time (CST).
+.IP
+.B Uninitialized
+The TOD clock is not initialized. The STP facility is allowed to perform a step adjustment to the TOD clock for synchronization.
+.TP
+.B Timing state
+The synchronization state of the STP facility. Can be unsynchronized, synchronized or stopped.
+.TP
+.B DST offset
+The daylight savings time offset relative to UTC in minutes.
+.TP
+.B Timezone offset
+The offset of the local time relative to UTC in minutes.
+.TP
+.B Time offset
+The total time offset at the server. This field is only valid in mixed CTN configurations.
+.TP
+.B Active leap seconds
+The number of leap seconds that are currently in effect at the STP facility.
+.TP
+.B Leap second <insertion|deletion> at
+If a leap second insertion or deletion is scheduled in the STP facility, this field shows the day and time of the scheduled change.
+.SH OPTIONS
+.TP
+.BI "-v|--version"
+Print version number.
+.TP
+.BI "-h|--help"
+Print usage text.
+
+.SH AUTHORS
+Sven Schnelle <svens@linux.ibm.com>

lsstp/lsstp.c

@@ -0,0 +1,218 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <string.h>
+#include <errno.h>
+#include <time.h>
+#include <iconv.h>
+#include <inttypes.h>
+
+#include "lib/util_opt.h"
+#include "lib/util_file.h"
+#include "lib/util_prg.h"
+#include "lib/util_path.h"
+
+static const struct util_prg prg = {
+	.desc = "Display STP system information",
+	.args = "",
+	.copyright_vec = {
+		{
+			.owner = "IBM Corp.",
+			.pub_first = 2020,
+		},
+		UTIL_PRG_COPYRIGHT_END
+	}
+};
+
+static struct util_opt opt_vec[] = {
+	UTIL_OPT_HELP,
+	UTIL_OPT_VERSION,
+	UTIL_OPT_END
+};
+
+struct stp_parms {
+	uint64_t ctn_id;
+	unsigned int online;
+	unsigned int leap_seconds;
+	int leap_seconds_diff;
+	unsigned int leap_seconds_utc;
+	unsigned int stratum;
+	unsigned int ctn_type;
+	unsigned int timing_mode;
+	unsigned int timing_state;
+	int dst_offset;
+	int time_offset;
+	int time_zone_offset;
+};
+
+static int convert_ctn_id(char *in, char *out)
+{
+	iconv_t ic;
+	size_t inlen = sizeof(unsigned long long);
+	size_t outlen = sizeof(unsigned long long);
+
+	ic = iconv_open("ISO-8859-1", "EBCDIC-US");
+	if (ic == (iconv_t)-1) {
+		warn("Could not initialize EBCDIC to ISO-8859-1 conversion table");
+		return -1;
+	}
+
+	if (iconv(ic, &in, &inlen, (char **)&out, &outlen) == (size_t)-1) {
+		warn("Code page translation EBCDIC to ISO-8859-1 failed");
+		iconv_close(ic);
+		return -1;
+	}
+	iconv_close(ic);
+	return 0;
+}
+
+static const char *ctn_type_str(int type)
+{
+	switch (type) {
+	case 0:
+		return "No CTN defined";
+	case 1:
+		return "STP-only";
+	case 2:
+		return "mixed";
+	default:
+		return "unknown";
+	}
+}
+
+static const char *tmd_to_str(int mode)
+{
+	switch (mode) {
+	case 0:
+		return "Local";
+	case 1:
+		return "ETR";
+	case 2:
+		return "STP";
+	case 15:
+		return "Uninitialized";
+	default:
+		return "unknown";
+	}
+}
+
+static const char *tst_to_str(int mode)
+{
+	switch (mode) {
+	case 0:
+		return "Unsynchronized";
+	case 1:
+		return "Synchronized";
+	case 2:
+		return "Physical clock stopped";
+	default:
+		return "unknown";
+	}
+}
+
+static const char *yesno_str(int val)
+{
+	return val ? "yes" : "no";
+}
+
+#define read_sysfs_attr(attr, parm, func, base)							\
+	do {											\
+		path = util_path_sysfs("devices/system/stp/%s", attr);				\
+		ret = func(parm, base, path);							\
+		if (ret) {									\
+			fprintf(stderr, "failed to open %s: %s\n", path, strerror(errno));	\
+			free(path);								\
+			exit(EXIT_FAILURE);							\
+		}										\
+		free(path);									\
+	} while (0)
+
+int main(int argc, char **argv)
+{
+	struct stp_parms parm = { 0 };
+	char ctn_id[32] = { 0 };
+	char *path;
+	int ret, c;
+
+	util_prg_init(&prg);
+	util_opt_init(opt_vec, NULL);
+
+	for (;;) {
+		c = util_opt_getopt_long(argc, argv);
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'v':
+			util_prg_print_version();
+			exit(EXIT_SUCCESS);
+		case 'h':
+			util_prg_print_help();
+			util_opt_print_help();
+			exit(EXIT_SUCCESS);
+		default:
+			fprintf(stderr, "Try 'lsstp --help' for more information.\n");
+			exit(EXIT_FAILURE);
+		}
+	}
+
+	read_sysfs_attr("online", &parm.online, util_file_read_ui, 10);
+	if (!parm.online) {
+		printf("STP disabled\n");
+		goto out;
+	}
+
+	read_sysfs_attr("ctn_id", &parm.ctn_id, util_file_read_ul, 16);
+	read_sysfs_attr("ctn_type", &parm.ctn_type, util_file_read_ui, 10);
+	read_sysfs_attr("stratum", &parm.stratum, util_file_read_ui, 10);
+	read_sysfs_attr("leap_seconds", &parm.leap_seconds, util_file_read_ui, 10);
+	read_sysfs_attr("timing_mode", &parm.timing_mode, util_file_read_ui, 10);
+	read_sysfs_attr("timing_state", &parm.timing_state, util_file_read_ui, 10);
+	read_sysfs_attr("dst_offset", &parm.dst_offset, util_file_read_i, 10);
+	read_sysfs_attr("time_offset", &parm.time_offset, util_file_read_i, 10);
+	read_sysfs_attr("time_zone_offset", &parm.time_zone_offset, util_file_read_i, 10);
+
+	if (convert_ctn_id((char *)&parm.ctn_id, ctn_id))
+		snprintf(ctn_id, sizeof(ctn_id)-1, "%016" PRIx64, parm.ctn_id);
+
+	printf("STP online:            %s\n"
+	       "CTN ID:                %s\n"
+	       "CTN type:              %s\n"
+	       "Stratum:               %d\n"
+	       "Timing mode:           %s\n"
+	       "Timing state:          %s\n"
+	       "DST offset:            %d\n"
+	       "Timezone offset:       %d\n"
+	       "Time offset:           %d\n"
+	       "Active leap seconds:   %d\n",
+	       yesno_str(parm.online),
+	       ctn_id,
+	       ctn_type_str(parm.ctn_type),
+	       parm.stratum,
+	       tmd_to_str(parm.timing_mode),
+	       tst_to_str(parm.timing_state),
+	       parm.dst_offset,
+	       parm.time_zone_offset,
+	       parm.time_offset,
+	       parm.leap_seconds);
+
+	printf("Scheduled leap second: ");
+
+	path = util_path_sysfs("devices/system/stp/leap_seconds_scheduled");
+	if (util_file_read_va(path, "%d,%d", &parm.leap_seconds_utc,
+				&parm.leap_seconds_diff) == 2 &&
+			parm.leap_seconds_diff && parm.leap_seconds_utc) {
+		time_t lsoup = parm.leap_seconds_utc;
+
+		printf("%s at: %s UTC",
+			parm.leap_seconds_diff > 0 ? "insertion" : "deletion",
+			ctime(&lsoup));
+	} else {
+		printf("-\n");
+	}
+	free(path);
+	return 0;
+out:
+	return 1;
+}

man/dumpconf.8

@@ -45,7 +45,7 @@ vmcmd: Trigger CP command according to the 'VMCMD_X' configuration in
 
 .TP
 \fB  - DUMP_TYPE:\fR
-Type of dump device. Possible values are 'ccw' and 'fcp'.
+Type of dump device. Possible values are 'ccw', 'fcp' and 'nvme'.
 
 .TP
 \fB  - DEVICE:\fR
@@ -59,6 +59,14 @@ WWPN for SCSI dump device.
 \fB  - LUN\fR
 LUN for SCSI dump device.
 
+.TP
+\fB  - FID\fR
+Function ID for NVMe dump device.
+
+.TP
+\fB  - NSID\fR
+Namespace ID for NVMe dump device.
+
 .TP
 \fB  - BOOTPROG:\fR
 Boot program selector.
@@ -159,6 +167,25 @@ BOOTPROG=0
 BR_LBA=0
 .br
 
+#
+.br
+# Example configuration for an NVMe dump device (NVMe Disk)
+.br
+#
+.br
+ON_PANIC=dump
+.br
+DUMP_TYPE=nvme
+.br
+FID=0x0300
+.br
+NSID=0x0001
+.br
+BOOTPROG=0
+.br
+BR_LBA=0
+.br
+
 #
 .br
 # Example configuration for CP commands

netboot/Makefile

@@ -2,15 +2,27 @@
 
 include ../common.mak
 
+SCRIPTS = mk-s390image mk-pxelinux-ramfs
 NETBOOT_SAMPLEDIR=$(TOOLS_DATADIR)/netboot
 
 all:
 
-install: all
+install: install-scripts
-	$(INSTALL) -d -m 755 $(DESTDIR)$(NETBOOT_SAMPLEDIR)
+	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 \
-	$(INSTALL) -m 755 mk-s390image mk-pxelinux-ramfs \
+		Dockerfile Makefile.pxelinux.0 README.md mk-s390image.1 \
-		$(DESTDIR)$(NETBOOT_SAMPLEDIR)
-	$(INSTALL) -m 644 Dockerfile Makefile.pxelinux.0 README.md \
 		$(DESTDIR)$(NETBOOT_SAMPLEDIR)
 
-.PHONY: all install clean
+install-scripts: $(SCRIPTS)
+	@if [ ! -d $(DESTDIR)$(NETBOOT_SAMPLEDIR) ]; then \
+		mkdir -p $(DESTDIR)$(NETBOOT_SAMPLEDIR); \
+		chown $(OWNER).$(GROUP) $(DESTDIR)$(NETBOOT_SAMPLEDIR); \
+		chmod 755 $(DESTDIR)$(NETBOOT_SAMPLEDIR); \
+	fi; \
+	for i in $^; do \
+		$(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
+		< $$i >$(DESTDIR)$(NETBOOT_SAMPLEDIR)/$$i; \
+		chown $(OWNER).$(GROUP) $(DESTDIR)$(NETBOOT_SAMPLEDIR)/$$i; \
+		chmod 755 $(DESTDIR)$(NETBOOT_SAMPLEDIR)/$$i; \
+	done
+
+.PHONY: all install clean install-scripts

netboot/Makefile.pxelinux.0

@@ -21,7 +21,7 @@ ifeq ($(KERNEL_IMAGE),)
 $(error Could not find a kernel image under /boot)
 endif
 
-BUSYBOX=busybox-1.27.1
+BUSYBOX=busybox-1.32.0
 BBINSTALL=$(BUSYBOX)/_install
 
 all: $(KERNEL_IMAGE) pxelinux.initramfs

netboot/mk-pxelinux-ramfs

@@ -54,9 +54,18 @@ OPTIONS
 -b        Search installed busybox in directory BUSYBOX_DIR
 -k        Use KERNEL_VERSION instead of currently running kernel
 -h        Print this help, then exit
+-v        Print version information, then exit
 EOF
 }
 
+printversion()
+{
+	cat <<-EOD
+	$cmd: version %S390_TOOLS_VERSION%
+	Copyright IBM Corp. 2017
+	EOD
+}
+
 # Get shared objects for binary
 sharedobjs()
 {
@@ -64,7 +73,7 @@ sharedobjs()
 }
 
 # Check args
-args=$(getopt b:k:h $*)
+args=$(getopt b:k:hv $*)
 if [ $? = 0 ]
 then
 	set -- $args
@@ -74,6 +83,7 @@ then
 			-b) busyboxdir=$2; shift 2;;
 			-k) kernelversion=$2; shift 2;;
 		        -h) usage; exit 0;;
+		        -v) printversion; exit 0;;
 		        --) shift; break;;
 		        *) echo "$cmd: Unexpected argument $1, exiting..." >&2; exit 1;;
 		esac

netboot/mk-s390image

@@ -60,9 +60,18 @@ OPTIONS
 -p        Use PARMFILE with kernel parameters in the image
 -r        Include RAMDISK in the image
 -h        Print this help, then exit
+-v        Print version information, then exit
 EOF
 }
 
+printversion()
+{
+	cat <<-EOD
+	$cmd: version %S390_TOOLS_VERSION%
+	Copyright IBM Corp. 2017
+	EOD
+}
+
 # Convert decimal number to big endian doubleword
 dec2be64()
 {
@@ -129,6 +138,9 @@ dobuild()
 		parmfile_size=$(du -b $parmfile | cut -f1)
 		if [ $parmfile_size -le $MAX_PARMFILE_SIZE ]
 		then
+			# Clear any previous parameters
+			dd seek=$OFFS_COMMANDLINE_BYTES bs=1 count=$MAX_PARMFILE_SIZE \
+                            if=/dev/zero of=$image conv=notrunc status=none
 			dd seek=$OFFS_COMMANDLINE_BYTES bs=1 if=$parmfile \
 			    of=$image conv=notrunc status=none
 		else
@@ -142,7 +154,7 @@ dobuild()
 }
 
 # check args and build
-args=$(getopt "r:p:h" $*)
+args=$(getopt "r:p:hv" $*)
 if [ $? = 0 ]
 then
 	set -- $args
@@ -152,6 +164,7 @@ then
 			-r) ramdisk=$2; shift 2;;
 			-p) parmfile=$2; shift 2;;
 			-h) usage; exit 0;;
+			-v) printversion; exit 0;;
 			--) shift; break;;
 			*) echo "$cmd: Unexpected argument $1, exiting..." >&2; exit 1;;
 		esac