New release s390-tools-2.6.0

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

.gitignore

@@ -3,7 +3,7 @@
 #
 *.o
 *.a
-*.d
+*.o.d
 
 #
 # Ignore generated executables and other generated files
@@ -46,6 +46,7 @@ libutil/util_prg_example
 libutil/util_rec_example
 libutil/util_scandir_example
 libzds/libzds.a
+libvmcp/vmcp_example
 mon_tools/mon_fsstatd
 mon_tools/mon_procd
 osasnmpd/osasnmpd
@@ -86,4 +87,5 @@ zipl/boot/*.exec
 zipl/boot/data.h
 zipl/src/chreipl_helper.device-mapper
 zipl/src/zipl
+zipl/src/zipl_helper.device-mapper
 zkey/zkey

AUTHORS.md

@@ -2,24 +2,28 @@ List of all individuals having contributed content to s390-tools
 ----------------------------------------------------------------
 
 - Alexey Ishchuk
-- Andre Wild
 - Andreas Herrmann
+- Andre Wild
 - Antoinette Kaschner
 - Arnd Bergmann
 - Axel Wirbser
 - Benjamin Block
 - Carsten Otte
 - Christian Borntraeger
+- Christian Ehrhardt
 - Christof Schmitt
 - Claudio Imbrenda
 - Clemens von Mann
+- Dan Horak
 - Despina Papadopoulou
+- Dimitri John Ledkov
 - Eberhard Pasch
 - Einar Lueck
 - Erwin Vicari
 - Eugene Crosser
 - Eugene Dvurechenski
 - Farhan Ali
+- Fedor Loshakov
 - Felix Beck
 - Frank Blaschka
 - Frank Munzert
@@ -27,8 +31,9 @@ List of all individuals having contributed content to s390-tools
 - Fritz Elfert
 - Gerald Schaefer
 - Gerhard Tonn
-- Hans Wippel
+- Hannes Reinecke
 - Hans-Joachim Picht
+- Hans Wippel
 - Harald Freudenberger
 - Heiko Carstens
 - Hendrik Brueckner
@@ -41,6 +46,7 @@ List of all individuals having contributed content to s390-tools
 - Jan Glauber
 - Jan Hoeppner
 - Jan Willeke
+- Javier Martinez Canillas
 - Jean-Baptiste Joret
 - Jens Remus
 - Jochen Roehrig
@@ -64,6 +70,8 @@ List of all individuals having contributed content to s390-tools
 - Peter Oberparleiter
 - Peter Tiedemann
 - Philipp Kern
+- Philipp Rudo
+- Rafael Fonseca
 - Raimund Schroeder
 - Ralph Wuerthner
 - Rene Trumpp
@@ -90,6 +98,7 @@ List of all individuals having contributed content to s390-tools
 - Thomas Weber
 - Ursula Braun
 - Utz Bacher
+- Vasily Gorbik
 - Viktor Mihajlovski
 - Volker Sameske
 - Wolfgang Taphorn

CHANGELOG.md

@@ -1,8 +1,93 @@
 Release history for s390-tools (MIT version)
 --------------------------------------------
+ * __v2.6.0 (2018-08-10)__
+
+  For Linux kernel version: 4.18
+
+  Add new tool:
+  - zkey: Add zkey-cryptsetup tool
+  Changes of existing tools:
+  - netboot: add BOOTIF support
+
+  Bug Fixes:
+  - mon_procd: fix parsing of /proc/<pid>/stat
+  - netboot: Include compressed kernel modules in initramfs
+  - netboot: Send client architecture and handle path prefix
+
+ * __v2.5.0 (2018-06-08)__
+
+  For Linux kernel version: 4.17
+
+  Changes of existing tools:
+  - zdev: Add support for reading firmware configuration files
+  - zipl: Add BootLoaderSpec support
+  - scripts: Add script to switch zipl config to a BootLoaderSpec setup
+
+  Bug Fixes:
+  - lsluns: Print a message if no adapter or port exists
+
+ * __v2.4.0 (2018-05-07)__
+
+  For Linux kernel version: 4.16
+
+  Changes of existing tools:
+  - dbginfo: Gather nvme related data
+  - zipl: Rewrite helper script in C
+  - libutil: Add function util_strstrip
+  - libvmcp: Introduce libvmcp
+  - zipl: Extend DASD stand-alone dumpers to drop zero pages
+  - zgetdump: Add verbose option
+  - zgetdump: Add 'Dump file size' field for zgetdump -i output
+  - cpumf: Add IBM z14 ZR1 to the CPU Measurement Facility model list
+  - zkey: Add build dependency to OpenSSL (libcrypto)
+  - zkey: Add keystore implementation
+
+
+  Bug Fixes:
+  - hmcdrvfs: fix parsing of link count >= 1000
+  - zgetdump: Avoid Segfault on processing dumps with memory limit
+  - chreipl: correct fcp reipl sysfs write sequence
+  - udev: Replace WAIT_FOR with TEST keyword
+
+* __v2.3.0 (2018-01-30)__
+
+  For Linux kernel version: 4.15
+
+  Changes of existing tools:
+  - lscpumf: Add support for IBM z14 hardware counters
+  - libdasd: Introduce libdasd and use for dasd tools
+  - zipl: Always build and link without PIE
+
+  Bug Fixes:
+  - zgetdump: Fix handling of DASD multi-volume dump for partitions above 4 GB
+  - zdev: Fix zdev dracut module aborting on unknown root device
+
+* __v2.2.0 (2017-12-07)__
+
+  For Linux kernel version: 4.14
+
+  Removed tools:
+  - lsmem/chmem: Moved to util-linux >= 2.30
+
+  Changes of existing tools:
+  - lszcrypt: Add CEX6S support
+  - cpuplugd/mon_tools: Improve systemctl start error handling
+  - systemd: Install also the unit configuration files
+
+  Bug Fixes:
+  - build process: Fix parallel build for libutil
+  - cpi: Add missing Install section to service unit
+  - lsluns: Do not scan (all) if filters match nothing
+  - lsluns: Enhance usage statement and man page
+  - zdev: Use correct path to vmcp binary
+  - ziomon: Re-add missing line in ziomon_fcpconf
+  - ziomon: Fix non-zero return code in ziomon_util
+  - zipl: Remove invalid dasdview command line option
 
 * __v2.1.0 (2017-09-25)__
 
+  For Linux kernel version: 4.13
+
   Added new tools:
   - netboot: Scripts for building a PXE-style netboot image for KVM
   - 90-cpi.rules/cpictl: New udev rule to update CPI when KVM is used

CODINGSTYLE.md

@@ -0,0 +1,47 @@
+Coding guidelines for s390-tools
+================================
+
+For s390-tools the preferred language is C. We provide libraries, e.g.
+[`libutil`](libutil) that should be used by all tools if possible.
+
+The coding style is based on the Linux [kernel guidelines]. Therefore, use
+the [checkpatch] tool for verification before you submit a patch.
+
+[kernel guidelines]: https://www.kernel.org/doc/html/latest/process/coding-style.html
+[checkpatch]: https://github.com/torvalds/linux/blob/master/scripts/checkpatch.pl
+
+Below we describe some additional things that we want you to consider when
+writing new code for s390-tools.
+
+This package started in 2001 and has a long "tradition" - therefore, older tools
+might not follow all recommendations. Note that when changing existing code,
+consistency could have priority over applying rules.
+
+Standard abbreviations
+----------------------
+
+The abbreviations below are recommended to be used in the source code.
+
+| __Short Name__  | __Long Name__                                     |
+|:----------------|:--------------------------------------------------|
+| attr            | Attribute                                         |
+| blk             | Block                                             |
+| buf             | Buffer                                            |
+| col             | Column                                            |
+| count           | Count                                             |
+| desc            | Description                                       |
+| dir             | Directory                                         |
+| fd              | File descriptor (open)                            |
+| fp              | File pointer (fopen)                              |
+| len             | Length                                            |
+| lib             | Library                                           |
+| mod             | Module                                            |
+| nr              | Number                                            |
+| parm            | Parameter                                         |
+| path            | File path                                         |
+| ptr             | Pointer                                           |
+| rc              | Return code                                       |
+| size            | Size                                              |
+| src             | Source                                            |
+| str             | String                                            |
+| sym             | Symbol                                            |

CONTRIBUTING.md

@@ -42,24 +42,222 @@ Developer's Certificate of Origin 1.1
            this project or the open source license(s) involved.
 ```
 
-If you can certify the above, just add a line saying:
+If you can certify the above, just add a line stating the following at the
+bottom of each of your commit messages:
 
 ```
 Signed-off-by: Random Developer <random@developer.example.org>
 ```
 
-Please use your real name (no pseudonyms or anonymous contributions).
+Please use your real name and a valid e-mail address (no pseudonyms or anonymous
+contributions).
 
 Submitting code
 ---------------
-The preferred way is to create a github pull request for your code.
+The preferred way is to create GitHub pull requests for your code contributions.
+Please create separate pull requests for each logical enhancement, new feature,
+or fix.
 
-Coding guidelines
------------------
-For s390-tools the preferred language is C. We provide libraries, e.g. libutil
-that should be used by all tools if possible.
+Before you submit your code please consider our recommendations in the
+[CODINGSTYLE](CODINGSTYLE.md) document.
 
-The coding style is based on the Linux kernel guidelines. Therefore, use
-the checkpatch tool [1] for verification before you submit a patch.
+GitHub workflow for contributions
+---------------------------------
+In the examples below we use this fictive identity:
 
-[1] https://github.com/torvalds/linux/blob/master/scripts/checkpatch.pl
+ - Name: Random Developer
+ - E-mail: random@developer.example.org
+ - GitHub ID: random-developer
+
+### 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)
+   main page
+
+2. Clone your forked repository to your local development system
+   ```
+   $ git clone https://github.com/random-developer/s390-tools.git
+   ```
+
+3. Configure a remote called "upstream" pointing to the official
+   s390-tools repository on GitHub
+   ```
+   $ cd s390-tools
+   ~/s390-tools $ git remote add upstream https://github.com/ibm-s390-tools/s390-tools.git
+   ```
+
+4. Verify your remotes
+   ```
+   ~/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-tools/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.
+
+5. Configure your git user name and e-mail
+   ```
+   ~/s390-tools $ git config user.name "Random Developer"
+   ~/s390-tools $ git config user.email "random@developer.example.com"
+   ```
+
+### Create a pull request
+
+1. Create and checkout a new branch for your contribution
+   ```
+   ~/s390-tools $ git checkout -b contrib-doc-pr
+   ```
+
+2. Make your changes to the code
+   ```
+   ~/s390-tools $ vim CONTRIBUTING.md
+   ```
+
+3. Build and test your contribution
+   ```
+   ~/s390-tools $ make clean all
+   ~/s390-tools $ # Whatever you have to do for testing
+   ```
+
+4. Commit your changes
+   ```
+   ~/s390-tools $ git add CONTRIBUTING.md
+   ~/s390-tools $ git commit -s
+   ```
+
+   Provide a meaningful commit message including your "Signed-off-by" line to
+   each commit:
+   ```
+   CONTRIBUTING: Outline steps to submit code
+
+   Explain in more detail how to submit s390-tools contributions as GitHub
+   pull requests.
+
+   Signed-off-by: Random Developer <random@developer.example.com>
+   ```
+
+5. Use the [checkpatch] tool to validate your commits
+   ```
+   ~/s390-tools $ checkpatch.pl --no-tree --git master..HEAD
+   ```
+
+   Interpret the checkpatch messages wisely - e.g. the 80 character rule can be
+   ignored for printf format strings.
+
+   [checkpatch]: https://github.com/torvalds/linux/blob/master/scripts/checkpatch.pl
+
+6. Push the changes to your fork of the repository
+   ```
+   ~/s390-tools $ git push origin contrib-doc-pr
+   ```
+
+7. Go to the GitHub website of your s390-tools fork and create a pull request
+   for your branch "contrib-doc-pr"
+
+### Update a pull request during review
+
+If there are changes requested during the review process, you have to update
+your code in the pull request.
+
+To retain the existing review comments, add commits on top of your pull request
+branch. Depending on the size and number of changes, a rebase of the pull
+request might be required. This will be communicated during the review.
+
+1. Update your code with new commits
+   ```
+   ~/s390-tools $ vi CONTRIBUTING.md
+   ~/s390-tools $ git add CONTRIBUTING.md
+   ~/s390-tools $ git commit -s -m "CONTRIBUTING: Add update PR info"
+   ```
+
+2. Update your pull request by pushing changes
+   ```
+   ~/s390-tools $ git push origin contrib-doc-pr
+   ```
+
+### Finalize a pull request
+
+After the review process is finished or if you are explicitly asked for it,
+you have to create a clean commit series.
+
+1. Save branch to "contrib-doc-pr.v1"
+   ```
+   $ cd s390-tools
+   ~/s390-tools $ git branch contrib-doc-pr.v1
+   ```
+
+2. Use interactive git rebase to merge commits, adjust commit messages,
+   and rebase onto your local master branch
+   ```
+   ~/s390-tools $ git rebase -i master
+   ```
+
+   An editor is started and shows the following:
+   ```
+   pick 2c73b9fc CONTRIBUTING: Outline steps to submit code
+   pick fcfb0412 CONTRIBUTING: Add update PR info
+   ```
+
+   To merge the update into the original commit, replace "pick fcfb0412"
+   with "squash fcfb0412".
+
+   ```
+   pick 2c73b9fc CONTRIBUTING: Outline steps to submit code
+   squash fcfb0412 CONTRIBUTING: Add update PR info
+   ```
+
+   Save the document and exit the editor to finish the merge. Another editor
+   window is presented to modify the commit message.
+
+   You now could change the commit message as follows:
+
+   ```
+   CONTRIBUTING: Outline steps to submit code
+
+   Explain in more detail how to submit s390-tools contributions as GitHub
+   pull requests and how to update already submitted pull requests.
+
+   Signed-off-by: Random Developer <random@developer.example.com>
+   ```
+
+   With interactive rebasing you can also change the order of commits and
+   modify commit messages with "reword".
+
+3. Use `git push` with the force option to replace the existing pull request
+   with your locally modified commits
+   ```
+   ~/s390-tools $ git push --force origin contrib-doc-pr
+   ```
+
+### Rebase a pull request
+
+If changes are made to the master branch in the official s390-tools
+repository you may be asked to rebase your branch with your contribution
+onto it. This can be required to prevent any merge conflicts that might
+arise when integrating your contribution.
+
+1. Fetch all upstream changes from the official s390-tools repository,
+   rebase your local master branch and update the master branch
+   on your fork
+   ```
+   ~/s390-tools $ git fetch upstream
+   ~/s390-tools $ git checkout master
+   ~/s390-tools $ git rebase upstream/master
+   ~/s390-tools $ git push origin master
+   ```
+
+2. Rebase your branch with your contribution onto the master branch of
+   the official s390-tools repository
+   ```
+   ~/s390-tools $ git checkout contrib-doc-pr
+   ~/s390-tools $ git rebase master
+   ```
+
+3. Use `git push` with the force option to replace the existing pull
+   request with your locally modified commits
+   ```
+   ~/s390-tools $ git push --force origin contrib-doc-pr
+   ```

Makefile

@@ -3,12 +3,12 @@ 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 libu2s libutil libzds libdasd libvmdump libccw
+LIB_DIRS = libvtoc libu2s libutil libzds libdasd libvmdump libccw libvmcp
 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
+	   systemd hmcdrvfs cpacfstats zdev dump2tar zkey netboot etc
 SUB_DIRS = $(LIB_DIRS) $(TOOL_DIRS)
 
 all: $(TOOL_DIRS)

README.md

@@ -11,6 +11,7 @@ The package also contains the following files:
  * [LICENSE](LICENSE): The MIT license that applies to this package
  * [CHANGELOG](CHANGELOG.md): The history of s390-tools versions
  * [AUTHORS](AUTHORS.md): A list of all authors of the s390-tools package
+ * [CODINGSTYLE](CODINGSTYLE.md): Recommendations for writing s390-tools code
 
 Package contents
 ----------------
@@ -124,14 +125,13 @@ Package contents
    - lsscm:      List information about available Storage Class Memory
                  Increments.
    - chchp:      Modify channel-path state.
-   - lsluns:     List available SCSI LUNs depending on adapter or port.
+   - lsluns:     List LUNs discovered in the FC SAN,
+                 or show encryption state of attached LUNs.
    - lszcrypt:   Show Information about zcrypt devices and configuration.
    - chzcrypt:   Modify the zcrypt configuration.
    - znetconf:   List and configure network devices for s390 network adapters.
    - cio_ignore: Query and modify the contents of the CIO device driver
                  blacklist.
-   - lsmem:      Display the online status of the available memory.
-   - chmem:      Set hotplug memory online or offline.
    - dasdstat:   Configure and format the debugfs based DASD statistics data.
 
  * zkey:
@@ -256,19 +256,24 @@ HAVE_FUSE=0`".
 The following table provides an overview of the used libraries and
 build options:
 
-| __LIBRARY__|__BUILD OPTION__| __TOOLS__                             |
-|------------|:--------------:|:-------------------------------------:|
-| fuse       | `HAVE_FUSE`    | cmsfs-fuse, zdsfs, hmcdrvfs, zgetdump |
-| zlib       | `HAVE_ZLIB`    | zgetdump, dump2tar                    |
-| ncurses    | `HAVE_NCURSES` | hyptop                                |
-| pfm        | `HAVE_PFM`     | cpacfstats                            |
-| net-snmp   | `HAVE_SNMP`    | osasnmpd                              |
+| __LIBRARY__    | __BUILD OPTION__   | __TOOLS__                             |
+|----------------|:------------------:|:-------------------------------------:|
+| fuse           | `HAVE_FUSE`        | cmsfs-fuse, zdsfs, hmcdrvfs, zgetdump |
+| zlib           | `HAVE_ZLIB`        | zgetdump, dump2tar                    |
+| ncurses        | `HAVE_NCURSES`     | hyptop                                |
+| pfm            | `HAVE_PFM`         | cpacfstats                            |
+| net-snmp       | `HAVE_SNMP`        | osasnmpd                              |
+| glibc-static   | `HAVE_LIBC_STATIC` | zfcpdump                              |
+| openssl        | `HAVE_OPENSSL`     | zkey                                  |
+| cryptsetup     | `HAVE_CRYPTSETUP2` | zkey-cryptsetup                       |
+| json-c         | `HAVE_JSONC`       | zkey-cryptsetup                       |
 
 This table lists additional build or install options:
 
 | __COMPONENT__  | __OPTION__       | __TOOLS__                       |
 |----------------|:----------------:|:-------------------------------:|
 | dracut         | `HAVE_DRACUT`    | zdev                            |
+| initramfs-tools| `HAVE_INITRAMFS` | zdev                            |
 
 The s390-tools build process uses "pkg-config" if available and hard-coded
 compiler and linker options otherwise.
@@ -286,9 +291,9 @@ the different tools are provided:
   http://net-snmp.sourceforge.net
 
 * lsluns:
-  For executing the lsluns script the sg_luns command must be available.
-  The sg_luns executable is part of the SCSI generic device driver package
-  (sg3 utils/sg utils).
+  For executing the lsluns script the sg_luns and sg_inq commands must
+  be available. The sg_luns and sg_inq executables are part of the
+  SCSI generic device driver package (sg3 utils/sg utils).
 
 * ziomon tools:
   For running the ziomon tools the following tools/packages are required:
@@ -365,3 +370,15 @@ the different tools are provided:
   For running znetconf these programs are required:
   - modprobe (kmod)
   - vmcp (s390-tools)
+
+* zkey:
+  For building the zkey tools you need openssl version 0.9.7 or newer installed
+  (openssl-devel.rpm). Also required are cryptsetup version 2.0.3 or newer
+  (cryptsetup-devel.rpm), and json-c version 0.12 or newer (json-c-devel.rpm).
+  Tip: you may skip the zkey build by adding `HAVE_OPENSSL=0`, and you may
+  may skip the zkey-cryptsetup build by adding `HAVE_CRYPTSETUP2=0`, or
+  `HAVE_JSONC=0` to the make invocation.
+  A new group 'zkeyadm' needs to be created and all users intending to use the
+  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.

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            = 1
+RELEASE            = 6
 PATCHLEVEL         = 0
 DISTRELEASE        = build-$(shell date +%Y%m%d)
 S390_TOOLS_RELEASE = $(VERSION).$(RELEASE).$(PATCHLEVEL)-$(DISTRELEASE)
@@ -113,9 +113,10 @@ DEFAULT_LDFLAGS = -rdynamic
 # $2: Name of include file to check
 # $3: Name of required devel package
 # $4: Option to skip build (e.g. HAVE_FUSE=0)
+# $5: Additional compiler & linker options (optional)
 #
 check_dep=\
-printf "\#include <%s>" $2 | ( $(CC) $(filter-out --coverage, $(ALL_CFLAGS)) $(ALL_CPPFLAGS) -c -o /dev/null -xc - ) > /dev/null 2>&1; \
+printf "\#include <%s>\n int main(void) {return 0;}" $2 | ( $(CC) $(filter-out --coverage, $(ALL_CFLAGS)) $(ALL_CPPFLAGS) $5 -o /dev/null -xc - ) > /dev/null 2>&1; \
 if [ $$? != 0 ]; \
 then \
 	printf "  REQCHK  %s (%s)\n" $1 $2; \
@@ -167,13 +168,14 @@ MANDIR          = $(INSTALLDIR)/usr/share/man
 VARDIR          = $(INSTALLDIR)/var
 TOOLS_DATADIR   = $(INSTALLDIR)/usr/share/s390-tools
 TOOLS_LIBDIR    = $(INSTALLDIR)/lib/s390-tools
-ZFCPDUMP_DIR    = $(INSTALLDIR)/lib/s390-tools/zfcpdump
+ZFCPDUMP_DIR    = $(TOOLS_LIBDIR)/zfcpdump
 # Systemd support files are installed only if a directory is specified
 # for SYSTEMDSYSTEMUNITDIR (e.g. /lib/systemd/system)
 SYSTEMDSYSTEMUNITDIR =
 
 INSTDIRS        = $(USRSBINDIR) $(USRBINDIR) $(BINDIR) $(LIBDIR) $(MANDIR) \
-			$(SYSCONFDIR) $(TOOLS_LIBDIR) $(TOOLS_DATADIR) \
+			$(SYSCONFDIR) $(SYSCONFDIR)/sysconfig \
+			$(TOOLS_LIBDIR) $(TOOLS_DATADIR) \
 			$(ZFCPDUMP_DIR) $(SYSTEMDSYSTEMUNITDIR)
 OWNER           = $(shell id -un)
 GROUP		= $(shell id -gn)
@@ -193,12 +195,14 @@ ALL_CFLAGS	= -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
 			-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
 			-DS390_TOOLS_DATADIR=$(TOOLS_DATADIR) \
 			-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \
+			-DS390_TOOLS_BINDIR=$(BINDIR) \
 			$(CFLAGS)
 CXXFLAGS	?= $(DEFAULT_CFLAGS) $(OPT_FLAGS)
 ALL_CXXFLAGS	= -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
 			-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
 			-DS390_TOOLS_DATADIR=$(TOOLS_DATADIR) \
 			-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \
+			-DS390_TOOLS_BINDIR=$(BINDIR) \
 			$(CXXFLAGS)
 ALL_CPPFLAGS	= -I $(rootdir)include $(CPPFLAGS)
 ALL_LDFLAGS	= $(LDFLAGS)
@@ -214,12 +218,22 @@ endif
 export AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP INSTALL CFLAGS CXXFLAGS \
        LDFLAGS CPPFLAGS ALL_CFLAGS ALL_CXXFLAGS ALL_LDFLAGS ALL_CPPFLAGS
 
+ifneq ($(shell $(CC_SILENT) -dumpspecs 2>/dev/null | grep -e '[^f]no-pie'),)
+	NO_PIE_CFLAGS := -fno-pie
+	NO_PIE_LINKFLAGS := -no-pie
+	NO_PIE_LDFLAGS := -no-pie
+else
+	NO_PIE_CFLAGS :=
+	NO_PIE_LINKFLAGS :=
+	NO_PIE_LDFLAGS :=
+endif
+
 # Overwrite implicite makefile rules for having nice compile output
 %.o: %.c
-	$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
 ifeq ("${C}","1")
 	$(CHECKTOOL) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
 endif
+	$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
 
 %.o: %.cpp
 	$(CXX) $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) -c $< -o $@
@@ -324,6 +338,10 @@ $(rootdir)/libvmdump/libvmdump.a: $(rootdir)/libvmdump
 	$(MAKE) -C $(rootdir)/libvmdump/ libvmdump.a
 .PHONY: $(rootdir)/libvmdump
 
+$(rootdir)/libvmcp/libvmcp.a: $(rootdir)/libvmcp
+	$(MAKE) -C $(rootdir)/libvmcp/ libvmcp.a
+.PHONY: $(rootdir)/libvmcp
+
 $(rootdir)/zipl/boot/data.o:
 	$(MAKE) -C $(rootdir)/zipl/boot/ data.o
 

cpumf/Makefile

@@ -4,10 +4,12 @@ include ../common.mak
 
 
 CPUMF_DATADIR = $(TOOLS_DATADIR)/cpumf
-DATA_FILES = cpum-cf-hw-counter.map cpum-cf-generic.ctr \
+DATA_FILES = cpum-cf-hw-counter.map \
+	     cpum-cf-cfvn-1.ctr cpum-cf-cfvn-3.ctr \
+	     cpum-cf-csvn-generic.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-z13.ctr cpum-cf-extended-z14.ctr
 LIB_FILES = bin/cpumf_helper
 USRBIN_SCRIPTS = bin/lscpumf
 USRSBIN_SCRIPTS = bin/chcpumf

cpumf/bin/cpumf_helper.in

@@ -172,7 +172,7 @@ sub cpumf_parse_ctrdef($;$)
 
 		# Parse short description (optional)
 		if ($line =~ m/^Short-Description:\s*(\S.*)?$/) {
-			$h->{ctr}->{shortdesc} = $1 || "";
+			$h->{$ctr}->{shortdesc} = $1 || "";
 
 		# Parse start of counter description
 		} elsif ($line =~ m/^Description:\s*(\S.*)?$/) {
@@ -210,6 +210,8 @@ my $system_z_hwtype_map = {
 	2828		=> 'IBM zEnterprise BC12',
 	2964		=> 'IBM z13',
 	2965		=> 'IBM z13s',
+	3906		=> 'IBM z14',
+	3907		=> 'IBM z14 ZR1',
 };
 
 sub get_hardware_type()
@@ -228,6 +230,28 @@ sub get_hardware_type()
 	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();
@@ -236,10 +260,20 @@ sub cpumf_load_ctrdef($;$)
 	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};
+	push @def, "csvn-generic";
+
 	my $h = {};
-	# Load generic counter sets
-	cpumf_parse_ctrdef($ctrmap->{0}, $h) or
-		croak "Failed to read generic counter definition: $!\n";
+	# 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:
@@ -322,7 +356,7 @@ sub cpumf_helper_main()
 	GetOptions(
 		"i|info"	=> \$conf->{opt_info},
 		"c|counter=i"	=> \$conf->{opt_ctr},
-		"ctr-def=i"	=> \$conf->{opt_ctrdef},
+		"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},
@@ -427,11 +461,13 @@ B<--ctr-def> option and specify the System z hardware type.
 
 Displays the System z hardware type.
 
-=item B<--ctr-def> I<hardware_type>
+=item B<--ctr-def> I<ctr-definition>
 
-Displays detailed information about a particular counter set for the specified
-System z hardware type, I<hardware_type>.  If you specify zero for
-I<hardware_type>, type-independent counter sets are displayed.
+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>.
 
 =item B<--ctr-set-names>
 

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

@@ -0,0 +1,60 @@
+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

@@ -0,0 +1,40 @@
+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-generic.ctr

@@ -1,130 +1,98 @@
-Counter:   0	Name:CPU_CYCLES
-Description:
-Cycle Count
-.
-Counter:   1	Name:INSTRUCTIONS
-Description:
-Instruction Count
-.
-Counter:   2	Name:L1I_DIR_WRITES
-Description:
-Level-1 I-Cache Directory Write Count
-.
-Counter:   3	Name:L1I_PENALTY_CYCLES
-Description:
-Level-1 I-Cache Penalty Cycle Count
-.
-Counter:   4	Name:L1D_DIR_WRITES
-Description:
-Level-1 D-Cache Directory Write Count
-.
-Counter:   5	Name:L1D_PENALTY_CYCLES
-Description:
-Level-1 D-Cache Penalty Cycle Count
-.
-Counter:  32	Name:PROBLEM_STATE_CPU_CYCLES
-Description:
-Problem-State Cycle Count
-.
-Counter:  33	Name:PROBLEM_STATE_INSTRUCTIONS
-Description:
-Problem-State Instruction Count
-.
-Counter:  34	Name:PROBLEM_STATE_L1I_DIR_WRITES
-Description:
-Problem-State Level-1 I-Cache Directory Write Count
-.
-Counter:  35	Name:PROBLEM_STATE_L1I_PENALTY_CYCLES
-Description:
-Problem-State Level-1 I-Cache Penalty Cycle Count
-.
-Counter:  36	Name:PROBLEM_STATE_L1D_DIR_WRITES
-Description:
-Problem-State Level-1 D-Cache Directory Write Count
-.
-Counter:  37	Name:PROBLEM_STATE_L1D_PENALTY_CYCLES
-Description:
-Problem-State Level-1 D-Cache Penalty Cycle Count
-.
 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

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

@@ -1,96 +1,114 @@
 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 cahe (local Memory)
+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

@@ -16,288 +16,343 @@
 #
 # Extended Counter Set
 # ---------------------------------------------------------------------
-Counter:128	Name:L1D_WRITES_RO_EXCL
+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
@@ -307,10 +362,12 @@ 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

@@ -0,0 +1,357 @@
+# 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-z196.ctr

@@ -1,121 +1,145 @@
 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,98 +1,117 @@
 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
@@ -104,16 +123,19 @@ cache line was sourced from an Off Book Level-4 cache
 #    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
@@ -121,73 +143,86 @@ 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

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

@@ -1,11 +1,22 @@
 # CPU-measurement facilities
 #
-# Mapping of IBM System z hardware types to extended counter set defintions
+# 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
-	   0		=> 'cpum-cf-generic.ctr',
+
+	# CFVN
+	'cfvn-1'      	=> 'cpum-cf-cfvn-1.ctr',
+	'cfvn-3'	=> 'cpum-cf-cfvn-3.ctr',
+
+	# CSVN
+	'csvn-generic'	=> 'cpum-cf-csvn-generic.ctr',
+
+	# Extended counters
 	2097		=> 'cpum-cf-extended-z10.ctr',
 	2098		=> 'cpum-cf-extended-z10.ctr',
 	2817		=> 'cpum-cf-extended-z196.ctr',
@@ -14,4 +25,6 @@
 	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',
 };

cpumf/data/cpum-sf-modes.ctr

@@ -3,11 +3,13 @@
 #
 # 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)
 .

cpuplugd/cpuplugd.h

@@ -197,10 +197,10 @@ int is_online(int cpuid);
 long get_cmmpages_size();
 void parse_options(int argc, char **argv);
 void check_if_started_twice();
-void store_pid(void);
 void handle_signals(void);
 void handle_sighup(void);
 void reload_daemon(void);
+int daemonize(void);
 int check_cmmfiles(void);
 void check_config();
 void set_cmm_pages(long size);

cpuplugd/daemon.c

@@ -9,6 +9,10 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
 #include "cpuplugd.h"
 
 const char *name = NAME;
@@ -49,7 +53,7 @@ void print_version()
 /*
  * Store daemon's pid so it can be stopped
  */
-void store_pid(void)
+static int store_pid(void)
 {
 	FILE *filp;
 
@@ -57,10 +61,62 @@ void store_pid(void)
 	if (!filp) {
 		cpuplugd_error("cannot open pid file %s: %s\n", pid_file,
 			       strerror(errno));
-		exit(1);
+		return -1;
 	}
 	fprintf(filp, "%d\n", getpid());
 	fclose(filp);
+	return 0;
+}
+
+/*
+ * Run daemon in background and write pid file
+ */
+int daemonize(void)
+{
+	int fd, pipe_fds[2], startup_rc = 1;
+	pid_t pid;
+
+	if (pipe(pipe_fds) == -1) {
+		cpuplugd_error("cannot create pipe\n");
+		return -1;
+	}
+	pid = fork();
+	if (pid < 0)
+		goto close_pipe;
+	if (pid != 0) {
+		/* Wait for startup return code from daemon */
+		if (read(pipe_fds[0], &startup_rc, sizeof(startup_rc)) == -1)
+			cpuplugd_error("cannot read from pipe\n");
+		/* On success daemon has written pid file at this point */
+		exit(startup_rc);
+	}
+	/* Create new session */
+	if (setsid() < 0)
+		goto notify_parent;
+	/* Redirect stdin/out/err to /dev/null */
+	fd = open("/dev/null", O_RDWR, 0);
+	if (fd == -1)
+		goto notify_parent;
+	if (dup2(fd, STDIN_FILENO) < 0)
+		goto notify_parent;
+	if (dup2(fd, STDOUT_FILENO) < 0)
+		goto notify_parent;
+	if (dup2(fd, STDERR_FILENO) < 0)
+		goto notify_parent;
+	/* Create pid file */
+	if (store_pid() < 0)
+		goto notify_parent;
+	startup_rc = 0;
+notify_parent:
+	/* Inform waiting parent about startup return code */
+	if (write(pipe_fds[1], &startup_rc, sizeof(startup_rc)) == -1) {
+		cpuplugd_error("cannot write to pipe\n");
+		startup_rc = 1;
+	}
+close_pipe:
+	close(pipe_fds[0]);
+	close(pipe_fds[1]);
+	return startup_rc ? -1 : 0;
 }
 
 /*

cpuplugd/main.c

@@ -418,13 +418,11 @@ int main(int argc, char *argv[])
 	check_config();
 
 	if (!foreground) {
-		rc = daemon(1, 0);
+		rc = daemonize();
 		if (rc < 0)
 			cpuplugd_exit("Detach from terminal failed: %s\n",
 				      strerror(errno));
 	}
-	/* Store daemon pid */
-	store_pid();
 	/* Unlock lock file */
 	flock(fd, LOCK_UN);
 	close(fd);

dasdfmt/dasdfmt.c

@@ -2,6 +2,7 @@
  * dasdfmt - Format DASD ECKD devices for use by Linux
  *
  * Copyright IBM Corp. 1999, 2017
+ * Copyright Red Hat Inc. 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.
@@ -12,6 +13,7 @@
 #include <sys/time.h>
 #include <sys/utsname.h>
 
+#include "lib/dasd_base.h"
 #include "lib/dasd_sys.h"
 #include "lib/util_opt.h"
 #include "lib/util_prg.h"
@@ -26,6 +28,7 @@
 #define SEC_PER_HOUR (60 * 60)
 
 static int filedes;
+static char dev_filename[PATH_MAX];
 static int disk_disabled;
 static format_data_t format_params;
 static format_mode_t mode;
@@ -33,7 +36,6 @@ static char *prog_name;
 static volatile sig_atomic_t program_interrupt_in_progress;
 static int reqsize;
 
-
 static const struct util_prg prg = {
 	.desc = "Use dasdfmt to format a DASD ECKD device for use by Linux.\n"
 		"DEVICE is the node of the device (e.g. '/dev/dasda').",
@@ -265,24 +267,6 @@ static void draw_progress(dasdfmt_info_t *info, int cyl, unsigned int cylinders,
 	}
 }
 
-static int reread_partition_table(void)
-{
-	int i = 0;
-	int rc = -1;
-
-	/* If the BLKRRPART ioctl fails, it is most likely due to
-	   the device just beeing in use by udev. So it is worthwhile
-	   to retry the ioctl after a second as it is likely to succeed.
-	 */
-	while (rc && (i < 5)) {
-		++i;
-		rc = ioctl(filedes, BLKRRPART, NULL);
-		if (rc)
-			sleep(1);
-	}
-	return rc;
-}
-
 /*
  * Helper function for recs_per_track.
  */
@@ -312,16 +296,18 @@ static unsigned int recs_per_track(struct dasd_eckd_characteristics *rdc,
 			kn = ceil_quot(kl + 6, 232) + 1;
 			return 1729 / (10 + 9 + ceil_quot(kl + 6 * kn, 34) +
 				       9 + ceil_quot(dl + 6 * dn, 34));
-		} else
+		} else {
 			return 1729 / (10 + 9 + ceil_quot(dl + 6 * dn, 34));
+		}
 	case 0x9345:
 		dn = ceil_quot(dl + 6, 232) + 1;
 		if (kl) {
 			kn = ceil_quot(kl + 6, 232) + 1;
 			return 1420 / (18 + 7 + ceil_quot(kl + 6 * kn, 34) +
 				       ceil_quot(dl + 6 * dn, 34));
-		} else
+		} else {
 			return 1420 / (18 + 7 + ceil_quot(dl + 6 * dn, 34));
+		}
 	}
 	return 0;
 }
@@ -404,7 +390,7 @@ static void evaluate_format_error(dasdfmt_info_t *info, format_check_t *cdata,
 		break;
 	case DASD_FMT_ERR_RECORD_ID:
 		ERRMSG("Invalid record ID at cyl: %d trk: %d rec: %d.\n",
-			cyl, head, cdata->rec);
+		       cyl, head, cdata->rec);
 		break;
 	case DASD_FMT_ERR_KEY_LENGTH:
 		ERRMSG("Invalid key length (found %d, expected %d) "
@@ -414,6 +400,30 @@ static void evaluate_format_error(dasdfmt_info_t *info, format_check_t *cdata,
 	}
 }
 
+static void disk_enable(void)
+{
+	int err;
+
+	err = dasd_disk_enable(filedes);
+	if (err != 0)
+		ERRMSG_EXIT(EXIT_FAILURE, "%s: (prepare device) IOCTL "
+			    "BIODASDENABLE failed (%s)\n", prog_name,
+			    strerror(err));
+	disk_disabled = 0;
+}
+
+static void disk_disable(const char *device)
+{
+	int err;
+
+	err = dasd_disk_disable(device, &filedes);
+	if (err != 0)
+		ERRMSG_EXIT(EXIT_FAILURE, "%s: (prepare device) IOCTL "
+			    "BIODASDDISABLE failed. (%s)\n", prog_name,
+			    strerror(err));
+	disk_disabled = 1;
+}
+
 /*
  * signal handler:
  * enables the disk again in case of SIGTERM, SIGINT and SIGQUIT
@@ -428,27 +438,18 @@ static void program_interrupt_signal(int sig)
 
 	if (disk_disabled) {
 		printf("Re-accessing the device...\n");
-		rc = ioctl(filedes, BIODASDENABLE, &format_params);
-		if (rc)
-			ERRMSG_EXIT(EXIT_FAILURE, "%s: (signal handler) IOCTL "
-				    "BIODASDENABLE failed (%s)\n", prog_name,
-				    strerror(errno));
+		disk_enable();
 	}
 
 	printf("Rereading the partition table...\n");
-	rc = reread_partition_table();
+	rc = dasd_reread_partition_table(dev_filename, 5);
 	if (rc) {
 		ERRMSG("%s: (signal handler) Re-reading partition table "
-		       "failed. (%s)\n", prog_name, strerror(errno));
+		       "failed. (%s)\n", prog_name, strerror(rc));
 	} else {
 		printf("Exiting...\n");
 	}
 
-	rc = close(filedes);
-	if (rc)
-		ERRMSG("%s: (signal handler) Unable to close device (%s)\n",
-		       prog_name, strerror(errno));
-
 	signal(sig, SIG_DFL);
 	raise(sig);
 }
@@ -456,46 +457,34 @@ static void program_interrupt_signal(int sig)
 /*
  * check given device name for blanks and some special characters
  */
-static void get_device_name(dasdfmt_info_t *info, char *name, int argc,
-			    char *argv[])
+static void get_device_name(char *devname,
+			    int optind, int argc, char *argv[])
 {
 	struct util_proc_dev_entry dev_entry;
 	struct stat dev_stat;
 
-	if (info->device_id + 1 < argc)
+	if (optind + 1 < argc)
 		ERRMSG_EXIT(EXIT_MISUSE,
 			    "%s: More than one device specified!\n", prog_name);
 
-	if (info->device_id >= argc)
+	if (optind >= argc)
 		ERRMSG_EXIT(EXIT_MISUSE, "%s: No device specified!\n",
 			    prog_name);
 
-	if (info->device_id < argc) {
-		strcpy(info->devname, argv[info->device_id]);
-	} else {
-		if ((strchr(name, ' ') != NULL) || (strchr(name, '#') != NULL) ||
-		    (strchr(name, '[') != NULL) || (strchr(name, ']') != NULL) ||
-		    (strchr(name, '!') != NULL) || (strchr(name, '>') != NULL) ||
-		    (strchr(name, '(') != NULL) || (strchr(name, '<') != NULL) ||
-		    (strchr(name, ')') != NULL) || (strchr(name, ':') != NULL) ||
-		    (strchr(name, '&') != NULL) || (strchr(name, ';') != NULL))
-			ERRMSG_EXIT(EXIT_MISUSE, "%s: Your filename contains "
-				    "blanks or special characters!\n",
-				    prog_name);
+	if (strlen(argv[optind]) >= PATH_MAX)
+		ERRMSG_EXIT(EXIT_MISUSE, "%s: device name too long!\n",
+			    prog_name);
+	strcpy(devname, argv[optind]);
 
-		strncpy(info->devname, name, PATH_MAX - 1);
-		info->devname[PATH_MAX - 1] = '\0';
-	}
-
-	if (stat(info->devname, &dev_stat) != 0)
+	if (stat(devname, &dev_stat) != 0)
 		ERRMSG_EXIT(EXIT_MISUSE, "%s: Could not get information for "
-			    "device node %s: %s\n", prog_name, info->devname,
+			    "device node %s: %s\n", prog_name, devname,
 			    strerror(errno));
 
 	if (minor(dev_stat.st_rdev) & PARTN_MASK) {
 		ERRMSG_EXIT(EXIT_MISUSE, "%s: Unable to format partition %s. "
 			    "Please specify a device.\n", prog_name,
-			    info->devname);
+			    devname);
 	}
 
 	if (util_proc_dev_get_entry(dev_stat.st_rdev, 1, &dev_entry) == 0) {
@@ -505,34 +494,19 @@ static void get_device_name(dasdfmt_info_t *info, char *name, int argc,
 				    prog_name, dev_entry.name);
 	} else {
 		printf("%s WARNING: Unable to get driver name for device node %s",
-		       prog_name, info->devname);
+		       prog_name, devname);
 	}
 }
 
-/*
- * Retrieve DASD information
- */
-static void get_device_info(dasdfmt_info_t *info)
+static void get_blocksize(const char *device, unsigned int *blksize)
 {
-	dasd_information2_t dasd_info;
+	int err;
 
-	if (ioctl(filedes, BIODASDINFO2, &dasd_info))
-		ERRMSG_EXIT(EXIT_FAILURE, "%s: the ioctl call to retrieve "
-			    "device information failed (%s).\n",
-			    prog_name, strerror(errno));
-
-	info->dasd_info = dasd_info;
-}
-
-/*
- * Retrieve blocksize of device
- */
-static void get_blocksize(unsigned int *blksize)
-{
-	if (ioctl(filedes, BLKSSZGET, blksize) != 0)
+	err = dasd_get_blocksize(device, blksize);
+	if (err != 0)
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: the ioctl to get the blocksize "
 			    "of the device failed (%s).\n", prog_name,
-			    strerror(errno));
+			    strerror(err));
 }
 
 /*
@@ -546,7 +520,7 @@ static void check_blocksize(dasdfmt_info_t *info, unsigned int blksize)
 	    info->dasd_info.format == DASD_FORMAT_NONE)
 		return;
 
-	get_blocksize(&dev_blksize);
+	get_blocksize(dev_filename, &dev_blksize);
 	if (dev_blksize != blksize) {
 		ERRMSG_EXIT(EXIT_FAILURE, "WARNING: Device is formatted with a "
 			    "different blocksize (%d).\nUse --mode=full to "
@@ -586,18 +560,17 @@ static void check_layout(dasdfmt_info_t *info, unsigned int intensity)
 /*
  * check for disk type and set some variables (e.g. usage count)
  */
-static void check_disk(dasdfmt_info_t *info)
+static void check_disk(dasdfmt_info_t *info, char *devname)
 {
-	int ro, errno_save;
+	int err;
+	bool ro;
 
-	if (ioctl(filedes, BLKROGET, &ro) != 0) {
-		errno_save = errno;
-		close(filedes);
+	err = dasd_is_ro(devname, &ro);
+	if (err != 0)
 		ERRMSG_EXIT(EXIT_FAILURE,
 			    "%s: the ioctl call to retrieve read/write "
 			    "status information failed (%s)\n",
-			    prog_name, strerror(errno_save));
-	}
+			    prog_name, strerror(err));
 
 	if (ro)
 		ERRMSG_EXIT(EXIT_FAILURE, "Disk is read only!\n");
@@ -609,13 +582,13 @@ static void check_disk(dasdfmt_info_t *info)
 	if (strncmp(info->dasd_info.type, "ECKD", 4) != 0) {
 		ERRMSG_EXIT(EXIT_FAILURE,
 			    "%s: Unsupported disk type\n%s is not an "
-			    "ECKD disk!\n", prog_name, info->devname);
+			    "ECKD disk!\n", prog_name, devname);
 	}
 
-	if (dasd_sys_raw_track_access(info->devname)) {
+	if (dasd_sys_raw_track_access(devname)) {
 		ERRMSG_EXIT(EXIT_FAILURE,
 			    "%s: Device '%s' is in raw-track access mode\n",
-			    prog_name, info->devname);
+			    prog_name, devname);
 	}
 }
 
@@ -787,9 +760,11 @@ static format_check_t check_track_format(dasdfmt_info_t *info, format_data_t *p)
 			.stop_unit = p->stop_unit
 		}, 0
 	};
+	int err;
 
-	if (ioctl(filedes, BIODASDCHECKFMT, &cdata)) {
-		if (errno == ENOTTY) {
+	err = dasd_check_format(dev_filename, &cdata);
+	if (err != 0) {
+		if (err == ENOTTY) {
 			ERRMSG("%s: Missing kernel support for format checking",
 			       prog_name);
 			if (mode == EXPAND) {
@@ -800,7 +775,7 @@ static format_check_t check_track_format(dasdfmt_info_t *info, format_data_t *p)
 			ERRMSG_EXIT(EXIT_FAILURE, ".\n");
 		}
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: Could no check format: %s\n",
-			    prog_name, strerror(errno));
+			    prog_name, strerror(err));
 	}
 
 	return cdata;
@@ -816,7 +791,7 @@ static int process_tracks(dasdfmt_info_t *info, unsigned int cylinders,
 	format_data_t step = *format_params;
 	unsigned long step_value;
 	unsigned long cur_trk;
-	int cyl = 0;
+	int cyl = 0, err;
 
 	check_hashmarks(info);
 
@@ -839,10 +814,11 @@ static int process_tracks(dasdfmt_info_t *info, unsigned int cylinders,
 				break;
 			}
 		} else {
-			if (ioctl(filedes, BIODASDFMT, &step) != 0)
+			err = dasd_format_disk(filedes, &step);
+			if (err != 0)
 				ERRMSG_EXIT(EXIT_FAILURE, "%s: the ioctl call "
 					    "to format tracks failed. (%s)\n",
-					    prog_name, strerror(errno));
+					    prog_name, strerror(err));
 		}
 
 		cyl = cur_trk / heads + 1;
@@ -935,7 +911,8 @@ static format_data_t ask_user_for_blksize(format_data_t params)
 /*
  * print all information needed to format the device
  */
-static void dasdfmt_print_info(dasdfmt_info_t *info, volume_label_t *vlabel,
+static void dasdfmt_print_info(dasdfmt_info_t *info, char *devname,
+			       volume_label_t *vlabel,
 			       unsigned int cylinders, unsigned int heads,
 			       format_data_t *p)
 {
@@ -945,7 +922,7 @@ static void dasdfmt_print_info(dasdfmt_info_t *info, volume_label_t *vlabel,
 	       cylinders, heads, (cylinders * heads));
 
 	printf("\nI am going to format the device ");
-	printf("%s in the following way:\n", info->devname);
+	printf("%s in the following way:\n", devname);
 	printf("   Device number of device : 0x%x\n", info->dasd_info.devno);
 	printf("   Labelling device        : %s\n",
 	       (info->writenolabel) ? "no" : "yes");
@@ -970,28 +947,19 @@ static void dasdfmt_print_info(dasdfmt_info_t *info, volume_label_t *vlabel,
 /*
  * get volser
  */
-static int dasdfmt_get_volser(dasdfmt_info_t *info, char *volser)
+static int dasdfmt_get_volser(char *devname, dasd_information2_t *dasd_info,
+			      char *volser)
 {
 	unsigned int blksize;
-	int f;
 	volume_label_t vlabel;
 
-	f = open(info->devname, O_RDONLY);
-	if (f == -1)
-		ERRMSG_EXIT(EXIT_FAILURE, "%s: Unable to open device %s: %s\n",
-			    prog_name, info->devname, strerror(errno));
+	get_blocksize(devname, &blksize);
 
-	get_blocksize(&blksize);
-
-	if (close(f) != 0)
-		ERRMSG("%s: error during close: %s\ncontinuing...\n",
-		       prog_name, strerror(errno));
-
-	if ((strncmp(info->dasd_info.type, "ECKD", 4) == 0) &&
-	    (!info->dasd_info.FBA_layout)) {
+	if ((strncmp(dasd_info->type, "ECKD", 4) == 0) &&
+	    !dasd_info->FBA_layout) {
 		/* OS/390 and zOS compatible disk layout */
-		vtoc_read_volume_label(info->devname,
-				       info->dasd_info.label_block * blksize,
+		vtoc_read_volume_label(devname,
+				       dasd_info->label_block * blksize,
 				       &vlabel);
 		vtoc_volume_label_get_volser(&vlabel, volser);
 		return 0;
@@ -1012,25 +980,25 @@ static void dasdfmt_write_labels(dasdfmt_info_t *info, volume_label_t *vlabel,
 	format5_label_t f5;
 	format7_label_t f7;
 	unsigned int blksize;
-	int rc;
+	int rc, fd;
 	void *ipl1_record, *ipl2_record;
 	int ipl1_record_len, ipl2_record_len;
 
-
 	if (info->verbosity > 0)
 		printf("Retrieving dasd information... ");
 
-	get_blocksize(&blksize);
+	get_blocksize(dev_filename, &blksize);
 
 	/*
 	 * Don't rely on the cylinders returned by HDIO_GETGEO, they might be
 	 * to small. geo is only used to get the number of sectors, which may
 	 * vary depending on the format.
 	 */
-	if (ioctl(filedes, HDIO_GETGEO, &geo) != 0)
+	rc = dasd_get_geo(dev_filename, &geo);
+	if (rc != 0)
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: (write labels) IOCTL "
 			    "HDIO_GETGEO failed (%s).\n",
-			    prog_name, strerror(errno));
+			    prog_name, strerror(rc));
 
 	if (info->verbosity > 0)
 		printf("ok\n");
@@ -1056,26 +1024,40 @@ static void dasdfmt_write_labels(dasdfmt_info_t *info, volume_label_t *vlabel,
 		ipl2_record_len	= sizeof(ipl2.data);
 	}
 
-	if (lseek(filedes, 0, SEEK_SET) != 0)
+	fd = open(dev_filename, O_RDWR);
+	if (fd < 0)
+		ERRMSG_EXIT(EXIT_FAILURE, "%s: Unable to open device "
+			    "'%s' (%s)\n", prog_name, dev_filename,
+			    strerror(errno));
+
+	if (lseek(fd, 0, SEEK_SET) != 0) {
+		close(fd);
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: lseek command 0 failed "
 			    "(%s)\n", prog_name, strerror(errno));
+	}
 
-	rc = write(filedes, ipl1_record, ipl1_record_len);
-	if (rc != ipl1_record_len)
+	rc = write(fd, ipl1_record, ipl1_record_len);
+	if (rc != ipl1_record_len) {
+		close(fd);
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: Writing the bootstrap IPL1 "
 			    "failed, only wrote %d bytes.\n", prog_name, rc);
+	}
 
 	label_position = blksize;
-	rc = lseek(filedes, label_position, SEEK_SET);
-	if (rc != label_position)
+	rc = lseek(fd, label_position, SEEK_SET);
+	if (rc != label_position) {
+		close(fd);
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: lseek command to %i failed "
 			    "(%s).\n", prog_name, label_position,
 			    strerror(errno));
+	}
 
-	rc = write(filedes, ipl2_record, ipl2_record_len);
-	if (rc != ipl2_record_len)
+	rc = write(fd, ipl2_record, ipl2_record_len);
+	if (rc != ipl2_record_len) {
+		close(fd);
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: Writing the bootstrap IPL2 "
 			    "failed, only wrote %d bytes.\n", prog_name, rc);
+	}
 
 	/* write VTOC */
 	vtoc_init_format4_label(&f4, geo.cylinders, cylinders, heads,
@@ -1091,32 +1073,36 @@ static void dasdfmt_write_labels(dasdfmt_info_t *info, volume_label_t *vlabel,
 	if (info->verbosity > 0)
 		printf("Writing label...\n");
 
-	rc = lseek(filedes, label_position, SEEK_SET);
-	if (rc != label_position)
+	rc = lseek(fd, label_position, SEEK_SET);
+	if (rc != label_position) {
+		close(fd);
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: lseek command to %i failed "
 			    "(%s).\n", prog_name, label_position,
 			    strerror(errno));
+	}
 
 	/*
 	 * Note: cdl volume labels do not contain the 'formatted_blocks' part
 	 * and ldl labels do not contain the key field
 	 */
 	if (info->cdl_format) {
-		rc = write(filedes, vlabel, (sizeof(*vlabel) -
-					     sizeof(vlabel->formatted_blocks)));
+		rc = write(fd, vlabel, (sizeof(*vlabel) -
+					sizeof(vlabel->formatted_blocks)));
 	} else {
 		vlabel->ldl_version = 0xf2; /* EBCDIC '2' */
 		vlabel->formatted_blocks = cylinders * heads * geo.sectors;
-		rc = write(filedes, &vlabel->vollbl, (sizeof(*vlabel)
-						     - sizeof(vlabel->volkey)));
+		rc = write(fd, &vlabel->vollbl, (sizeof(*vlabel)
+						 - sizeof(vlabel->volkey)));
 	}
 
 	if (((rc != sizeof(*vlabel) - sizeof(vlabel->formatted_blocks)) &&
 	     info->cdl_format) ||
 	    ((rc != (sizeof(*vlabel) - sizeof(vlabel->volkey))) &&
-	     (!info->cdl_format)))
+	     !info->cdl_format)) {
+		close(fd);
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: Error writing volume label "
 			    "(%d).\n", prog_name, rc);
+	}
 
 	if (info->verbosity > 0)
 		printf("Writing VTOC... ");
@@ -1124,48 +1110,62 @@ static void dasdfmt_write_labels(dasdfmt_info_t *info, volume_label_t *vlabel,
 	label_position = (VTOC_START_CC * heads + VTOC_START_HH) *
 		geo.sectors * blksize;
 
-	rc = lseek(filedes, label_position, SEEK_SET);
-	if (rc != label_position)
+	rc = lseek(fd, label_position, SEEK_SET);
+	if (rc != label_position) {
+		close(fd);
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: lseek command to %i failed "
 			    "(%s).\n", prog_name, label_position,
 			    strerror(errno));
+	}
 
 	/* write VTOC FMT4 DSCB */
-	rc = write(filedes, &f4, sizeof(format4_label_t));
-	if (rc != sizeof(format4_label_t))
+	rc = write(fd, &f4, sizeof(format4_label_t));
+	if (rc != sizeof(format4_label_t)) {
+		close(fd);
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: Error writing FMT4 label "
 			    "(%d).\n", prog_name, rc);
+	}
 
 	label_position += blksize;
 
-	rc = lseek(filedes, label_position, SEEK_SET);
-	if (rc != label_position)
+	rc = lseek(fd, label_position, SEEK_SET);
+	if (rc != label_position) {
+		close(fd);
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: lseek to %i failed (%s).\n",
 			    prog_name, label_position, strerror(errno));
+	}
 
 	/* write VTOC FMT5 DSCB */
-	rc = write(filedes, &f5, sizeof(format5_label_t));
-	if (rc != sizeof(format5_label_t))
+	rc = write(fd, &f5, sizeof(format5_label_t));
+	if (rc != sizeof(format5_label_t)) {
+		close(fd);
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: Error writing FMT5 label "
 			    "(%d).\n", prog_name, rc);
+	}
 
 	if ((cylinders * heads) > BIG_DISK_SIZE) {
 		label_position += blksize;
 
-		rc = lseek(filedes, label_position, SEEK_SET);
-		if (rc != label_position)
+		rc = lseek(fd, label_position, SEEK_SET);
+		if (rc != label_position) {
+			close(fd);
 			ERRMSG_EXIT(EXIT_FAILURE, "%s: lseek to %i failed "
 				    "(%s).\n", prog_name, label_position,
 				    strerror(errno));
+		}
 
 		/* write VTOC FMT 7 DSCB (only on big disks) */
-		rc = write(filedes, &f7, sizeof(format7_label_t));
-		if (rc != sizeof(format7_label_t))
+		rc = write(fd, &f7, sizeof(format7_label_t));
+		if (rc != sizeof(format7_label_t)) {
+			close(fd);
 			ERRMSG_EXIT(EXIT_FAILURE, "%s: Error writing FMT7 "
 				    "label (rc=%d).\n", prog_name, rc);
+		}
 	}
 
-	fsync(filedes);
+	fsync(fd);
+
+	close(fd);
 
 	if (info->verbosity > 0)
 		printf("ok\n");
@@ -1245,27 +1245,25 @@ static void dasdfmt_prepare_and_format(dasdfmt_info_t *info,
 		.intensity = ((p->intensity & ~DASD_FMT_INT_FMT_NOR0)
 			      | DASD_FMT_INT_INVAL)
 	};
+	int err;
 
-	if (!((info->withoutprompt) && (info->verbosity < 1)))
+	if (!(info->withoutprompt && (info->verbosity < 1)))
 		printf("Formatting the device. This may take a while "
 		       "(get yourself a coffee).\n");
 
 	if (info->verbosity > 0)
 		printf("Detaching the device...\n");
 
-	if (ioctl(filedes, BIODASDDISABLE, p) != 0)
-		ERRMSG_EXIT(EXIT_FAILURE, "%s: (prepare device) IOCTL "
-			    "BIODASDDISABLE failed. (%s)\n", prog_name,
-			    strerror(errno));
-	disk_disabled = 1;
+	disk_disable(dev_filename);
 
 	if (info->verbosity > 0)
 		printf("Invalidate first track...\n");
 
-	if (ioctl(filedes, BIODASDFMT, &temp) != 0)
+	err = dasd_format_disk(filedes, &temp);
+	if (err != 0)
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: (invalidate first track) IOCTL "
 			    "BIODASDFMT failed. (%s)\n", prog_name,
-			    strerror(errno));
+			    strerror(err));
 
 	/* except track 0 from standard formatting procss */
 	p->start_unit = 1;
@@ -1280,19 +1278,16 @@ static void dasdfmt_prepare_and_format(dasdfmt_info_t *info,
 	if (info->verbosity > 0)
 		printf("Revalidate first track...\n");
 
-	if (ioctl(filedes, BIODASDFMT, &temp) != 0)
+	err = dasd_format_disk(filedes, &temp);
+	if (err != 0)
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: (re-validate first track) IOCTL"
 			    " BIODASDFMT failed (%s)\n", prog_name,
-			    strerror(errno));
+			    strerror(err));
 
 	if (info->verbosity > 0)
 		printf("Re-accessing the device...\n");
 
-	if (ioctl(filedes, BIODASDENABLE, p) != 0)
-		ERRMSG_EXIT(EXIT_FAILURE, "%s: (prepare device) IOCTL "
-			    "BIODASDENABLE failed. (%s)\n", prog_name,
-			    strerror(errno));
-	disk_disabled = 0;
+	disk_enable();
 }
 
 /*
@@ -1301,18 +1296,14 @@ static void dasdfmt_prepare_and_format(dasdfmt_info_t *info,
 static void dasdfmt_expand_format(dasdfmt_info_t *info, unsigned int cylinders,
 				  unsigned int heads, format_data_t *p)
 {
-	if (!((info->withoutprompt) && (info->verbosity < 1)))
+	if (!(info->withoutprompt && (info->verbosity < 1)))
 		printf("Formatting the device. This may take a while "
 		       "(get yourself a coffee).\n");
 
 	if (info->verbosity > 0)
 		printf("Detaching the device...\n");
 
-	if (ioctl(filedes, BIODASDDISABLE, p) != 0)
-		ERRMSG_EXIT(EXIT_FAILURE, "%s: (prepare device) IOCTL "
-			    "BIODASDDISABLE failed. (%s)\n", prog_name,
-			    strerror(errno));
-	disk_disabled = 1;
+	disk_disable(dev_filename);
 
 	dasdfmt_format(info, cylinders, heads, p);
 
@@ -1322,11 +1313,7 @@ static void dasdfmt_expand_format(dasdfmt_info_t *info, unsigned int cylinders,
 	if (info->verbosity > 0)
 		printf("Re-accessing the device...\n");
 
-	if (ioctl(filedes, BIODASDENABLE, p) != 0)
-		ERRMSG_EXIT(EXIT_FAILURE, "%s: (prepare device) IOCTL "
-			    "BIODASDENABLE failed. (%s)\n", prog_name,
-			    strerror(errno));
-	disk_disabled = 0;
+	disk_enable();
 }
 
 /*
@@ -1338,6 +1325,7 @@ static void dasdfmt_quick_format(dasdfmt_info_t *info, unsigned int cylinders,
 {
 	format_check_t cdata = { .expect = {0}, 0 };
 	format_data_t tmp = *p;
+	int err;
 
 	if (info->force) {
 		printf("Skipping format check due to --force.\n");
@@ -1364,33 +1352,29 @@ static void dasdfmt_quick_format(dasdfmt_info_t *info, unsigned int cylinders,
 		}
 	}
 
-	if (!((info->withoutprompt) && (info->verbosity < 1)))
+	if (!(info->withoutprompt && (info->verbosity < 1)))
 		printf("Formatting the first two tracks of the device.\n");
 
 	/* Disable the device before we do anything */
-	if (ioctl(filedes, BIODASDDISABLE, p))
-		ERRMSG_EXIT(EXIT_FAILURE, "%s: the ioctl to disable the device "
-			    "failed. (%s)\n", prog_name, strerror(errno));
-	disk_disabled = 1;
+	disk_disable(dev_filename);
 
 	/* Now do the actual formatting of our first two tracks */
-	if (ioctl(filedes, BIODASDFMT, p))
+	err = dasd_format_disk(filedes, p);
+	if (err != 0)
 		ERRMSG_EXIT(EXIT_FAILURE, "%s: the ioctl to format the device "
-			    "failed. (%s)\n", prog_name, strerror(errno));
+			    "failed. (%s)\n", prog_name, strerror(err));
 
 	/* Re-Enable the device so that we can continue working with it */
-	if (ioctl(filedes, BIODASDENABLE, p))
-		ERRMSG_EXIT(EXIT_FAILURE, "%s: the ioctl to enable the device "
-			    "failed. (%s)\n", prog_name, strerror(errno));
-	disk_disabled = 0;
+	disk_enable();
 }
 
-static void do_format_dasd(dasdfmt_info_t *info, volume_label_t *vlabel,
+static void do_format_dasd(dasdfmt_info_t *info, char *devname,
+			   volume_label_t *vlabel,
 			   format_data_t *p, unsigned int cylinders,
 			   unsigned int heads)
 {
 	char inp_buffer[5];
-	int count;
+	int count, err;
 
 	p->start_unit = 0;
 
@@ -1408,19 +1392,19 @@ static void do_format_dasd(dasdfmt_info_t *info, volume_label_t *vlabel,
 	}
 
 	if ((info->verbosity > 0) || !info->withoutprompt || info->testmode)
-		dasdfmt_print_info(info, vlabel, cylinders, heads, p);
+		dasdfmt_print_info(info, devname, vlabel, cylinders, heads, p);
 
-	count = u2s_get_host_access_count(info->devname);
+	count = u2s_get_host_access_count(devname);
 	if (info->force_host) {
 		if (count > 1) {
 			ERRMSG_EXIT(EXIT_FAILURE,
 				    "\n%s: Disk %s is online on OS instances in %d different LPARs.\n"
 				    "Note: Your installation might include z/VM systems that are configured to\n"
 				    "automatically vary on disks, regardless of whether they are subsequently used.\n\n",
-				    prog_name, info->devname, count);
+				    prog_name, devname, count);
 		} else if (count < 0) {
 			ERRMSG("\nHosts access information not available for disk %s.\n\n",
-			       info->devname);
+			       devname);
 			return;
 		}
 	} else if (count > 1)
@@ -1429,7 +1413,7 @@ static void do_format_dasd(dasdfmt_info_t *info, volume_label_t *vlabel,
 		       "Ensure that the disk is not being used by a system outside your LPAR.\n"
 		       "Note: Your installation might include z/VM systems that are configured to\n"
 		       "automatically vary on disks, regardless of whether they are subsequently used.\n",
-		       info->devname, count);
+		       devname, count);
 
 	if (!info->testmode) {
 		if (!info->withoutprompt) {
@@ -1467,9 +1451,10 @@ static void do_format_dasd(dasdfmt_info_t *info, volume_label_t *vlabel,
 			dasdfmt_write_labels(info, vlabel, cylinders, heads);
 
 		printf("Rereading the partition table... ");
-		if (reread_partition_table()) {
+		err = dasd_reread_partition_table(dev_filename, 5);
+		if (err != 0) {
 			ERRMSG("%s: error during rereading the partition "
-			       "table: %s.\n", prog_name, strerror(errno));
+			       "table: %s.\n", prog_name, strerror(err));
 		} else {
 			printf("ok\n");
 		}
@@ -1480,12 +1465,10 @@ int main(int argc, char *argv[])
 {
 	dasdfmt_info_t info = {
 		.dasd_info = {0},
-		{0}
 	};
 	volume_label_t vlabel;
 	char old_volser[7];
 
-	char dev_filename[PATH_MAX];
 	char str[ERR_LENGTH];
 	char buf[7];
 
@@ -1624,7 +1607,6 @@ int main(int argc, char *argv[])
 			break;
 		case -1:
 			/* End of options string - start of devices list */
-			info.device_id = optind;
 			break;
 		default:
 			ERRMSG_EXIT(EXIT_MISUSE, "Try '%s --help' for more"
@@ -1655,20 +1637,19 @@ int main(int argc, char *argv[])
 	if (info.print_hashmarks)
 		PARSE_PARAM_INTO(info.hashstep, hashstep_str, 10, "hashstep");
 
-	get_device_name(&info, dev_filename, argc, argv);
+	get_device_name(dev_filename, optind, argc, argv);
 
-	filedes = open(info.devname, O_RDWR);
-	if (filedes == -1)
-		ERRMSG_EXIT(EXIT_FAILURE, "%s: Unable to open device %s: %s\n",
-			    prog_name, info.devname, strerror(errno));
-
-	get_device_info(&info);
+	rc = dasd_get_info(dev_filename, &info.dasd_info);
+	if (rc != 0)
+		ERRMSG_EXIT(EXIT_FAILURE, "%s: the ioctl call to retrieve "
+			    "device information failed (%s).\n",
+			    prog_name, strerror(rc));
 
 	/* Either let the user specify the blksize or get it from the kernel */
 	if (!info.blksize_specified) {
 		if (!(mode == FULL ||
 		      info.dasd_info.format == DASD_FORMAT_NONE) || info.check)
-			get_blocksize(&format_params.blksize);
+			get_blocksize(dev_filename, &format_params.blksize);
 		else
 			format_params = ask_user_for_blksize(format_params);
 	}
@@ -1684,15 +1665,16 @@ int main(int argc, char *argv[])
 			exit(1);
 		}
 
-		if (dasdfmt_get_volser(&info, old_volser) == 0)
+		if (dasdfmt_get_volser(dev_filename,
+				       &info.dasd_info, old_volser) == 0)
 			vtoc_volume_label_set_volser(&vlabel, old_volser);
 		else
 			ERRMSG_EXIT(EXIT_FAILURE,
 				    "%s: VOLSER not found on device %s\n",
-				    prog_name, info.devname);
+				    prog_name, dev_filename);
 	}
 
-	check_disk(&info);
+	check_disk(&info, dev_filename);
 
 	if (check_param(str, ERR_LENGTH, &format_params) < 0)
 		ERRMSG_EXIT(EXIT_MISUSE, "%s: %s\n", prog_name, str);
@@ -1703,11 +1685,8 @@ int main(int argc, char *argv[])
 	if (info.check)
 		check_disk_format(&info, cylinders, heads, &format_params);
 	else
-		do_format_dasd(&info, &vlabel, &format_params, cylinders, heads);
-
-	if (close(filedes) != 0)
-		ERRMSG("%s: error during close: %s\ncontinuing...\n",
-		       prog_name, strerror(errno));
+		do_format_dasd(&info, dev_filename, &vlabel,
+			       &format_params, cylinders, heads);
 
 	return 0;
 }

dasdfmt/dasdfmt.h

@@ -31,120 +31,6 @@
  * SECTION: Definition needed for DASD-API (see dasd.h)                     *
  ****************************************************************************/
 
-#define DASD_IOCTL_LETTER 'D'
-
-/*
- * struct dasd_information2_t
- * represents any data about the device, which is visible to userspace.
- *  including format and features.
- */
-typedef struct dasd_information2_t {
-        unsigned int devno;           /* S/390 devno                        */
-        unsigned int real_devno;      /* for aliases                        */
-        unsigned int schid;           /* S/390 subchannel identifier        */
-        unsigned int cu_type  : 16;   /* from SenseID                       */
-        unsigned int cu_model :  8;   /* from SenseID                       */
-        unsigned int dev_type : 16;   /* from SenseID                       */
-        unsigned int dev_model : 8;   /* from SenseID                       */
-        unsigned int open_count; 
-        unsigned int req_queue_len; 
-        unsigned int chanq_len;       /* length of chanq                    */
-        char type[4];                 /* from discipline.name,              */
-	                              /* 'none' for unknown                 */
-        unsigned int status;          /* current device level               */
-        unsigned int label_block;     /* where to find the VOLSER           */
-        unsigned int FBA_layout;      /* fixed block size (like AIXVOL)     */
-        unsigned int characteristics_size;
-        unsigned int confdata_size;
-        char characteristics[64];     /* from read_device_characteristics   */
-        char configuration_data[256]; /* from read_configuration_data       */
-	unsigned int format;          /* format info like formatted/cdl/ldl/... */
-	unsigned int features;        /* dasd features like 'ro',...            */
-	unsigned int reserved0;       /* reserved for further use ,...          */
-	unsigned int reserved1;       /* reserved for further use ,...          */
-	unsigned int reserved2;       /* reserved for further use ,...          */
-	unsigned int reserved3;       /* reserved for further use ,...          */
-	unsigned int reserved4;       /* reserved for further use ,...          */
-	unsigned int reserved5;       /* reserved for further use ,...          */
-	unsigned int reserved6;       /* reserved for further use ,...          */
-	unsigned int reserved7;       /* reserved for further use ,...          */
-} dasd_information2_t;
-
-
-struct dasd_eckd_characteristics {
-	unsigned short cu_type;
-	struct {
-		unsigned char support:2;
-		unsigned char async:1;
-		unsigned char reserved:1;
-		unsigned char cache_info:1;
-		unsigned char model:3;
-	} __attribute__ ((packed)) cu_model;
-	unsigned short dev_type;
-	unsigned char dev_model;
-	struct {
-		unsigned char mult_burst:1;
-		unsigned char RT_in_LR:1;
-		unsigned char reserved1:1;
-		unsigned char RD_IN_LR:1;
-		unsigned char reserved2:4;
-		unsigned char reserved3:8;
-		unsigned char defect_wr:1;
-		unsigned char XRC_supported:1;
-		unsigned char reserved4:1;
-		unsigned char striping:1;
-		unsigned char reserved5:4;
-		unsigned char cfw:1;
-		unsigned char reserved6:2;
-		unsigned char cache:1;
-		unsigned char dual_copy:1;
-		unsigned char dfw:1;
-		unsigned char reset_alleg:1;
-		unsigned char sense_down:1;
-	} __attribute__ ((packed)) facilities;
-	unsigned char dev_class;
-	unsigned char unit_type;
-	unsigned short no_cyl;
-	unsigned short trk_per_cyl;
-	unsigned char sec_per_trk;
-	unsigned char byte_per_track[3];
-	unsigned short home_bytes;
-	unsigned char formula;
-	union {
-		struct {
-			unsigned char f1;
-			unsigned short f2;
-			unsigned short f3;
-		} __attribute__ ((packed)) f_0x01;
-		struct {
-			unsigned char f1;
-			unsigned char f2;
-			unsigned char f3;
-			unsigned char f4;
-			unsigned char f5;
-		} __attribute__ ((packed)) f_0x02;
-	} __attribute__ ((packed)) factors;
-	unsigned short first_alt_trk;
-	unsigned short no_alt_trk;
-	unsigned short first_dia_trk;
-	unsigned short no_dia_trk;
-	unsigned short first_sup_trk;
-	unsigned short no_sup_trk;
-	unsigned char MDR_ID;
-	unsigned char OBR_ID;
-	unsigned char director;
-	unsigned char rd_trk_set;
-	unsigned short max_rec_zero;
-	unsigned char reserved1;
-	unsigned char RWANY_in_LR;
-	unsigned char factor6;
-	unsigned char factor7;
-	unsigned char factor8;
-	unsigned char reserved2[3];
-	unsigned char reserved3[6];
-	unsigned int long_no_cyl;
-} __attribute__ ((packed));
-
 /*
  * Represents possible format modes that can be specified when formatting
  * a DASD.
@@ -159,17 +45,6 @@ static const char mode_str[3][10] = {
 	"Full", "Quick", "Expand"
 };
 
-/* 
- * struct format_data_t
- * represents all data necessary to format a dasd
- */
-typedef struct format_data_t {
-	unsigned int start_unit; /* from track */
-	unsigned int stop_unit;  /* to track */
-	unsigned int blksize;    /* sectorsize */
-	unsigned int intensity;
-} format_data_t;
-
 /*
  * values to be used for format_data_t.intensity
  * 0/8: normal format
@@ -183,24 +58,6 @@ typedef struct format_data_t {
 #define DASD_FMT_INT_COMPAT 8 /* use OS/390 compatible disk layout */
 #define DASD_FMT_INT_FMT_NOR0 16 /* remove permission to write record zero */
 
-/*
- * struct format_check_t
- * represents all data necessary to evaluate the format of
- * different tracks of a dasd
- */
-typedef struct format_check_t {
-	/* Input */
-	struct format_data_t expect;
-
-	/* Output */
-	unsigned int result;            /* Error indication (DASD_FMT_ERR_*) */
-	unsigned int unit;              /* Track that is in error */
-	unsigned int rec;               /* Record that is in error */
-	unsigned int num_records;       /* Records in the track in error */
-	unsigned int blksize;           /* Block-size of first record in error */
-	unsigned int key_length;        /* Key length of first record in error */
-} format_check_t;
-
 /*
  * values to be used in format_check_t for indicating
  * possible format errors
@@ -221,33 +78,6 @@ typedef struct format_check_t {
 #define DASD_FORMAT_LDL  1
 #define DASD_FORMAT_CDL  2
 
-/* Disable the volume (for Linux) */
-#define BIODASDDISABLE _IO(DASD_IOCTL_LETTER,0) 
-/* Enable the volume (for Linux) */
-#define BIODASDENABLE  _IO(DASD_IOCTL_LETTER,1)  
-
-/* Get information on a dasd device (enhanced) */
-#define BIODASDINFO2   _IOR(DASD_IOCTL_LETTER, 3, dasd_information2_t)
-
-/* #define BIODASDFORMAT  _IOW(IOCTL_LETTER,0,format_data_t) , deprecated */
-#define BIODASDFMT     _IOW(DASD_IOCTL_LETTER,1,format_data_t) 
-
-/* Check device format according to format_data_t */
-#define BIODASDCHECKFMT _IOWR(DASD_IOCTL_LETTER, 2, format_check_t)
-
-/****************************************************************************
- * SECTION: Further IOCTL Definitions  (see fs.h and hdreq.h )              *
- ****************************************************************************/
-/* re-read partition table */
-#define BLKRRPART  _IO(0x12,95)	
-/* get block device sector size */
-#define BLKSSZGET  _IO(0x12,104)
-/* get read-only status (0 = read_write) */
-#define BLKROGET   _IO(0x12,94)
-
-/* get device geometry */
-#define HDIO_GETGEO		0x0301	
-
 /****************************************************************************
  * SECTION: DASDFMT internal types                                          *
  ****************************************************************************/
@@ -291,7 +121,6 @@ typedef struct bootstrap2 {
 
 typedef struct dasdfmt_info {
 	dasd_information2_t dasd_info;
-        char  devname[PATH_MAX];
         int   verbosity;
         int   testmode;
         int   withoutprompt;
@@ -304,7 +133,6 @@ typedef struct dasdfmt_info {
         int   cdl_format;
         int   blksize_specified;
 	int   reqsize_specified;
-        int   device_id;
         int   keep_volser;
 	int   force_host;
 	int   layout_specified;

dasdinfo/Makefile

@@ -1,7 +1,8 @@
 include ../common.mak
 
 libs = $(rootdir)/libu2s/libu2s.a \
-       $(rootdir)/libutil/libutil.a
+       $(rootdir)/libutil/libutil.a \
+       $(rootdir)/libdasd/libdasd.a
 
 all: dasdinfo
 

dasdinfo/dasdinfo.c

@@ -22,6 +22,7 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 
+#include "lib/dasd_base.h"
 #include "lib/util_base.h"
 #include "lib/util_file.h"
 #include "lib/util_opt.h"
@@ -29,10 +30,6 @@
 #include "lib/zt_common.h"
 
 #define RD_BUFFER_SIZE 80
-#define BLKSSZGET    _IO(0x12,104)
-#define DASD_IOCTL_LETTER 'D'
-#define BIODASDINFO  _IOR(DASD_IOCTL_LETTER,1,struct dasd_information)
-#define BIODASDINFO2 _IOR(DASD_IOCTL_LETTER,3,struct dasd_information2)
 #define TEMP_DEV_MAX_RETRIES    1000
 
 static const struct util_prg prg = {
@@ -100,67 +97,7 @@ struct volume_label {
 	char volid[6];
 } __attribute__ ((packed));
 
-struct dasd_information2 {
-	unsigned int devno;
-	unsigned int real_devno;
-	unsigned int schid;
-	unsigned int cu_type  : 16;
-	unsigned int cu_model :  8;
-	unsigned int dev_type : 16;
-	unsigned int dev_model : 8;
-	unsigned int open_count;
-	unsigned int req_queue_len;
-	unsigned int chanq_len;
-	char type[4];
-	unsigned int status;
-	unsigned int label_block;
-	unsigned int FBA_layout;
-	unsigned int characteristics_size;
-	unsigned int confdata_size;
-	char characteristics[64];
-	char configuration_data[256];
-	unsigned int format;
-	unsigned int features;
-	unsigned int reserved0;
-	unsigned int reserved1;
-	unsigned int reserved2;
-	unsigned int reserved3;
-	unsigned int reserved4;
-	unsigned int reserved5;
-	unsigned int reserved6;
-	unsigned int reserved7;
-};
-
-struct dasd_information {
-	unsigned int devno;
-	unsigned int real_devno;
-	unsigned int schid;
-	unsigned int cu_type  : 16;
-	unsigned int cu_model :  8;
-	unsigned int dev_type : 16;
-	unsigned int dev_model : 8;
-	unsigned int open_count;
-	unsigned int req_queue_len;
-	unsigned int chanq_len;
-	char type[4];
-	unsigned int status;
-	unsigned int label_block;
-	unsigned int FBA_layout;
-	unsigned int characteristics_size;
-	unsigned int confdata_size;
-	char characteristics[64];
-	char configuration_data[256];
-};
-
-struct dasd_data
-{
-	struct dasd_information2 dasd_info;
-	int dasd_info_version;
-	int blksize;
-};
-
-static char EBCtoASC[256] =
-{
+static char EBCtoASC[256] = {
 /* 0x00  NUL   SOH   STX   ETX  *SEL    HT  *RNL   DEL */
 	0x00, 0x01, 0x02, 0x03, 0x07, 0x09, 0x07, 0x7F,
 /* 0x08  -GE  -SPS  -RPT    VT    FF    CR    SO    SI */
@@ -227,12 +164,12 @@ static char EBCtoASC[256] =
 	0x38, 0x39, 0x07, 0x07, 0x9A, 0x07, 0x07, 0x07
 };
 
-static char *dinfo_ebcdic_dec (char *source, char *target, int l)
+static char *dinfo_ebcdic_dec(char *source, char *target, int l)
 {
 	int i;
 
 	for (i = 0; i < l; i++)
-		target[i]=EBCtoASC[(unsigned char)(source[i])];
+		target[i] = EBCtoASC[(unsigned char)(source[i])];
 
 	return target;
 }
@@ -242,51 +179,49 @@ static int dinfo_read_dasd_uid(char *uidfile, char *readbuf)
 	return util_file_read_line(readbuf, RD_BUFFER_SIZE, uidfile);
 }
 
-static int dinfo_read_dasd_vlabel (char *device, struct volume_label *vlabel,
-				   char *readbuf)
+static int dinfo_read_dasd_vlabel(char *device, struct volume_label *vlabel,
+				  char *readbuf)
 {
-	struct dasd_data data;
 	struct volume_label tmp;
 	int vlsize = sizeof(struct volume_label);
+	dasd_information2_t dasd_info;
 	unsigned long vlabel_start;
+	unsigned int blksize;
 	char vollbl[5];
 	int f;
 	char *space;
 
-	if ((f = open(device, O_RDONLY)) < 0) {
-		printf("Could not open device node.\n");
-		goto error;
-	}
-
-	if (ioctl(f, BLKSSZGET, &data.blksize) != 0) {
+	if (dasd_get_blocksize(device, &blksize) != 0) {
 		printf("Unable to figure out block size.\n");
 		goto error;
 	}
 
-	if (ioctl(f, BIODASDINFO2, &data.dasd_info) == 0)
-		data.dasd_info_version = 2;
-	else {
-		if (ioctl(f, BIODASDINFO, &data.dasd_info) != 0) {
-			printf("Unable to figure out DASD informations.\n");
-			goto error;
-		}
+	if (dasd_get_info(device, &dasd_info) != 0) {
+		printf("Unable to figure out DASD informations.\n");
+		goto error;
 	}
 
-	vlabel_start = data.dasd_info.label_block * data.blksize;
-	if (lseek(f, vlabel_start, SEEK_SET) < 0)
+	f = open(device, O_RDONLY);
+	if (f < 0) {
+		printf("Could not open device node.\n");
 		goto error;
+	}
+
+	vlabel_start = dasd_info.label_block * blksize;
+	if (lseek(f, vlabel_start, SEEK_SET) < 0)
+		goto error_close;
 
 	bzero(vlabel, vlsize);
 
 	if (read(f, vlabel, vlsize) != vlsize) {
 		printf("Could not read volume label.\n");
-		goto error;
+		goto error_close;
 	}
 
-	if (data.dasd_info.FBA_layout) {
+	if (dasd_info.FBA_layout) {
 		bzero(&tmp, vlsize);
 		memcpy(&tmp, vlabel, vlsize);
-		memcpy(vlabel->vollbl, &tmp, vlsize-4);
+		memcpy(vlabel->vollbl, &tmp, vlsize - 4);
 	}
 
 	close(f);
@@ -301,16 +236,17 @@ static int dinfo_read_dasd_vlabel (char *device, struct volume_label *vlabel,
 	    (strncmp(vollbl, "CMS1", 4) == 0)) {
 		strncpy(readbuf, vlabel->volid, 6);
 		dinfo_ebcdic_dec(readbuf, readbuf, 6);
-		space = strchr(readbuf,' ');
+		space = strchr(readbuf, ' ');
 		if (space)
 			*space = 0;
-	} else
+	} else {
 		strcpy(readbuf, "");
-
+	}
 
 	return 0;
-error:
+error_close:
 	close(f);
+error:
 	return -1;
 }
 
@@ -321,7 +257,7 @@ static void *dinfo_malloc(size_t size)
 	result = malloc(size);
 	if (result == NULL) {
 		printf("Could not allocate %lld bytes of memory",
-			(unsigned long long) size);
+		       (unsigned long long)size);
 	}
 	return result;
 }
@@ -332,7 +268,7 @@ static char *dinfo_make_path(char *dirname, char *filename)
 	size_t len;
 
 	len = strlen(dirname) + strlen(filename) + 2;
-	result = (char *) dinfo_malloc(len);
+	result = (char *)dinfo_malloc(len);
 	if (result == NULL)
 		return NULL;
 	sprintf(result, "%s/%s", dirname, filename);
@@ -342,8 +278,8 @@ static char *dinfo_make_path(char *dirname, char *filename)
 static int dinfo_create_devnode(dev_t dev, char **devno)
 {
 	char *result;
-	char * pathname[] = { "/dev", getenv("TMPDIR"), "/tmp",
-				getenv("HOME"), "." , "/"};
+	char *pathname[] = { "/dev", getenv("TMPDIR"), "/tmp",
+		getenv("HOME"), ".", "/"};
 	char filename[] = "dasdinfo0000";
 	mode_t mode;
 	unsigned int path;
@@ -354,10 +290,10 @@ static int dinfo_create_devnode(dev_t dev, char **devno)
 	mode = S_IFBLK | S_IRWXU;
 
 	/* Try several locations for the temporary device node. */
-	for (path=0; path < sizeof(pathname) / sizeof(pathname[0]); path++) {
+	for (path = 0; path < UTIL_ARRAY_SIZE(pathname); path++) {
 		if (pathname[path] == NULL)
 			continue;
-		for (retry=0; retry < TEMP_DEV_MAX_RETRIES; retry++) {
+		for (retry = 0; retry < TEMP_DEV_MAX_RETRIES; retry++) {
 			sprintf(filename, "dasdinfo%04d", retry);
 			result = dinfo_make_path(pathname[path], filename);
 			if (result == NULL)
@@ -366,7 +302,8 @@ static int dinfo_create_devnode(dev_t dev, char **devno)
 			if (rc == 0) {
 				/* Need this test to cover
 				 * 'nodev'-mounted
-				 * filesystems. */
+				 * filesystems.
+				 */
 				fd = open(result, O_RDONLY);
 				if (fd != -1) {
 					close(fd);
@@ -375,8 +312,9 @@ static int dinfo_create_devnode(dev_t dev, char **devno)
 				}
 				remove(result);
 				retry = TEMP_DEV_MAX_RETRIES;
-			} else if (errno != EEXIST)
+			} else if (errno != EEXIST) {
 				retry = TEMP_DEV_MAX_RETRIES;
+			}
 			free(result);
 		}
 	}
@@ -400,7 +338,8 @@ static int dinfo_extract_dev(dev_t *dev, char *str)
 
 	bzero(tmp, RD_BUFFER_SIZE);
 	strncpy(tmp, str, RD_BUFFER_SIZE);
-	if ((p = strchr(tmp, ':')) == NULL) {
+	p = strchr(tmp, ':');
+	if (p == NULL) {
 		printf("Error: unable to extract major/minor\n");
 		return -1;
 	}
@@ -439,6 +378,7 @@ dinfo_is_busiddir(const char *fpath, const struct stat *UNUSED(sb),
 	char *tempdir;
 	char linkdir[128];
 	ssize_t i;
+
 	if (tflag != FTW_D || (strncmp((fpath + ftwbuf->base), searchbusid,
 				       strlen(searchbusid)) != 0))
 		return FTW_CONTINUE;
@@ -454,7 +394,7 @@ dinfo_is_busiddir(const char *fpath, const struct stat *UNUSED(sb),
 	if ((i < 0) || (i >= 128))
 		return -1;
 	/* append '\0' because readlink returns non zero terminated string */
-	tempdir[i+1] = '\0';
+	tempdir[i + 1] = '\0';
 	if (strstr(linkdir, "dasd") == NULL)
 		return FTW_CONTINUE;
 	free(busiddir);
@@ -470,15 +410,17 @@ dinfo_find_entry(const char *dir, const char *searchstring,
 {
 	DIR *directory = NULL;
 	struct dirent *dir_entry = NULL;
+
 	directory = opendir(dir);
 	if (directory == NULL)
 		return -1;
 	while ((dir_entry = readdir(directory)) != NULL) {
-		/* compare if the found entry has exactly the same name
-		   and type as searched */
+		/* compare if the found entry has exactly the same name and type
+		 * as searched
+		 */
 		if ((strncmp(dir_entry->d_name, searchstring,
-			     strlen(searchstring)) == 0)
-		    && (dir_entry->d_type & type)) {
+			     strlen(searchstring)) == 0) &&
+		    (dir_entry->d_type & type)) {
 			*result = strdup(dir_entry->d_name);
 			if (*result == NULL)
 				goto out;
@@ -545,6 +487,7 @@ static int dinfo_get_uid_from_devnode(char **uidfile, char *devnode)
 	char *readbuf;
 	DIR *directory = NULL;
 	struct dirent *dir_entry = NULL;
+	int rc = 0;
 
 	if (stat(devnode, &stat_buffer) != 0) {
 		printf("Error: could not stat %s\n", devnode);
@@ -554,7 +497,8 @@ static int dinfo_get_uid_from_devnode(char **uidfile, char *devnode)
 	sprintf(stat_dev, "%d:%d", major(stat_buffer.st_rdev),
 		minor(stat_buffer.st_rdev));
 
-	if ((directory = opendir("/sys/block/")) == NULL) {
+	directory = opendir("/sys/block/");
+	if (directory == NULL) {
 		printf("Error: could not open directory /sys/block\n");
 		return -1;
 	}
@@ -572,9 +516,16 @@ static int dinfo_get_uid_from_devnode(char **uidfile, char *devnode)
 			continue;
 
 		if (strncmp(stat_dev, readbuf,
-			    MAX(strlen(stat_dev), strlen(readbuf)-1)) == 0) {
-			snprintf(*uidfile, RD_BUFFER_SIZE,
-				 "/sys/block/%s/device/uid", dir_entry->d_name);
+			    MAX(strlen(stat_dev), strlen(readbuf) - 1)) == 0) {
+			rc = snprintf(*uidfile, RD_BUFFER_SIZE,
+				      "/sys/block/%s/device/uid",
+				      dir_entry->d_name);
+			if (rc >= RD_BUFFER_SIZE) {
+				fprintf(stderr,
+					"Error: Device name was truncated\n");
+				return -1;
+			}
+
 			break;
 		}
 	}
@@ -583,7 +534,7 @@ static int dinfo_get_uid_from_devnode(char **uidfile, char *devnode)
 	return 0;
 }
 
-int main(int argc, char * argv[])
+int main(int argc, char *argv[])
 {
 	struct utsname uname_buf;
 	int version, release;
@@ -627,13 +578,13 @@ int main(int argc, char * argv[])
 			print_vlabel = 1;
 			break;
 		case 'i':
-			busid=strdup(optarg);
+			busid = strdup(optarg);
 			break;
 		case 'b':
-			blockdev=strdup(optarg);
+			blockdev = strdup(optarg);
 			break;
 		case 'd':
-			devnode=strdup(optarg);
+			devnode = strdup(optarg);
 			break;
 		case 'e':
 			export = 1;
@@ -653,11 +604,11 @@ int main(int argc, char * argv[])
 	}
 
 	uname(&uname_buf);
-	sscanf(uname_buf.release, "%d.%d", &version,&release);
-	if (strcmp(uname_buf.sysname,"Linux") ||
+	sscanf(uname_buf.release, "%d.%d", &version, &release);
+	if (strcmp(uname_buf.sysname, "Linux") ||
 	    version < 2 || (version == 2 && release < 6)) {
 		printf("%s %d.%d is not supported\n", uname_buf.sysname,
-			version,release);
+		       version, release);
 		exit(1);
 	}
 
@@ -685,9 +636,9 @@ int main(int argc, char * argv[])
 
 	/* try to read the uid attribute */
 	if (busid) {
-		sprintf(uidfile,"/sys/bus/ccw/devices/%s/uid", busid);
+		sprintf(uidfile, "/sys/bus/ccw/devices/%s/uid", busid);
 	} else if (blockdev) {
-		sprintf(uidfile,"/sys/block/%s/device/uid", blockdev);
+		sprintf(uidfile, "/sys/block/%s/device/uid", blockdev);
 	} else if (devnode) {
 		if (dinfo_get_uid_from_devnode(&uidfile, devnode) != 0)
 			goto error;
@@ -707,13 +658,11 @@ int main(int argc, char * argv[])
 				if (!srchuid)
 					break;
 			}
-			if (srchuid) {
-				srchuid[0] = '\n';
-				srchuid[1] = 0;
-			}
-			if (export) {
+			if (srchuid)
+				srchuid[0] = '\0';
+			if (export)
 				printf("ID_UID=%s\n", readbuf);
-			} else
+			else
 				printf("%s\n", readbuf);
 			if (!print_vlabel && !print_extended_uid)
 				goto out;
@@ -722,9 +671,9 @@ int main(int argc, char * argv[])
 
 	if (print_extended_uid) {
 		if (dinfo_read_dasd_uid(uidfile, readbuf) == 0) {
-			if (export) {
+			if (export)
 				printf("ID_XUID=%s\n", readbuf);
-			} else
+			else
 				printf("%s\n", readbuf);
 			if (!print_vlabel)
 				goto out;
@@ -761,9 +710,9 @@ int main(int argc, char * argv[])
 	}
 
 	if (dinfo_read_dasd_vlabel(device, &vlabel, readbuf) == 0) {
-		if (export) {
-			printf("ID_SERIAL=%s\n",readbuf);
-		} else
+		if (export)
+			printf("ID_SERIAL=%s\n", readbuf);
+		else
 			printf("%s\n", readbuf);
 		goto out;
 	}

dasdview/dasdview.h

@@ -17,139 +17,6 @@
  * SECTION: Definitions needed for DASD-API (see dasd.h)
  *******************************************************************************/
 
-#define DASD_IOCTL_LETTER 'D'
-
-/*
- * struct dasd_information_t
- * represents any data about the device, which is visible to userspace.
- *  including foramt and features.
- */
-typedef struct dasd_information_t {
-        unsigned int devno;         /* S/390 devno */
-        unsigned int real_devno;    /* for aliases */
-        unsigned int schid;         /* S/390 subchannel identifier */
-        unsigned int cu_type  : 16; /* from SenseID */
-        unsigned int cu_model :  8; /* from SenseID */
-        unsigned int dev_type : 16; /* from SenseID */
-        unsigned int dev_model : 8; /* from SenseID */
-        unsigned int open_count;
-        unsigned int req_queue_len;
-        unsigned int chanq_len;     /* length of chanq */
-        char type[4];               /* from discipline.name, 'none' for unknown */
-        unsigned int status;        /* current device level */
-        unsigned int label_block;   /* where to find the VOLSER */
-        unsigned int FBA_layout;    /* fixed block size (like AIXVOL) */
-        unsigned int characteristics_size;
-        unsigned int confdata_size;
-        char characteristics[64];   /* from read_device_characteristics */
-        char configuration_data[256]; /* from read_configuration_data */
-} dasd_information_t;
-
-typedef struct dasd_information2_t {
-        unsigned int devno;         /* S/390 devno */
-        unsigned int real_devno;    /* for aliases */
-        unsigned int schid;         /* S/390 subchannel identifier */
-        unsigned int cu_type  : 16; /* from SenseID */
-        unsigned int cu_model :  8; /* from SenseID */
-        unsigned int dev_type : 16; /* from SenseID */
-        unsigned int dev_model : 8; /* from SenseID */
-        unsigned int open_count;
-        unsigned int req_queue_len;
-        unsigned int chanq_len;     /* length of chanq */
-        char type[4];               /* from discipline.name, 'none' for unknown */
-        unsigned int status;        /* current device level */
-        unsigned int label_block;   /* where to find the VOLSER */
-        unsigned int FBA_layout;    /* fixed block size (like AIXVOL) */
-        unsigned int characteristics_size;
-        unsigned int confdata_size;
-	unsigned char characteristics[64];/*from read_device_characteristics */
-	unsigned char configuration_data[256];/*from read_configuration_data */
-        unsigned int format;          /* format info like formatted/cdl/ldl/... */
-        unsigned int features;        /* dasd features like 'ro',...            */
-        unsigned int reserved0;       /* reserved for further use ,...          */
-        unsigned int reserved1;       /* reserved for further use ,...          */
-        unsigned int reserved2;       /* reserved for further use ,...          */
-        unsigned int reserved3;       /* reserved for further use ,...          */
-        unsigned int reserved4;       /* reserved for further use ,...          */
-        unsigned int reserved5;       /* reserved for further use ,...          */
-        unsigned int reserved6;       /* reserved for further use ,...          */
-        unsigned int reserved7;       /* reserved for further use ,...          */
-} dasd_information2_t;
-
-struct dasd_eckd_characteristics {
-	unsigned short cu_type;
-	struct {
-		unsigned char support:2;
-		unsigned char async:1;
-		unsigned char reserved:1;
-		unsigned char cache_info:1;
-		unsigned char model:3;
-	} __attribute__ ((packed)) cu_model;
-	unsigned short dev_type;
-	unsigned char dev_model;
-	struct {
-		unsigned char mult_burst:1;
-		unsigned char RT_in_LR:1;
-		unsigned char reserved1:1;
-		unsigned char RD_IN_LR:1;
-		unsigned char reserved2:4;
-		unsigned char reserved3:8;
-		unsigned char defect_wr:1;
-		unsigned char XRC_supported:1;
-		unsigned char reserved4:1;
-		unsigned char striping:1;
-		unsigned char reserved5:4;
-		unsigned char cfw:1;
-		unsigned char reserved6:2;
-		unsigned char cache:1;
-		unsigned char dual_copy:1;
-		unsigned char dfw:1;
-		unsigned char reset_alleg:1;
-		unsigned char sense_down:1;
-	} __attribute__ ((packed)) facilities;
-	unsigned char dev_class;
-	unsigned char unit_type;
-	unsigned short no_cyl;
-	unsigned short trk_per_cyl;
-	unsigned char sec_per_trk;
-	unsigned char byte_per_track[3];
-	unsigned short home_bytes;
-	unsigned char formula;
-	union {
-		struct {
-			unsigned char f1;
-			unsigned short f2;
-			unsigned short f3;
-		} __attribute__ ((packed)) f_0x01;
-		struct {
-			unsigned char f1;
-			unsigned char f2;
-			unsigned char f3;
-			unsigned char f4;
-			unsigned char f5;
-		} __attribute__ ((packed)) f_0x02;
-	} __attribute__ ((packed)) factors;
-	unsigned short first_alt_trk;
-	unsigned short no_alt_trk;
-	unsigned short first_dia_trk;
-	unsigned short no_dia_trk;
-	unsigned short first_sup_trk;
-	unsigned short no_sup_trk;
-	unsigned char MDR_ID;
-	unsigned char OBR_ID;
-	unsigned char director;
-	unsigned char rd_trk_set;
-	unsigned short max_rec_zero;
-	unsigned char reserved1;
-	unsigned char RWANY_in_LR;
-	unsigned char factor6;
-	unsigned char factor7;
-	unsigned char factor8;
-	unsigned char reserved2[3];
-	unsigned char reserved3[6];
-	unsigned int long_no_cyl;
-} __attribute__ ((packed));
-
 /*
  * values to be used for dasd_information2_t.format
  * 0x00: NOT formatted
@@ -170,21 +37,6 @@ struct dasd_eckd_characteristics {
 #define DASD_FEATURE_READONLY 1
 #define DASD_FEATURE_USEDIAG  2
 
-/* Get information on a dasd device (enhanced) */
-#define BIODASDINFO    _IOR(DASD_IOCTL_LETTER,1,dasd_information_t)
-#define BIODASDINFO2   _IOR(DASD_IOCTL_LETTER,3,dasd_information2_t)
-
-/********************************************************************************
- * SECTION: Further IOCTL Definitions  (see fs.h and hdreq.h)
- *******************************************************************************/
-/* get block device sector size */
-#define BLKSSZGET  _IO(0x12,104)
-/* return device size in bytes (u64 *arg) */
-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
-
-/* get device geometry */
-#define HDIO_GETGEO		0x0301
-
 /********************************************************************************
  * SECTION: DASDVIEW internal types
  *******************************************************************************/
@@ -215,7 +67,7 @@ typedef struct dasdview_info
 	char device[PATH_MAX];
 	dasd_information2_t dasd_info;
 	int dasd_info_version;
-	int blksize;
+	unsigned int blksize;
 	struct hd_geometry geo;
 	u_int32_t hw_cylinders;
 

etc/Makefile

@@ -0,0 +1,16 @@
+include ../common.mak
+
+CONFIG_FILES =
+
+ifneq (${SYSTEMDSYSTEMUNITDIR},)
+CONFIG_FILES += cpuplugd.conf sysconfig/cpi sysconfig/dumpconf \
+                sysconfig/mon_fsstatd sysconfig/mon_procd
+endif
+
+install:
+	for file in $(CONFIG_FILES); do \
+		$(INSTALL) -g $(GROUP) -o $(OWNER) \
+			   -m 644 $$file $(DESTDIR)$(SYSCONFDIR)/$$file ; \
+	done
+
+.PHONY: all install clean

etc/udev/rules.d/60-readahead.rules

@@ -7,7 +7,7 @@ SUBSYSTEM!="block", GOTO="ra_end"
 
 ACTION!="add", GOTO="ra_change"
 # on device add set initial readahead to 512 (instead of in kernel 128)
-KERNEL=="sd*[!0-9]", WAIT_FOR="queue/read_ahead_kb", ATTR{queue/read_ahead_kb}="512"
+KERNEL=="sd*[!0-9]", TEST=="queue/read_ahead_kb", ATTR{queue/read_ahead_kb}="512"
 
 LABEL="ra_change"
 

fdasd/fdasd.c

@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <sys/sysmacros.h>
 
+#include "lib/dasd_base.h"
 #include "lib/dasd_sys.h"
 #include "lib/util_base.h"
 #include "lib/util_opt.h"
@@ -220,8 +221,7 @@ static u_int32_t get_usable_cylinders(fdasd_anchor_t *anc)
 		return anc->f4->DS4DCYL;
 	/* normal volume */
 	if (anc->f4->DS4DEVCT.DS4DEVFG & ALTERNATE_CYLINDERS_USED)
-		cyl = anc->f4->DS4DEVCT.DS4DSCYL -
-			(u_int16_t) anc->f4->DS4DEVAC;
+		cyl = anc->f4->DS4DEVCT.DS4DSCYL - (u_int16_t)anc->f4->DS4DEVAC;
 	else
 		cyl = anc->f4->DS4DEVCT.DS4DSCYL;
 
@@ -230,9 +230,8 @@ static u_int32_t get_usable_cylinders(fdasd_anchor_t *anc)
 
 static void get_addr_of_highest_f1_f8_label(fdasd_anchor_t *anc, cchhb_t *addr)
 {
-
 	u_int8_t record;
-	/* We have to count the follwing labels:
+	/* We have to count the following labels:
 	 * one format 4
 	 * one format 5
 	 * format 7 only if we have moren then BIG_DISK_SIZE tracks
@@ -769,7 +768,7 @@ static int fdasd_parse_conffile(fdasd_anchor_t *anc,
 		} else {
 			errno = 0;
 			anc->confdata[i].start = strtol(token[0],
-							(char **) NULL, 10);
+							(char **)NULL, 10);
 			if (errno != 0 || anc->confdata[i].start == 0) {
 				snprintf(err_str, ERROR_STRING_SIZE,
 					 "invalid partition start in config "
@@ -784,7 +783,7 @@ static int fdasd_parse_conffile(fdasd_anchor_t *anc,
 		} else {
 			errno = 0;
 			anc->confdata[i].stop = strtol(token[1],
-						       (char **) NULL, 10);
+						       (char **)NULL, 10);
 			if (errno != 0 || anc->confdata[i].stop == 0) {
 				snprintf(err_str, ERROR_STRING_SIZE,
 					 "invalid partition end in config "
@@ -884,9 +883,9 @@ static void fdasd_check_conffile_input(fdasd_anchor_t *anc,
 			anc->fspace_trk = start - FIRST_USABLE_TRK;
 
 		if (i < USABLE_PARTITIONS - 1) {
-			if (anc->confdata[i+1].start != 0)
+			if (anc->confdata[i + 1].start != 0)
 				part_info->fspace_trk =
-					anc->confdata[i+1].start-stop-1;
+					anc->confdata[i + 1].start - stop - 1;
 			else
 				part_info->fspace_trk = last_trk - stop;
 		} else if (i == USABLE_PARTITIONS - 1) {
@@ -916,8 +915,8 @@ static void fdasd_verify_device(fdasd_anchor_t *anc, char *name)
 	if (!S_ISBLK(dst.st_mode)) {
 		snprintf(err_str, ERROR_STRING_SIZE,
 			 "Device '%s' (%d/%d) is not a block device\n", name,
-			 (unsigned short) major(dst.st_rdev),
-			 (unsigned short) minor(dst.st_rdev));
+			 (unsigned short)major(dst.st_rdev),
+			 (unsigned short)minor(dst.st_rdev));
 		fdasd_error(anc, device_verification_failed, err_str);
 	}
 
@@ -925,8 +924,8 @@ static void fdasd_verify_device(fdasd_anchor_t *anc, char *name)
 		snprintf(err_str, ERROR_STRING_SIZE,
 			 "Partition '%s' (%d/%d) detected where device is "
 			 "required\n", name,
-			 (unsigned short) major(dst.st_rdev),
-			 (unsigned short) minor(dst.st_rdev));
+			 (unsigned short)major(dst.st_rdev),
+			 (unsigned short)minor(dst.st_rdev));
 		fdasd_error(anc, device_verification_failed, err_str);
 	}
 
@@ -962,8 +961,8 @@ static void fdasd_verify_device(fdasd_anchor_t *anc, char *name)
 
 	if (anc->verbose) {
 		printf("Verification successful for '%s' (%d/%d)\n", name,
-		       (unsigned short) major(dst.st_rdev),
-		       (unsigned short) minor(dst.st_rdev));
+		       (unsigned short)major(dst.st_rdev),
+		       (unsigned short)minor(dst.st_rdev));
 	}
 }
 
@@ -1028,15 +1027,13 @@ static void fdasd_verify_options(fdasd_anchor_t *anc)
 		}
 	}
 
-	if (anc->auto_partition &&
-	    (options.conffile || anc->print_table)) {
+	if (anc->auto_partition && (options.conffile || anc->print_table)) {
 		fdasd_error(anc, parser_failed,
 			    "Option 'auto' cannot be used with "
 			    "'config' and 'table'.\n");
 	}
 
-	if (options.conffile  &&
-	    (anc->print_table)) {
+	if (options.conffile && anc->print_table) {
 		fdasd_error(anc, parser_failed,
 			    "Option 'config' cannot be used with"
 			    " 'table'.\n");
@@ -1232,26 +1229,13 @@ static int fdasd_get_volser(fdasd_anchor_t *anc, char *volser)
  */
 static void fdasd_reread_partition_table(fdasd_anchor_t *anc)
 {
-	char err_str[ERROR_STRING_SIZE];
-	int fd;
-
 	if (!anc->silent)
 		printf("rereading partition table...\n");
 
-	fd = open(options.device, O_RDONLY);
-	if (fd < 0) {
-		snprintf(err_str, ERROR_STRING_SIZE,
-			 "Could not open device '%s' "
-			 "in read-only mode!\n", options.device);
-		fdasd_error(anc, unable_to_open_disk, err_str);
-	}
-
-	if (ioctl(fd, BLKRRPART, NULL) != 0) {
-		close(fd);
+	if (dasd_reread_partition_table(options.device, 1) != 0) {
 		fdasd_error(anc, unable_to_ioctl, "Error while rereading "
 			    "partition table.\nPlease reboot!");
 	}
-	close(fd);
 }
 
 /*
@@ -1335,7 +1319,7 @@ static void fdasd_write_vtoc_labels(fdasd_anchor_t *anc)
 			while (getpos(anc, k) > -1)
 				k++;
 
-			setpos(anc, k, i-1);
+			setpos(anc, k, i - 1);
 
 			strncpy(ch, "LINUX.V               "
 				"                      ", 44);
@@ -1414,7 +1398,7 @@ static void fdasd_write_labels(fdasd_anchor_t *anc)
 	if (anc->vtoc_changed)
 		fdasd_write_vtoc_labels(anc);
 
-	if ((anc->vtoc_changed) || (anc->vlabel_changed))
+	if (anc->vtoc_changed || anc->vlabel_changed)
 		fdasd_reread_partition_table(anc);
 }
 
@@ -1500,9 +1484,9 @@ static void fdasd_reuse_vtoc(fdasd_anchor_t *anc)
 
 	if (!anc->silent) {
 		snprintf(str, INPUT_BUF_SIZE,
-			"WARNING: this will re-create your VTOC "
-			"entries using the partition\n           "
-			"information of your existing VTOC. Continue?");
+			 "WARNING: this will re-create your VTOC "
+			 "entries using the partition\n           "
+			 "information of your existing VTOC. Continue?");
 
 		if (yes_no(str) != 0)
 			return;
@@ -1637,9 +1621,11 @@ static void fdasd_change_part_type(fdasd_anchor_t *anc)
 	printf("\n");
 
 	part_type = 0;
-	while (part_type < 1 || part_type > UTIL_ARRAY_SIZE(partition_types) - 1) {
-		while (!isdigit(part_type =
-				read_char("new partition type: ")));
+	while (part_type < 1 ||
+	       part_type > UTIL_ARRAY_SIZE(partition_types) - 1) {
+		do {
+			part_type = read_char("new partition type: ");
+		} while (!isdigit(part_type));
 		part_type -= 48;
 	}
 
@@ -2094,7 +2080,8 @@ static void fdasd_check_disk_access(fdasd_anchor_t *anc)
 {
 	char err_str[ERROR_STRING_SIZE];
 	format1_label_t f1;
-	int fd, pos, ro;
+	int fd, pos;
+	bool ro;
 
 	fd = open(options.device, O_RDONLY);
 	if (fd == -1) {
@@ -2127,7 +2114,9 @@ static void fdasd_check_disk_access(fdasd_anchor_t *anc)
 		fdasd_error(anc, unable_to_seek_disk, err_str);
 	}
 
-	if (ioctl(fd, BLKROGET, &ro) != 0) {
+	close(fd);
+
+	if (dasd_is_ro(options.device, &ro) != 0) {
 		snprintf(err_str, ERROR_STRING_SIZE,
 			 "Could not get read-only status for device '%s'.",
 			 options.device);
@@ -2138,8 +2127,6 @@ static void fdasd_check_disk_access(fdasd_anchor_t *anc)
 		       "You will not be able to save any changes.\n\n",
 		       options.device);
 	}
-
-	close(fd);
 }
 
 /*
@@ -2171,16 +2158,18 @@ static unsigned int recs_per_track(unsigned short dev_type, unsigned int kl,
 			kn = ceil_quot(kl + 6, 232) + 1;
 			return 1729 / (10 + 9 + ceil_quot(kl + 6 * kn, 34) +
 				       9 + ceil_quot(dl + 6 * dn, 34));
-		} else
+		} else {
 			return 1729 / (10 + 9 + ceil_quot(dl + 6 * dn, 34));
+		}
 	case DASD_9345_TYPE:
 		dn = ceil_quot(dl + 6, 232) + 1;
 		if (kl) {
 			kn = ceil_quot(kl + 6, 232) + 1;
 			return 1420 / (18 + 7 + ceil_quot(kl + 6 * kn, 34) +
 				       ceil_quot(dl + 6 * dn, 34));
-		} else
+		} else {
 			return 1420 / (18 + 7 + ceil_quot(dl + 6 * dn, 34));
+		}
 	}
 	return 0;
 }
@@ -2214,21 +2203,12 @@ static void fdasd_get_geometry(fdasd_anchor_t *anc)
 	struct dasd_eckd_characteristics *characteristics;
 	unsigned long long size_in_bytes;
 	char err_str[ERROR_STRING_SIZE];
-	dasd_information_t dasd_info;
-	int fd, blksize = 0;
+	dasd_information2_t dasd_info;
+	unsigned int blksize = 0;
 
-	fd = open(options.device, O_RDONLY);
-	if (fd < 0) {
-		snprintf(err_str, ERROR_STRING_SIZE,
-			 "Could not open device '%s' "
-			 "in read-only mode!\n", options.device);
-		fdasd_error(anc, unable_to_open_disk, err_str);
-	}
-	if (ioctl(fd, BLKGETSIZE64, &size_in_bytes) != 0) {
-		close(fd);
+	if (dasd_get_blocksize_in_bytes(options.device, &size_in_bytes) != 0)
 		fdasd_error(anc, unable_to_ioctl,
 			    "Could not retrieve disk size.");
-	}
 	/*
 	 * If anc->force_virtual is set, we do no real geometry detection.
 	 * anc->dev_type and anc->blksize have already been set via command
@@ -2247,7 +2227,6 @@ static void fdasd_get_geometry(fdasd_anchor_t *anc)
 		geo.start = 0;
 		anc->label_pos = 2 * anc->blksize;
 		anc->devno = 0;
-		close(fd);
 		if (anc->verbose) {
 			printf("The force option is active. "
 			       "The following geometry will be used:\n"
@@ -2259,24 +2238,21 @@ static void fdasd_get_geometry(fdasd_anchor_t *anc)
 		return;
 	}
 
-	if (ioctl(fd, HDIO_GETGEO, &geo) != 0) {
-		close(fd);
+	if (dasd_get_geo(options.device, &geo) != 0) {
 		fdasd_error(anc, unable_to_ioctl,
 			    "Could not retrieve disk geometry information.");
 	}
-	if (ioctl(fd, BLKSSZGET, &blksize) != 0) {
-		close(fd);
+	if (dasd_get_blocksize(options.device, &blksize) != 0) {
 		fdasd_error(anc, unable_to_ioctl,
 			    "Could not retrieve blocksize information.");
 	}
 	/* get disk type */
-	if (ioctl(fd, BIODASDINFO, &dasd_info) != 0) {
+	if (dasd_get_info(options.device, &dasd_info) != 0) {
 		if (anc->verbose)
 			printf("BIODASDINFO ioctl failed,"
 			       " use disk geometry only.\n");
 		/* verify that the geometry matches a 3390 DASD */
 		if (!fdasd_verify_geometry(DASD_3390_TYPE, blksize, &geo)) {
-			close(fd);
 			fdasd_error(anc, wrong_disk_type,
 				    "Disk geometry does not match a DASD device"
 				    " of type 3390.");
@@ -2356,8 +2332,6 @@ static void fdasd_get_geometry(fdasd_anchor_t *anc)
 		anc->label_pos	= dasd_info.label_block * blksize;
 		anc->devno	= dasd_info.devno;
 	}
-
-	close(fd);
 }
 
 /*
@@ -2384,10 +2358,8 @@ fdasd_read_int(unsigned long low, unsigned long dflt, unsigned long high,
 	}
 
 	while (1) {
-		while (!isdigit(read_char(msg_txt))
-		       && (*line_ptr != '-' &&
-			   *line_ptr != '+' &&
-			   *line_ptr != '\0'))
+		while (!isdigit(read_char(msg_txt)) &&
+		       (*line_ptr != '-' && *line_ptr != '+' && *line_ptr != '\0'))
 			continue;
 		if ((*line_ptr == '+' || *line_ptr == '-') && base != lower) {
 			if (*line_ptr == '+')
@@ -2411,13 +2383,13 @@ fdasd_read_int(unsigned long low, unsigned long dflt, unsigned long high,
 				break;
 			case 'm':
 			case 'M':
-				trk *= (1024*1024);
+				trk *= (1024 * 1024);
 				trk /= anc->blksize;
 				trk /= geo.sectors;
 				break;
 			case 'g':
 			case 'G':
-				trk *= (1024*1024*1024);
+				trk *= (1024 * 1024 * 1024);
 				trk /= anc->blksize;
 				trk /= geo.sectors;
 				break;
@@ -2546,7 +2518,6 @@ static int fdasd_get_partition_data(fdasd_anchor_t *anc, extent_t *part_extent,
 			limit = part_tmp->start_trk - 1;
 			break;
 		}
-
 	}
 
 	if (start == limit) {
@@ -2642,7 +2613,7 @@ static void fdasd_enqueue_new_partition(fdasd_anchor_t *anc)
 				FIRST_USABLE_TRK;
 		}
 	} else {
-		/* there are partitons in front of the new one */
+		/* there are partitions in front of the new one */
 		if (part_info->start_trk == part_info->prev->end_trk + 1) {
 			/* new partition is right behind the previous one */
 			part_info->fspace_trk = part_info->prev->fspace_trk -
@@ -2797,7 +2768,7 @@ static void fdasd_remove_partition(fdasd_anchor_t *anc)
 /*
  * writes a standard volume label and a standard VTOC with
  * only one partition to disc. With this function is it
- * possible to create one partiton in non-interactive mode,
+ * possible to create one partition in non-interactive mode,
  * which can be used within shell scripts
  */
 static void fdasd_auto_partition(fdasd_anchor_t *anc)
@@ -3067,7 +3038,6 @@ int main(int argc, char *argv[])
 			fdasd_recreate_vtoc(&anchor);
 			anchor.option_recreate = 0;
 		}
-
 	}
 
 	return -1;

fdasd/fdasd.h

@@ -14,125 +14,8 @@
  * SECTION: Definitions needed for DASD-API (see dasd.h)		     *
  *****************************************************************************/
 
-#define DASD_IOCTL_LETTER 'D'
-
 #define DASD_PARTN_BITS 2
 
-/*
- * struct dasd_information_t
- * represents any data about the device, which is visible to userspace.
- *  including foramt and featueres.
- */
-typedef struct dasd_information_t {
-	unsigned int devno;	      /* S/390 devno			     */
-	unsigned int real_devno;      /* for aliases			     */
-	unsigned int schid;	      /* S/390 subchannel identifier	     */
-	unsigned int cu_type  : 16;   /* from SenseID			     */
-	unsigned int cu_model :  8;   /* from SenseID			     */
-	unsigned int dev_type : 16;   /* from SenseID			     */
-	unsigned int dev_model : 8;   /* from SenseID			     */
-	unsigned int open_count;
-	unsigned int req_queue_len;
-	unsigned int chanq_len;       /* length of chanq		     */
-	char type[4];		      /* from discipline.name, 'none' for    */
-				      /* unknown			     */
-	unsigned int status;	      /* current device level		     */
-	unsigned int label_block;     /* where to find the VOLSER	     */
-	unsigned int FBA_layout;      /* fixed block size (like AIXVOL)      */
-	unsigned int characteristics_size;
-	unsigned int confdata_size;
-	char characteristics[64];     /* from read_device_characteristics    */
-	char configuration_data[256]; /* from read_configuration_data	     */
-} dasd_information_t;
-
-struct dasd_eckd_characteristics {
-	unsigned short cu_type;
-	struct {
-		unsigned char support:2;
-		unsigned char async:1;
-		unsigned char reserved:1;
-		unsigned char cache_info:1;
-		unsigned char model:3;
-	} __attribute__ ((packed)) cu_model;
-	unsigned short dev_type;
-	unsigned char dev_model;
-	struct {
-		unsigned char mult_burst:1;
-		unsigned char RT_in_LR:1;
-		unsigned char reserved1:1;
-		unsigned char RD_IN_LR:1;
-		unsigned char reserved2:4;
-		unsigned char reserved3:8;
-		unsigned char defect_wr:1;
-		unsigned char XRC_supported:1;
-		unsigned char reserved4:1;
-		unsigned char striping:1;
-		unsigned char reserved5:4;
-		unsigned char cfw:1;
-		unsigned char reserved6:2;
-		unsigned char cache:1;
-		unsigned char dual_copy:1;
-		unsigned char dfw:1;
-		unsigned char reset_alleg:1;
-		unsigned char sense_down:1;
-	} __attribute__ ((packed)) facilities;
-	unsigned char dev_class;
-	unsigned char unit_type;
-	unsigned short no_cyl;
-	unsigned short trk_per_cyl;
-	unsigned char sec_per_trk;
-	unsigned char byte_per_track[3];
-	unsigned short home_bytes;
-	unsigned char formula;
-	union {
-		struct {
-			unsigned char f1;
-			unsigned short f2;
-			unsigned short f3;
-		} __attribute__ ((packed)) f_0x01;
-		struct {
-			unsigned char f1;
-			unsigned char f2;
-			unsigned char f3;
-			unsigned char f4;
-			unsigned char f5;
-		} __attribute__ ((packed)) f_0x02;
-	} __attribute__ ((packed)) factors;
-	unsigned short first_alt_trk;
-	unsigned short no_alt_trk;
-	unsigned short first_dia_trk;
-	unsigned short no_dia_trk;
-	unsigned short first_sup_trk;
-	unsigned short no_sup_trk;
-	unsigned char MDR_ID;
-	unsigned char OBR_ID;
-	unsigned char director;
-	unsigned char rd_trk_set;
-	unsigned short max_rec_zero;
-	unsigned char reserved1;
-	unsigned char RWANY_in_LR;
-	unsigned char factor6;
-	unsigned char factor7;
-	unsigned char factor8;
-	unsigned char reserved2[3];
-	unsigned char reserved3[6];
-	unsigned int long_no_cyl;
-} __attribute__ ((packed));
-
-/* Get information on a dasd device (enhanced) */
-#define BIODASDINFO   _IOR(DASD_IOCTL_LETTER,1,dasd_information_t)
-
-/*****************************************************************************
- * SECTION: Further IOCTL Definitions  (see fs.h and hdreq.h)		     *
- *****************************************************************************/
-#define BLKROGET   _IO(0x12,94) /* get read-only status (0 = read_write) */
-#define BLKRRPART  _IO(0x12,95) /* re-read partition table */
-#define BLKSSZGET  _IO(0x12,104)/* get block device sector size */
-#define BLKGETSIZE64 _IOR(0x12,114,size_t) /* device size in bytes (u64 *arg)*/
-
-/* get device geometry */
-#define HDIO_GETGEO		0x0301
-
 /*****************************************************************************
  * SECTION: FDASD internal types					     *
  *****************************************************************************/

hmcdrvfs/Makefile

@@ -49,7 +49,7 @@ install: all install-scripts
 install-scripts: lshmc
 	@for i in $^; do \
 		cat $$i | \
-		sed -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
+		sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
 		>$(DESTDIR)$(USRSBINDIR)/$$i; \
 		chown $(OWNER).$(GROUP) $(DESTDIR)$(USRSBINDIR)/$$i; \
 		chmod 755 $(DESTDIR)$(USRSBINDIR)/$$i; \

hmcdrvfs/hmcdrvfs.c

@@ -821,10 +821,13 @@ static char *hmcdrv_parse_line(char *line, char *namebuf,
 		if ((*line != '\0') && (*line != '\n')) {
 			field = hmcdrv_parse_ntoken(field, line, &attr);
 
-			while ((*line != '\0') &&
-			       (*line != '\n') &&
-			       !isspace(*line))
+			while ((*line != '\0') && (*line != '\n')) {
+				if (isspace(*line))
+					break;
+				if (field == 1 && isdigit(*line))
+					break;
 				++line; /* search end of field */
+			}
 		}
 	} /* while */
 

include/lib/dasd_base.h

@@ -0,0 +1,207 @@
+/*
+ * dasd_base - Library for DASD related functions
+ *
+ * DASD related helper functions for accessing device information
+ *
+ * Copyright IBM Corp. 2013, 2017
+ * Copyright Red Hat Inc. 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.
+ */
+
+#ifndef LIB_DASD_BASE_H
+#define LIB_DASD_BASE_H
+
+#ifdef __linux__
+#include <linux/hdreg.h>
+#endif
+#include <stdbool.h>
+#include <stdio.h>
+#include <sys/ioctl.h>
+
+typedef struct dasd_information2_t {
+	unsigned int devno;         /* S/390 devno */
+	unsigned int real_devno;    /* for aliases */
+	unsigned int schid;         /* S/390 subchannel identifier */
+	unsigned int cu_type  : 16; /* from SenseID */
+	unsigned int cu_model :  8; /* from SenseID */
+	unsigned int dev_type : 16; /* from SenseID */
+	unsigned int dev_model : 8; /* from SenseID */
+	unsigned int open_count;
+	unsigned int req_queue_len;
+	unsigned int chanq_len;     /* length of chanq */
+	char type[4];               /* from discipline.name, 'none' for unknown */
+	unsigned int status;        /* current device level */
+	unsigned int label_block;   /* where to find the VOLSER */
+	unsigned int FBA_layout;    /* fixed block size (like AIXVOL) */
+	unsigned int characteristics_size;
+	unsigned int confdata_size;
+	unsigned char characteristics[64];/*from read_device_characteristics */
+	unsigned char configuration_data[256];/*from read_configuration_data */
+	unsigned int format;          /* format info like formatted/cdl/ldl/... */
+	unsigned int features;        /* dasd features like 'ro',...            */
+	unsigned int reserved0;       /* reserved for further use ,...          */
+	unsigned int reserved1;       /* reserved for further use ,...          */
+	unsigned int reserved2;       /* reserved for further use ,...          */
+	unsigned int reserved3;       /* reserved for further use ,...          */
+	unsigned int reserved4;       /* reserved for further use ,...          */
+	unsigned int reserved5;       /* reserved for further use ,...          */
+	unsigned int reserved6;       /* reserved for further use ,...          */
+	unsigned int reserved7;       /* reserved for further use ,...          */
+} dasd_information2_t;
+
+struct dasd_eckd_characteristics {
+	unsigned short cu_type;
+	struct {
+		unsigned char support:2;
+		unsigned char async:1;
+		unsigned char reserved:1;
+		unsigned char cache_info:1;
+		unsigned char model:3;
+	} __attribute__ ((packed)) cu_model;
+	unsigned short dev_type;
+	unsigned char dev_model;
+	struct {
+		unsigned char mult_burst:1;
+		unsigned char RT_in_LR:1;
+		unsigned char reserved1:1;
+		unsigned char RD_IN_LR:1;
+		unsigned char reserved2:4;
+		unsigned char reserved3:8;
+		unsigned char defect_wr:1;
+		unsigned char XRC_supported:1;
+		unsigned char reserved4:1;
+		unsigned char striping:1;
+		unsigned char reserved5:4;
+		unsigned char cfw:1;
+		unsigned char reserved6:2;
+		unsigned char cache:1;
+		unsigned char dual_copy:1;
+		unsigned char dfw:1;
+		unsigned char reset_alleg:1;
+		unsigned char sense_down:1;
+	} __attribute__ ((packed)) facilities;
+	unsigned char dev_class;
+	unsigned char unit_type;
+	unsigned short no_cyl;
+	unsigned short trk_per_cyl;
+	unsigned char sec_per_trk;
+	unsigned char byte_per_track[3];
+	unsigned short home_bytes;
+	unsigned char formula;
+	union {
+		struct {
+			unsigned char f1;
+			unsigned short f2;
+			unsigned short f3;
+		} __attribute__ ((packed)) f_0x01;
+		struct {
+			unsigned char f1;
+			unsigned char f2;
+			unsigned char f3;
+			unsigned char f4;
+			unsigned char f5;
+		} __attribute__ ((packed)) f_0x02;
+	} __attribute__ ((packed)) factors;
+	unsigned short first_alt_trk;
+	unsigned short no_alt_trk;
+	unsigned short first_dia_trk;
+	unsigned short no_dia_trk;
+	unsigned short first_sup_trk;
+	unsigned short no_sup_trk;
+	unsigned char MDR_ID;
+	unsigned char OBR_ID;
+	unsigned char director;
+	unsigned char rd_trk_set;
+	unsigned short max_rec_zero;
+	unsigned char reserved1;
+	unsigned char RWANY_in_LR;
+	unsigned char factor6;
+	unsigned char factor7;
+	unsigned char factor8;
+	unsigned char reserved2[3];
+	unsigned char reserved3[6];
+	unsigned int long_no_cyl;
+} __attribute__ ((packed));
+
+/*
+ * struct format_data_t
+ * represents all data necessary to format a dasd
+ */
+typedef struct format_data_t {
+	unsigned int start_unit; /* from track */
+	unsigned int stop_unit;  /* to track */
+	unsigned int blksize;    /* sectorsize */
+	unsigned int intensity;
+} format_data_t;
+
+/*
+ * struct format_check_t
+ * represents all data necessary to evaluate the format of
+ * different tracks of a dasd
+ */
+typedef struct format_check_t {
+	/* Input */
+	struct format_data_t expect;
+
+	/* Output */
+	unsigned int result;            /* Error indication (DASD_FMT_ERR_*) */
+	unsigned int unit;              /* Track that is in error */
+	unsigned int rec;               /* Record that is in error */
+	unsigned int num_records;       /* Records in the track in error */
+	unsigned int blksize;           /* Block-size of first record in error */
+	unsigned int key_length;        /* Key length of first record in error */
+} format_check_t;
+
+#ifndef __linux__
+/* definition from hdreg.h */
+struct hd_geometry {
+	unsigned char heads;
+	unsigned char sectors;
+	unsigned short cylinders;
+	unsigned long start;
+};
+#endif
+
+#define DASD_IOCTL_LETTER 'D'
+
+/* Disable the volume (for Linux) */
+#define BIODASDDISABLE _IO(DASD_IOCTL_LETTER, 0)
+/* Enable the volume (for Linux) */
+#define BIODASDENABLE  _IO(DASD_IOCTL_LETTER, 1)
+/* Get information on a dasd device (enhanced) */
+#define BIODASDINFO2   _IOR(DASD_IOCTL_LETTER, 3, dasd_information2_t)
+/* #define BIODASDFORMAT  _IOW(IOCTL_LETTER,0,format_data_t) , deprecated */
+#define BIODASDFMT     _IOW(DASD_IOCTL_LETTER, 1, format_data_t)
+/* Check device format according to format_data_t */
+#define BIODASDCHECKFMT _IOWR(DASD_IOCTL_LETTER, 2, format_check_t)
+
+/********************************************************************************
+ * SECTION: Further IOCTL Definitions  (see fs.h and hdreq.h)
+ *******************************************************************************/
+/* get read-only status (0 = read_write) */
+#define BLKROGET   _IO(0x12, 94)
+/* re-read partition table */
+#define BLKRRPART  _IO(0x12, 95)
+/* get block device sector size */
+#define BLKSSZGET  _IO(0x12, 104)
+/* return device size in bytes (u64 *arg) */
+#define BLKGETSIZE64 _IOR(0x12, 114, size_t)
+
+#ifndef __linux__ /* from <linux/hdreg.h> */
+#define HDIO_GETGEO	0x0301
+#endif
+
+int dasd_check_format(const char *device, format_check_t *p);
+int dasd_format_disk(int fd, format_data_t *p);
+int dasd_disk_disable(const char *device, int *fd);
+int dasd_disk_enable(int fd);
+int dasd_get_blocksize(const char *device, unsigned int *blksize);
+int dasd_get_blocksize_in_bytes(const char *device, unsigned long long *blksize);
+int dasd_get_geo(const char *device, struct hd_geometry *geo);
+int dasd_get_info(const char *device, dasd_information2_t *info);
+int dasd_is_ro(const char *device, bool *ro);
+int dasd_reread_partition_table(const char *device, int ntries);
+
+#endif /* LIB_DASD_BASE_H */

include/lib/util_libc.h

@@ -14,6 +14,10 @@
 
 #include <stdio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Allocate memory or panic in case of failure
  *
@@ -125,4 +129,10 @@ int __util_vsprintf(const char *func, const char *file, int line,
 char *util_strcat_realloc(char *str1, const char *str2);
 void util_str_toupper(char *str);
 
+char *util_strstrip(char *s);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /** LIB_UTIL_LIBC_H @} */

include/lib/util_path.h

@@ -20,5 +20,6 @@ bool util_path_is_readable(const char *fmt, ...);
 bool util_path_is_writable(const char *fmt, ...);
 bool util_path_is_dir(const char *fmt, ...);
 bool util_path_is_reg_file(const char *fmt, ...);
+bool util_path_exists(const char *fmt, ...);
 
 #endif /** LIB_UTIL_PATH_H @} */

include/lib/util_prg.h

@@ -18,12 +18,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-/**
- * Copyright IBM Corp. 2016, 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.
- */
 struct util_prg_copyright {
 	/** Name of the copyright owner, e.g. IBM */
 	const char *owner;

include/lib/vmcp.h

@@ -0,0 +1,52 @@
+/*
+ * vmcp - z/VM CP command library
+ *
+ * Copyright IBM Corp. 2005, 2018
+ *
+ * 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 LIB_VMCP_H
+#define LIB_VMCP_H
+
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define	VMCP_DEVICE_NODE	"/dev/vmcp"	/* VMCP device name */
+#define	VMCP_DEFAULT_BUFSZ	0x4000		/* VMCP default buffer size */
+
+/*
+ * Error codes returned by vmcp() function. This enables the caller
+ * to emit a detailed error message on the type of failure.
+ */
+#define	VMCP_SUCCESS	0	/* VMCP operation completed successfully */
+#define	VMCP_ERR_OPEN		(-1)	/* Error Open of VMCP device */
+#define	VMCP_ERR_SETBUF		(-2)	/* Error VMCP_SETBUF ioctl */
+#define	VMCP_ERR_READ		(-3)	/* Error VMCP read system call */
+#define	VMCP_ERR_GETCODE	(-4)	/* Error VMCP_GETCODE ioctl */
+#define	VMCP_ERR_GETSIZE	(-5)	/* Error VMCP_GETSIZE ioctl */
+#define	VMCP_ERR_TOOSMALL	(-6)	/* Error VMCP buffer too small for
+					 * response
+					 */
+#define	VMCP_ERR_WRITE		(-7)	/* Error VMCP write system call */
+
+struct vmcp_parm {
+	const char *cpcmd;
+	unsigned int buffer_size;
+	bool do_upper;
+	int cprc;
+	char *response;
+	unsigned int response_size;
+};
+
+int vmcp(struct vmcp_parm *cp);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

include/lib/vtoc.h

@@ -19,6 +19,7 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "lib/dasd_base.h"
 
 #define LINE_LENGTH 80
 #define VTOC_START_CC 0x0
@@ -40,14 +41,6 @@
 
 #define VTOC_ERROR "VTOC error:"
 
-/* definition from hdreq.h */
-struct hd_geometry {
-      unsigned char heads;
-      unsigned char sectors;
-      unsigned short cylinders;
-      unsigned long start;
-};
-
 typedef struct ttr 
 {
         u_int16_t tt;

include/lib/zt_common.h

@@ -25,6 +25,7 @@
 #define RELEASE_STRING	STRINGIFY (S390_TOOLS_RELEASE)
 #define TOOLS_LIBDIR	STRINGIFY (S390_TOOLS_LIBDIR)
 #define TOOLS_SYSCONFDIR STRINGIFY (S390_TOOLS_SYSCONFDIR)
+#define TOOLS_BINDIR	STRINGIFY (S390_TOOLS_BINDIR)
 
 #define __noreturn __attribute__((noreturn))
 #define __packed __attribute__((packed))

ip_watcher/Makefile

@@ -8,7 +8,7 @@ clean:
 	rm -f *.o core xcec-bridge
 
 install: ip_watcher.pl xcec-bridge start_hsnc.sh
-	$(SED) -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
+	$(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
 	< start_hsnc.sh >$(DESTDIR)$(USRSBINDIR)/start_hsnc.sh; \
 	chown $(OWNER).$(GROUP) $(DESTDIR)$(USRSBINDIR)/start_hsnc.sh; \
 	chmod 755 $(DESTDIR)$(USRSBINDIR)/start_hsnc.sh; \

ipl_tools/cmd_chreipl.c

@@ -445,7 +445,7 @@ static void set_target_type_auto(const char *arg)
 {
 	char busid[10];
 
-	if (access(arg, R_OK) == 0) {
+	if (access(arg, F_OK) == 0) {
 		set_target_type(TT_NODE, 1);
 		return;
 	}
@@ -539,12 +539,19 @@ static void parse_chreipl_options(int argc, char *argv[])
 		parse_pos_args(&argv[optind], argc - optind);
 }
 
-static void verify_write_access(const char *path, const char *attr)
+static void check_exists(const char *path, const char *attr)
 {
 	char fpath[PATH_MAX];
 
 	snprintf(fpath, sizeof(fpath), "/sys/firmware/%s", path);
-	if (access(fpath, W_OK) != 0)
+	if (access(fpath, F_OK) != 0)
+		ERR_EXIT("System does not allow to set %s", attr);
+}
+
+static void write_str_optional(char *string, char *file, int exit_on_fail,
+			       const char *attr)
+{
+	if (write_str_errno(string, file) && exit_on_fail)
 		ERR_EXIT("System does not allow to set %s", attr);
 }
 
@@ -585,22 +592,18 @@ static void chreipl_ccw(void)
 		ERR_EXIT("Could not find DASD CCW device \"%s\"", l.busid);
 	}
 
+	if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_CCW_MAX) {
+		ERR_EXIT("Maximum boot parameter length exceeded (%zu/%u)",
+			 strlen(l.bootparms), BOOTPARMS_CCW_MAX);
+	}
+
 	/*
 	 * On old systems that use CCW reipl loadparm cannot be set
 	 */
-	if (l.loadparm_set)
-		verify_write_access("reipl/ccw/loadparm", "loadparm");
-	if (l.bootparms_set) {
-		verify_write_access("reipl/ccw/parm", "boot parameters");
-		if (strlen(l.bootparms) > BOOTPARMS_CCW_MAX)
-			ERR_EXIT("Maximum boot parameter length exceeded "
-				 "(%zu/%u)", strlen(l.bootparms),
-				 BOOTPARMS_CCW_MAX);
-	}
-	if (access("/sys/firmware/reipl/ccw/parm", W_OK) == 0)
-		write_str(l.bootparms, "reipl/ccw/parm");
-	if (access("/sys/firmware/reipl/ccw/loadparm", W_OK) == 0)
-		write_str(l.loadparm, "reipl/ccw/loadparm");
+	write_str_optional(l.loadparm, "reipl/ccw/loadparm", l.loadparm_set,
+			   "loadparm");
+	write_str_optional(l.bootparms, "reipl/ccw/parm", l.bootparms_set,
+			   "boot parameters");
 	write_str(l.busid, "reipl/ccw/device");
 	write_str("ccw", "reipl/reipl_type");
 
@@ -616,27 +619,21 @@ static void chreipl_fcp(void)
 			ERR_EXIT("Device is on cio_ignore list, try \"cio_ignore -r %s\"?", l.busid);
 		ERR_EXIT("Could not find FCP device \"%s\"", l.busid);
 	}
-	verify_write_access("reipl/fcp/device", "\"fcp\" re-IPL target");
+	check_exists("reipl/fcp/device", "\"fcp\" 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);
+	}
 	/*
 	 * On old systems the FCP reipl loadparm cannot be set
 	 */
-	if (l.loadparm_set)
-		verify_write_access("reipl/fcp/loadparm", "loadparm");
-	if (l.bootparms_set) {
-		verify_write_access("reipl/fcp/scp_data", "boot parameters");
-		if (strlen(l.bootparms) > BOOTPARMS_FCP_MAX)
-			ERR_EXIT("Maximum boot parameter length exceeded "
-				 "(%zu/%u)", strlen(l.bootparms),
-				 BOOTPARMS_FCP_MAX);
-	}
-	if (access("/sys/firmware/reipl/fcp/scp_data", W_OK) == 0)
-		write_str(l.bootparms, "reipl/fcp/scp_data");
-	if (access("/sys/firmware/reipl/fcp/loadparm", W_OK) == 0)
-		write_str(l.loadparm, "reipl/fcp/loadparm");
+	write_str_optional(l.loadparm, "reipl/fcp/loadparm", l.loadparm_set,
+			   "loadparm");
+	write_str_optional(l.bootparms, "reipl/fcp/scp_data", l.bootparms_set,
+			   "boot parameters");
 	write_str(l.busid, "reipl/fcp/device");
 	write_str(l.wwpn, "reipl/fcp/wwpn");
 	write_str(l.lun, "reipl/fcp/lun");
-	write_str("fcp", "reipl/reipl_type");
 	/*
 	 * set the boot record logical block address. Master boot
 	 * record. It is always 0 for Linux
@@ -645,6 +642,7 @@ static void chreipl_fcp(void)
 	if (!l.bootprog_set)
 		sprintf(l.bootprog, "0");
 	write_str(l.bootprog,  "reipl/fcp/bootprog");
+	write_str("fcp", "reipl/reipl_type");
 
 	print_fcp(0, 0);
 }
@@ -652,17 +650,14 @@ static void chreipl_fcp(void)
 static void chreipl_nss(void)
 {
 	check_nss_opts();
-	verify_write_access("reipl/nss/name", "\"nss\" re-IPL target");
-	if (l.bootparms_set) {
-		verify_write_access("reipl/nss/parm", "boot parameters");
-		if (strlen(l.bootparms) > BOOTPARMS_NSS_MAX)
-			ERR_EXIT("Maximum boot parameter length exceeded "
-				 "(%zu/%u)", strlen(l.bootparms),
-				 BOOTPARMS_NSS_MAX);
+	check_exists("reipl/nss/name", "\"nss\" re-IPL target");
+	if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_NSS_MAX) {
+		ERR_EXIT("Maximum boot parameter length exceeded (%zu/%u)",
+			 strlen(l.bootparms), BOOTPARMS_NSS_MAX);
 	}
+	write_str_optional(l.bootparms, "reipl/nss/parm", l.bootparms_set,
+			   "boot parameters");
 	write_str(l.nss_name, "reipl/nss/name");
-	if (access("/sys/firmware/reipl/nss/parm", W_OK) == 0)
-		write_str(l.bootparms, "reipl/nss/parm");
 	write_str("nss", "reipl/reipl_type");
 	print_nss(0);
 }

ipl_tools/ipl_tools.h

@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lib/zt_common.h>
+#include "lib/zt_common.h"
 
 #define IPL_TYPE_LEN_MAX	100
 #define NSS_NAME_LEN_MAX	8

ipl_tools/system.c

@@ -129,7 +129,7 @@ int write_str_errno(char *string, char *file)
 	snprintf(path, sizeof(path), "/sys/firmware/%s", file);
 	fh = open(path, O_WRONLY);
 	if (fh < 0)
-		ERR_EXIT_ERRNO("Could not open \"%s\"", file);
+		return errno;
 	if (write(fh, value, strlen(value)) < 0)
 		return errno;
 	close(fh);

iucvterm/src/Makefile

@@ -15,7 +15,7 @@ SYSTOOLS = ttyrun
 
 all: $(PROGRAMS) $(SYSTOOLS)
 check:
-install:
+install: all
 	for prg in $(PROGRAMS); do \
 	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $$prg $(DESTDIR)$(USRBINDIR) ; \
 	done

iucvterm/src/getopt.c

@@ -8,6 +8,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.
  */
+#include <ctype.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>

libdasd/Makefile

@@ -4,7 +4,7 @@ lib = libdasd.a
 
 all: $(lib)
 
-objects = dasd_sys.o
+objects = dasd_sys.o dasd_ioctl.o
 
 $(lib): $(objects) Makefile
 

libdasd/dasd_ioctl.c

@@ -0,0 +1,263 @@
+/*
+ * dasd_ioctl - Library for dasd-related ioctls
+ *
+ * DASD related helper functions for accessing device information via ioctls
+ *
+ * Copyright IBM Corp. 2013, 2017
+ * Copyright Red Hat Inc. 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.
+ */
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "lib/dasd_base.h"
+
+#define COULD_NOT_OPEN_WARN(device) \
+	warn("Could not open device '%s'", device)
+
+#define COULD_NOT_CLOSE_WARN \
+	warn("Unable to close device")
+
+#define RUN_IOCTL(fd, req, argp)				\
+	do {							\
+		if (ioctl(fd, req, argp) != 0) {		\
+			int err = errno;			\
+			if (err != EBADF)			\
+				dasd_close_device(fd);		\
+			return err;				\
+		}						\
+	} while (0)
+
+static int dasd_open_device(const char *device, int flags)
+{
+	int fd;
+
+	fd = open(device, flags);
+	if (fd == -1)
+		COULD_NOT_OPEN_WARN(device);
+
+	return fd;
+}
+
+static void dasd_close_device(int fd)
+{
+	if (close(fd) != 0)
+		COULD_NOT_CLOSE_WARN;
+}
+
+/*
+ * Get DASD block size information for device
+ *
+ * @param[in] device node	device node's name
+ * @param[out] blksize		the block size
+ *
+ * @retval 0		in case of success
+ * @retval errno	in case of failure
+ *
+ */
+int dasd_get_blocksize(const char *device, unsigned int *blksize)
+{
+	int fd;
+
+	fd = dasd_open_device(device, O_RDONLY);
+	RUN_IOCTL(fd, BLKSSZGET, blksize);
+	dasd_close_device(fd);
+
+	return 0;
+}
+
+/*
+ * Get DASD block size information (in bytes) for device
+ *
+ * @param[in] device node	device node's name
+ * @param[out] blksize		block size in bytes
+ *
+ * @retval 0		in case of success
+ * @retval errno	in case of failure
+ */
+int dasd_get_blocksize_in_bytes(const char *device, unsigned long long *blksize)
+{
+	int fd;
+
+	fd = dasd_open_device(device, O_RDONLY);
+	RUN_IOCTL(fd, BLKGETSIZE64, blksize);
+	dasd_close_device(fd);
+
+	return 0;
+}
+
+/*
+ * Get DASD disk information for device
+ *
+ * @param[in] device node	device node's name
+ * @param[out] info		pointer to dasd information
+ *
+ * @retval 0		in case of success
+ * @retval errno	in case of failure
+ */
+int dasd_get_info(const char *device, dasd_information2_t *info)
+{
+	int fd;
+
+	fd = dasd_open_device(device, O_RDONLY);
+	RUN_IOCTL(fd, BIODASDINFO2, info);
+	dasd_close_device(fd);
+
+	return 0;
+}
+
+/*
+ * Get DASD disk geometry information for device
+ *
+ * @param[in] device node	device node's name
+ * @param[out] geo		pointer to device geometry information
+ *
+ * @retval errno	in case of failure
+ * @retval 0		in case of success
+ */
+int dasd_get_geo(const char *device, struct hd_geometry *geo)
+{
+	int fd;
+
+	fd = dasd_open_device(device, O_RDONLY);
+	RUN_IOCTL(fd, HDIO_GETGEO, geo);
+	dasd_close_device(fd);
+
+	return 0;
+}
+
+/*
+ * Get DASD read/write status information for device
+ *
+ * @param[in] device node	device node's name
+ * @param[out] ro		read-only status (1 for ro, 0 for rw)
+ *
+ * @retval 0		in case of success
+ * @retval errno	in case of failure
+ */
+int dasd_is_ro(const char *device, bool *ro)
+{
+	int fd, val;
+
+	fd = dasd_open_device(device, O_RDWR);
+	RUN_IOCTL(fd, BLKROGET, &val);
+	*ro = (val != 0) ? true : false;
+
+	return 0;
+}
+
+/*
+ * Disable DASD disk.
+ *
+ * @param[in] device node	device node's name
+ *
+ * @retval 0		in case of success
+ * @retval errno	in case of failure
+ *
+ * Note: Before BIODASDFMT can be called, a DASD has to be disabled (or rather
+ * put into a BASIC state) via BIODASDDISABLE. However, if you disable the DASD,
+ * close the file descriptor, and then try to reopen it, it won't work as the
+ * device isn't fully usable anymore. For BIODASDFMT to work, the file
+ * descriptor opened for BIODASDISABLE has to be kept open until BIODASDFMT has
+ * finished.
+ */
+int dasd_disk_disable(const char *device, int *fd)
+{
+	*fd = dasd_open_device(device, O_RDWR);
+	RUN_IOCTL(*fd, BIODASDDISABLE, NULL);
+
+	return 0;
+}
+
+/*
+ * Enable DASD disk
+ *
+ * @param[in] device node	device node's name
+ *
+ * @retval 0		in case of success
+ * @retval errno	in case of failure
+ */
+int dasd_disk_enable(int fd)
+{
+	RUN_IOCTL(fd, BIODASDENABLE, NULL);
+	dasd_close_device(fd);
+
+	return 0;
+}
+
+/*
+ * Format DASD disk
+ *
+ * @param[in] fd		device node's file descriptor
+ * @param[in] p			format options
+ *
+ * @retval 0		in case of success
+ * @retval errno	in case of failure
+ */
+int dasd_format_disk(int fd, format_data_t *p)
+{
+	RUN_IOCTL(fd, BIODASDFMT, p);
+
+	return 0;
+}
+
+/*
+ * Check DASD format
+ *
+ * @param[in] device node	device node's name
+ * @param[in] p			format params
+ *
+ * @retval 0		in case of success
+ * @retval errno	in case of failure
+ */
+int dasd_check_format(const char *device, format_check_t *p)
+{
+	int fd;
+
+	fd = dasd_open_device(device, O_RDONLY);
+	RUN_IOCTL(fd, BIODASDCHECKFMT, p);
+	dasd_close_device(fd);
+
+	return 0;
+}
+
+/*
+ * Reread partition table
+ *
+ * @param[in] device node	device node's name
+ * @param[in] ntries		maximum number of tries
+ *
+ * @retval 0		in case of success
+ * @retval errno	in case of failure
+ */
+int dasd_reread_partition_table(const char *device, int ntries)
+{
+	int i, fd, err = 0;
+
+	fd = dasd_open_device(device, O_RDONLY);
+
+	/*
+	 * If the BLKRRPART ioctl fails, it is most likely due to the device
+	 * just being in use by udev. So it is worthwhile to retry the ioctl
+	 * after a second as it is likely to succeed.
+	 */
+	for (i = 0; i < ntries; i++) {
+		if (ioctl(fd, BLKRRPART, NULL) != 0) {
+			err = errno;
+			sleep(1);
+		} else {
+			err = 0;
+			break;
+		}
+	}
+	dasd_close_device(fd);
+
+	return err;
+}

libutil/Makefile

@@ -28,17 +28,17 @@ objects =	util_base.o \
 		util_proc.o \
 		util_rec.o
 
-util_base_example: util_base_example.o $(rootdir)/libutil/libutil.a
-util_panic_example: util_panic_example.o $(rootdir)/libutil/libutil.a
-util_path_example: util_path_example.o $(rootdir)/libutil/libutil.a
-util_scandir_example: util_scandir_example.o $(rootdir)/libutil/libutil.a
-util_file_example: util_file_example.o $(rootdir)/libutil/libutil.a
-util_libc_example: util_libc_example.o $(rootdir)/libutil/libutil.a
-util_opt_example: util_opt_example.o $(rootdir)/libutil/libutil.a
-util_opt_command_example: util_opt_command_example.o $(rootdir)/libutil/libutil.a
-util_panic_example: util_panic_example.o $(rootdir)/libutil/libutil.a
-util_prg_example: util_prg_example.o $(rootdir)/libutil/libutil.a
-util_rec_example: util_rec_example.o $(rootdir)/libutil/libutil.a
+util_base_example: util_base_example.o $(lib)
+util_panic_example: util_panic_example.o $(lib)
+util_path_example: util_path_example.o $(lib)
+util_scandir_example: util_scandir_example.o $(lib)
+util_file_example: util_file_example.o $(lib)
+util_libc_example: util_libc_example.o $(lib)
+util_opt_example: util_opt_example.o $(lib)
+util_opt_command_example: util_opt_command_example.o $(lib)
+util_panic_example: util_panic_example.o $(lib)
+util_prg_example: util_prg_example.o $(lib)
+util_rec_example: util_rec_example.o $(lib)
 
 $(lib): $(objects)
 

libutil/util_libc.c

@@ -198,3 +198,33 @@ int __util_vsprintf(const char *func, const char *file, int line,
 			      rc != -1, "Could not format string\n");
 	return rc;
 }
+
+/**
+ * Strip leading and trailing spaces from string
+ *
+ * Remove string \a s leading and trailing spaces
+ *
+ * @param[in,out] s String to manipulate
+ *
+ * @returns Pointer to first non-space character in string \a s
+ */
+char *util_strstrip(char *s)
+{
+	size_t size;
+	char *end;
+
+	size = strlen(s);
+
+	if (!size)
+		return s;
+
+	end = s + size - 1;
+	while (end >= s && isspace(*end))
+		end--;
+	*(end + 1) = '\0';
+
+	while (*s && isspace(*s))
+		s++;
+
+	return s;
+}

libutil/util_libc_example.c

@@ -10,10 +10,13 @@
 //! [code]
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "lib/util_libc.h"
 #include "lib/util_panic.h"
 
+#define	EXAMPLE_WORD	"   /sys/devices/system/cpu    "
+
 /*
  * Demonstrate that out of memory is automatically handled via panic()
  */
@@ -22,6 +25,12 @@ int main(void)
 	unsigned long ulong_max = (unsigned long)-1;
 	void *ptr;
 	char *zeroes, *str;
+	char buffer[sizeof(EXAMPLE_WORD)];
+
+	strcat(buffer, EXAMPLE_WORD);
+	fprintf(stderr, "Try to remove leading and trailing spaces from "
+			"\"%s\"\nresult = \"%s\"\n", EXAMPLE_WORD,
+			util_strstrip(buffer));
 
 	/* Use util_strcat_realloc() for string concatenation */
 	fprintf(stderr, "Try to concatenate \"Hello\",  \", \" and \"world!\": ");

libutil/util_list.c

@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "lib/util_libc.h"
 #include "lib/util_list.h"
 
 /*
@@ -45,10 +46,8 @@ void util_list_init_offset(struct util_list *list, unsigned long offset)
  */
 struct util_list *util_list_new_offset(unsigned long offset)
 {
-	struct util_list *list = malloc(sizeof(*list));
+	struct util_list *list = util_malloc(sizeof(*list));
 
-	if (!list)
-		return NULL;
 	util_list_init_offset(list, offset);
 	return list;
 }

libutil/util_path.c

@@ -194,3 +194,26 @@ free_str:
 	free(path);
 	return rc;
 }
+
+/**
+ * Test if path to directory or file exists
+ *
+ * This function has the same semantics as "-e path" in bash.
+ *
+ * @param[in] fmt   Format string for path to test
+ * @param[in] ...   Variable arguments for format string
+ *
+ * @returns   true  Path exists
+ *            false Otherwise
+ */
+bool util_path_exists(const char *fmt, ...)
+{
+	va_list ap;
+	char *path;
+	bool rc;
+
+	UTIL_VASPRINTF(&path, fmt, ap);
+	rc = access(path, F_OK) == 0 ? true : false;
+	free(path);
+	return rc;
+}

libutil/util_path_example.c

@@ -55,18 +55,22 @@ static void test_util_path_sysfs(void)
 static void  test_path(const char *path)
 {
 	printf("%-20s: ", path);
+	if (util_path_exists(path))
+		printf("exists=yes ");
+	else
+		printf("exists=no  ");
 	if (util_path_is_readable(path))
-		printf("read=yes, ");
+		printf("read=yes ");
 	else
-		printf("read=no , ");
+		printf("read=no  ");
 	if (util_path_is_writable(path))
-		printf("write=yes, ");
+		printf("write=yes ");
 	else
-		printf("write=no , ");
+		printf("write=no  ");
 	if (util_path_is_reg_file(path))
-		printf("reg_file=yes");
+		printf("reg_file=yes ");
 	else
-		printf("reg_file=no ");
+		printf("reg_file=no  ");
 	if (util_path_is_dir(path))
 		printf("dir=yes");
 	else

libvmcp/Makefile

@@ -0,0 +1,18 @@
+include ../common.mak
+
+lib = libvmcp.a
+
+examples = vmcp_example
+
+all: $(lib) $(examples)
+
+objects = vmcp.o
+
+$(lib): $(objects)
+
+install: all
+
+vmcp_example: vmcp_example.o $(lib) $(rootdir)/libutil/libutil.a
+
+clean:
+	rm -f *.o $(lib) $(examples)

libvmcp/vmcp.c

@@ -0,0 +1,134 @@
+/*
+ * vmcp - z/VM CP function library
+ *
+ * Copyright IBM Corp. 2018
+ *
+ * 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 <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/ioctl.h>
+
+#include "lib/util_libc.h"
+#include "lib/vmcp.h"
+
+#define	VMCP_DEVICE_NODE	"/dev/vmcp"
+#define	VMCP_GETSIZE		_IOR(0x10, 3, int)
+#define	VMCP_SETBUF		_IOW(0x10, 2, int)
+#define	VMCP_GETCODE		_IOR(0x10, 1, int)
+
+/*
+ * Read at most COUNT bytes from FD into memory at location BUF.
+ * Return number of bytes read on success, -1 on error.
+ */
+static ssize_t read_buffer(int fd, char *buf, ssize_t count)
+{
+	ssize_t ret, done;
+
+	for (done = 0; done < (ssize_t)count; done += ret) {
+		ret = read(fd, &buf[done], count - done);
+		if (ret == -1 && errno == EINTR)
+			continue;
+		if (ret == -1)
+			return -1;
+		if (ret == 0)
+			break;
+	}
+	return done;
+}
+
+/**
+ * Submit a command to z/VM CP and return the response, the size in bytes
+ * of the response and CP command response code.
+ *
+ * The member response contains the response from CP. It is a pointer
+ * to a malloc'ed buffer which must be freed by the caller when the return
+ * code is zero or VMCP_ERR_TOOSMALL.
+ *
+ * @param[in,out] cmd		Pointer to struct vmcp_parm.
+ * @param[in] cpcmd		Pointer to CP command string.
+ * @param[in] do_upper		If true convert cpcmd string to upper case.
+ * @param[out] cprc		Return code of the CP command.
+ * @param[out] response		Return buffer, has been allocated via malloc()
+ *				must be freed by caller, see below.
+ * @param[out] response_size	Size of the response in bytes, can be larger
+ *				than buffer_size.
+ *
+ * @returns	Zero on success or a negative error number on failure.
+ * @retval VMCP_SUCCESS		Success valid members: cprc, response,
+ *				response_size
+ * @retval VMCP_ERR_OPEN	Error opening VMCP device, valid members: none
+ * @retval VMCP_ERR_SETBUF	Error setting buffer, valid members: none
+ * @retval VMCP_ERR_GETCODE	Error getting cp exit code, valid members: none
+ * @retval VMCP_ERR_WRITE	Error write CP command, valid members: none
+ * @retval VMCP_ERR_GETSIZE	Error reading response size,
+ *				valid members: cprc
+ * @retval VMCP_ERR_READ	Error reading resp
+ * @retval VMCP_ERR_TOOSMALL	Error response buffer too small, response
+ *				truncated, valid members: cprc, response,
+ *				response_size
+ */
+int vmcp(struct vmcp_parm *cmd)
+{
+	int rc = VMCP_SUCCESS, fd, len;
+	char *cpcmd;
+
+	cmd->response = NULL;
+	cmd->response_size = 0;
+	cmd->cprc = 0;
+
+	fd = open(VMCP_DEVICE_NODE, O_RDWR);
+	if (fd == -1)
+		return VMCP_ERR_OPEN;
+
+	cpcmd = util_strdup(cmd->cpcmd);	/* Exits on failure */
+	if (cmd->do_upper)
+		util_str_toupper(cpcmd);
+
+	if (ioctl(fd, VMCP_SETBUF, &cmd->buffer_size) == -1) {
+		rc = VMCP_ERR_SETBUF;
+		goto fail;
+	}
+
+	if (write(fd, cpcmd, strlen(cpcmd)) == -1) {
+		rc = VMCP_ERR_WRITE;
+		goto fail;
+	}
+
+	if (ioctl(fd, VMCP_GETCODE, &cmd->cprc) == -1) {
+		rc = VMCP_ERR_GETCODE;
+		goto fail;
+	}
+
+	if (ioctl(fd, VMCP_GETSIZE, &cmd->response_size) == -1) {
+		rc = VMCP_ERR_GETSIZE;
+		goto fail;
+	}
+
+	if (cmd->response_size <= cmd->buffer_size) {
+		len = cmd->response_size;
+	} else {
+		len = cmd->buffer_size;
+		rc = VMCP_ERR_TOOSMALL;
+	}
+
+	/* Exits on failure */
+	cmd->response = (char *)util_zalloc(len + 1);
+
+	if (read_buffer(fd, cmd->response, len) == -1) {
+		rc = VMCP_ERR_READ;
+		free(cmd->response);
+		cmd->response = NULL;
+	}
+
+fail:
+	close(fd);
+	free(cpcmd);
+	return rc;
+}

libvmcp/vmcp_example.c

@@ -0,0 +1,65 @@
+/**
+ * vmcp_example - Example program for vmcp.c
+ *
+ * Copyright 2018 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.
+ */
+
+//! [code]
+#include <stdio.h>
+#include <stdlib.h>
+#include <err.h>
+
+#include "lib/vmcp.h"
+
+/*
+ * Demonstrate vmcp() function usage
+ */
+int main(void)
+{
+	struct vmcp_parm cp;
+	int rc;
+
+	cp.cpcmd = "q osa";
+	cp.buffer_size = VMCP_DEFAULT_BUFSZ;
+	cp.do_upper = true;
+
+	rc = vmcp(&cp);
+
+	switch (rc) {
+	case VMCP_SUCCESS:
+		printf("%s\n", cp.response);
+		free(cp.response);
+		break;
+	case VMCP_ERR_OPEN:
+		errx(EXIT_FAILURE, "Could not open device %s", VMCP_DEVICE_NODE);
+		break;
+	case VMCP_ERR_SETBUF:
+		errx(EXIT_FAILURE, "Could not set buffer size");
+		break;
+	case VMCP_ERR_GETCODE:
+		errx(EXIT_FAILURE, "Could not query return code");
+		break;
+	case VMCP_ERR_GETSIZE:
+		errx(EXIT_FAILURE, "Could not query response size");
+		break;
+	case VMCP_ERR_WRITE:
+		errx(EXIT_FAILURE, "Could not issue CP command");
+		break;
+	case VMCP_ERR_READ:
+		errx(EXIT_FAILURE, "Could not read CP response");
+		break;
+	case VMCP_ERR_TOOSMALL:
+		free(cp.response);
+		printf("Response truncated (requires %u bytes)\n",
+		       cp.response_size);
+		errx(EXIT_FAILURE, "Response buffer (%u bytes) too small",
+		     cp.buffer_size);
+		break;
+	}
+	return EXIT_SUCCESS;
+}
+
+//! [code]

libzds/libzds.c

@@ -13,16 +13,13 @@
  */
 
 #include <errno.h>
-#include <fcntl.h>
 #include <linux/types.h>
 #include <malloc.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <unistd.h>
 
+#include "lib/dasd_base.h"
 #include "lib/libzds.h"
 #include "lib/u2s.h"
 #include "lib/util_base.h"
@@ -31,13 +28,6 @@
 
 /** @cond PRIVATE */
 
-/******************************************************************************/
-/*     ioctl related definitions					      */
-/******************************************************************************/
-
-/* device size in bytes (u64 *arg) */
-#define BLKGETSIZE64 _IOR(0x12, 114, size_t)
-
 
 /******************************************************************************/
 /*     libzds structure definitions					      */
@@ -415,17 +405,7 @@ int lzds_zdsroot_alloc(struct zdsroot **root)
 	memset(tmproot, 0, sizeof(*tmproot));
 
 	tmproot->dasdlist = util_list_new(struct dasd, list);
-	if (!tmproot->dasdlist) {
-		free(tmproot);
-		return ENOMEM;
-	}
-
 	tmproot->datasetlist = util_list_new(struct dataset, list);
-	if (!tmproot->dasdlist) {
-		util_list_free(tmproot->dasdlist);
-		free(tmproot);
-		return ENOMEM;
-	}
 
 	*root = tmproot;
 
@@ -480,18 +460,11 @@ void lzds_zdsroot_free(struct zdsroot *root)
  */
 static int dasd_read_geometry(struct dasd *dasd)
 {
-	int fd;
 	unsigned long long size_in_bytes;
 
 	errorlog_clear(dasd->log);
-	fd = open(dasd->device, O_RDONLY);
-	if (fd < 0)
-		return errorlog_add_message(
-			&dasd->log, NULL, EIO,
-			"read geometry: could not open device %s\n",
-			dasd->device);
 
-	if (ioctl(fd, BLKGETSIZE64, &size_in_bytes) != 0)
+	if (dasd_get_blocksize_in_bytes(dasd->device, &size_in_bytes) != 0)
 		return errorlog_add_message(
 			&dasd->log, NULL, EIO,
 			"read geometry: could not get size from device %s\n",
@@ -505,7 +478,6 @@ static int dasd_read_geometry(struct dasd *dasd)
 	dasd->label_block = 2;
 	dasd->heads = 15;
 	dasd->cylinders = (size_in_bytes / (dasd->heads * RAWTRACKSIZE));
-	close(fd);
 	return 0;
 }
 
@@ -822,10 +794,6 @@ static int errorlog_alloc(struct errorlog **log)
 		return ENOMEM;
 	memset(tmplog, 0, sizeof(*tmplog));
 	tmplog->entries = util_list_new(struct errormsg, list);
-	if (!tmplog->entries) {
-		free(tmplog);
-		return ENOMEM;
-	}
 	*log = tmplog;
 	return 0;
 }
@@ -2203,8 +2171,6 @@ static int dataset_member_analysis(struct dataset *ds)
 
 	dataset_free_memberlist(ds);
 	ds->memberlist = util_list_new(struct pdsmember, list);
-	if (!ds->memberlist)
-		return ENOMEM;
 
 	/* track buffer must be page aligned for O_DIRECT */
 	trackdata = memalign(4096, RAWTRACKSIZE);

mon_tools/mon_fsstatd.c

@@ -90,17 +90,18 @@ static void fsstatd_open_monwriter(void)
 /*
  * Store daemon's pid so it can be stopped
  */
-static void store_pid(void)
+static int store_pid(void)
 {
 	FILE *f = fopen(pid_file, "w");
 
 	if (!f) {
 		syslog(LOG_ERR, "cannot open pid file %s: %s", pid_file,
 		       strerror(errno));
-		exit(1);
+		return -1;
 	}
 	fprintf(f, "%d\n", getpid());
 	fclose(f);
+	return 0;
 }
 
 /*
@@ -244,41 +245,64 @@ static void fsstatd_write_ent(struct mntent *ent, time_t curr_time,
  */
 static void fsstatd_daemonize(void)
 {
+	int pipe_fds[2], startup_rc = 1;
 	pid_t pid;
 
+	if (pipe(pipe_fds) == -1) {
+		syslog(LOG_ERR, "pipe error: %s\n", strerror(errno));
+		exit(1);
+	}
+
 	/* Fork off the parent process */
 	pid = fork();
 	if (pid < 0) {
 		syslog(LOG_ERR, "fork error: %s\n", strerror(errno));
 		exit(1);
 	}
-	if (pid > 0)
-		exit(0);
+	if (pid > 0) {
+		/* Wait for startup return code from daemon */
+		if (read(pipe_fds[0], &startup_rc, sizeof(startup_rc)) == -1)
+			syslog(LOG_ERR, "pipe read error: %s\n", strerror(errno));
+		/* With startup_rc == 0, pid file was written at this point */
+		exit(startup_rc);
+	}
 
 	/* Change the file mode mask */
 	umask(0);
 
-	/* Store daemon pid */
-	store_pid();
 	/* Catch SIGINT and SIGTERM to clean up pid file on exit */
 	fsstatd_handle_signals();
 
 	/* Create a new SID for the child process */
 	if (setsid() < 0) {
 		syslog(LOG_ERR, "setsid error: %s\n",  strerror(errno));
-		exit(1);
+		goto notify_parent;
 	}
 
 	/* Change the current working directory */
 	if (chdir("/") < 0) {
 		syslog(LOG_ERR, "chdir error: %s\n",  strerror(errno));
-		exit(1);
+		goto notify_parent;
 	}
 
 	/* Close out the standard file descriptors */
 	close(STDIN_FILENO);
 	close(STDOUT_FILENO);
 	close(STDERR_FILENO);
+
+	/* Store daemon pid */
+	if (store_pid() < 0)
+		goto notify_parent;
+	startup_rc = 0;
+
+notify_parent:
+	/* Inform waiting parent about startup return code */
+	if (write(pipe_fds[1], &startup_rc, sizeof(startup_rc)) == -1) {
+		syslog(LOG_ERR, "pipe write error: %s\n", strerror(errno));
+		exit(1);
+	}
+	if (startup_rc != 0)
+		exit(startup_rc);
 }
 
 static int fsstatd_do_work(void)

mon_tools/mon_procd.c

@@ -109,17 +109,18 @@ static void procd_open_monwriter(void)
 /*
  * Store daemon's pid so it can be stopped
  */
-static void store_pid(void)
+static int store_pid(void)
 {
 	FILE *f = fopen(pid_file, "w");
 
 	if (!f) {
 		syslog(LOG_ERR, "cannot open pid file %s: %s", pid_file,
 		       strerror(errno));
-		exit(1);
+		return -1;
 	}
 	fprintf(f, "%d\n", getpid());
 	fclose(f);
+	return 0;
 }
 
 /*
@@ -593,17 +594,18 @@ static void cal_task_pcpu(struct task_t *task, const unsigned long long tics)
 */
 static int read_stat(struct task_t *task)
 {
-	int ppid, tty, proc;
-	unsigned long flags, pri, nice;
-	unsigned long long maj_flt, utime, stime, cutime, cstime;
+	unsigned long long maj_flt = 0, utime = 0, stime = 0, cutime = 0,
+			   cstime = 0;
+	unsigned long flags = 0, pri = 0, nice = 0;
 	char *cmd_start, *cmd_end, *cmdlenp, *cmdp;
+	int ppid = 0, tty = 0, proc = 0, rc;
 
 	snprintf(fname, sizeof(fname), "/proc/%u/stat", task->pid);
 	if (read_file(fname, buf, sizeof(buf) - 1) == -1)
 		return 0;
 
 	cmd_start = strchr(buf, '(') + 1;
-	cmd_end = strchr(cmd_start, ')');
+	cmd_end = strrchr(cmd_start, ')');
 	name_lens.cmd_len = cmd_end - cmd_start;
 	cmdlenp = mon_record + sizeof(struct monwrite_hdr);
 	cmdlenp += sizeof(struct procd_hdr);
@@ -624,7 +626,7 @@ static int read_stat(struct task_t *task)
 	memcpy(cmdlenp, &name_lens.cmd_len, sizeof(__u16));
 
 	cmd_end += 2;
-	sscanf(cmd_end,
+	rc = sscanf(cmd_end,
 		"%c %d %*d %*d %d %*d "
 		"%lu %*s %*s %Lu %*s "
 		"%Lu %Lu %Lu %Lu "
@@ -641,6 +643,8 @@ static int read_stat(struct task_t *task)
 		&utime, &stime, &cutime, &cstime,
 		&pri, &nice,
 		&proc);
+	if (rc != 12)
+		syslog(LOG_ERR, "bad data in %s \n", fname);
 	task->ppid = (__u32)ppid;
 	task->tty = (__u16)tty;
 	task->flags = (__u32)flags;
@@ -897,41 +901,64 @@ static void read_tasks(void)
  */
 static void procd_daemonize(void)
 {
+	int pipe_fds[2], startup_rc = 1;
 	pid_t pid;
 
+	if (pipe(pipe_fds) == -1) {
+		syslog(LOG_ERR, "pipe error: %s\n", strerror(errno));
+		exit(1);
+	}
+
 	/* Fork off the parent process */
 	pid = fork();
 	if (pid < 0) {
 		syslog(LOG_ERR, "fork error: %s\n", strerror(errno));
 		exit(1);
 	}
-	if (pid > 0)
-		exit(0);
+	if (pid > 0) {
+		/* Wait for startup return code from daemon */
+		if (read(pipe_fds[0], &startup_rc, sizeof(startup_rc)) == -1)
+			syslog(LOG_ERR, "pipe read error: %s\n", strerror(errno));
+		/* With startup_rc == 0, pid file was written at this point */
+		exit(startup_rc);
+	}
 
 	/* Change the file mode mask */
 	umask(0);
 
-	/* Store daemon pid */
-	store_pid();
 	/* Catch SIGINT and SIGTERM to clean up pid file on exit */
 	procd_handle_signals();
 
 	/* Create a new SID for the child process */
 	if (setsid() < 0) {
 		syslog(LOG_ERR, "setsid error: %s\n",  strerror(errno));
-		exit(1);
+		goto notify_parent;
 	}
 
 	/* Change the current working directory */
 	if (chdir("/") < 0) {
 		syslog(LOG_ERR, "chdir error: %s\n",  strerror(errno));
-		exit(1);
+		goto notify_parent;
 	}
 
 	/* Close out the standard file descriptors */
 	close(STDIN_FILENO);
 	close(STDOUT_FILENO);
 	close(STDERR_FILENO);
+
+	/* Store daemon pid */
+	if (store_pid() < 0)
+		goto notify_parent;
+	startup_rc = 0;
+
+notify_parent:
+	/* Inform waiting parent about startup return code */
+	if (write(pipe_fds[1], &startup_rc, sizeof(startup_rc)) == -1) {
+		syslog(LOG_ERR, "pipe write error: %s\n", strerror(errno));
+		exit(1);
+	}
+	if (startup_rc != 0)
+		exit(startup_rc);
 }
 
 static int procd_do_work(void)

netboot/mk-pxelinux-ramfs

@@ -134,8 +134,8 @@ echo "$cmd: Copying virtio modules"
 mkdir -p $builddir/$netdir
 mkdir -p $builddir/$blkdir
 set +e
-cp $netdir/virtio_net.ko $builddir/$netdir 2> /dev/null
-cp $blkdir/virtio_blk.ko $builddir/$blkdir 2> /dev/null
+cp $netdir/virtio_net.ko* $builddir/$netdir 2> /dev/null
+cp $blkdir/virtio_blk.ko* $builddir/$blkdir 2> /dev/null
 set -e
 
 # Busybox (+ dependencies)
@@ -170,13 +170,9 @@ cat <<'EOF' > $builddir/init
 /bin/mount -t tmpfs none /run
 
 /sbin/modprobe virtio_net
-/sbin/udhcpc -O pxeconffile -O pxepathprefix &
+/sbin/udhcpc -O pxeconffile -O pxepathprefix -x 93:001F &
 
-while true
-do
-	/sbin/pxeboot.script
-	/bin/sleep 1
-done
+/sbin/pxeboot.script
 EOF
 # --- end init script
 chmod +x $builddir/init
@@ -241,6 +237,7 @@ case "$1" in
 	echo " router: $router"
 	echo " domain: $domain $dns"
 	echo " tftp: $siaddr"
+	echo " pxepathprefix: $pxepathprefix"
 	# flush routes
 	/sbin/ip route flush table all
 	# setup if link
@@ -276,6 +273,7 @@ case "$1" in
 	    echo "siaddr=$siaddr" > $PXECONF
 	    echo "interface=$interface" >> $PXECONF
 	    echo "ip=$ip" >> $PXECONF
+	    echo "pxepathprefix=$pxepathprefix" >> $PXECONF
 	fi
 	;;
 
@@ -303,16 +301,26 @@ cat <<'EOF' > $builddir/sbin/pxeboot.script
 
 set -e
 
+# Check if a valid pxe conf is available
+# so far a non configurable 600 sec timeout
+PXE_CONF=/etc/pxe.conf
+TIMEOUT=600
+WAITED=0
+echo "waiting for pxe config from DHCP (max $TIMEOUT sec)"
+while [ ! -f $PXE_CONF ]
+do
+    sleep 1
+    WAITED=$(($WAITED + 1))
+    if [ $WAITED -gt $TIMEOUT ]
+    then
+        echo Error waiting for PXE configuration from DHCP
+        exit
+    fi
+done
+
 # Source the DHCP-generated TFTP info
 # Currently we are just looking for siaddr
-PXE_CONF=/etc/pxe.conf
-if [ -f  $PXE_CONF ]
-then
-    . $PXE_CONF
-else
-    echo waiting for PXE configuration
-    exit
-fi
+. $PXE_CONF
 
 # Retrieve the config (default only for now)
 CONFIGS=""
@@ -347,7 +355,8 @@ then
     set +e
     for c in $CONFIGS
     do
-	if /usr/bin/tftp -g -l /tmp/config -r pxelinux.cfg/$c $siaddr
+	echo "fetching config pxelinux.cfg/$c from $siaddr"
+	if /usr/bin/tftp -g -l /tmp/config -r ${pxepathprefix}pxelinux.cfg/$c $siaddr
 	then
 	    break
 	fi
@@ -361,34 +370,39 @@ then
 fi
 
 # Simple config file parsing, only one entry allowed
-kernel=$(/bin/grep "^[[:space:]]*kernel" /tmp/config | sed "s/^[[:space:]]*kernel[[:space:]]*//")
-initrd=$(/bin/grep "^[[:space:]]*initrd" /tmp/config | sed "s/^[[:space:]]*initrd[[:space:]]*//")
-append=$(/bin/grep "^[[:space:]]*append" /tmp/config | sed "s/^[[:space:]]*append[[:space:]]*//")
+kernel=$(/bin/grep -i "^[[:space:]]*kernel" /tmp/config | sed "s/^[[:space:]]*kernel[[:space:]]*//I")
+initrd=$(/bin/grep -i "^[[:space:]]*initrd" /tmp/config | sed "s/^[[:space:]]*initrd[[:space:]]*//I")
+append=$(/bin/grep -i "^[[:space:]]*append" /tmp/config | sed "s/^[[:space:]]*append[[:space:]]*//I")
+ipappend=$(/bin/grep -i "^[[:space:]]*ipappend" /tmp/config | sed "s/^[[:space:]]*ipappend[[:space:]]*//I")
 
 if [ -z "$kernel" ]
 then
     echo no kernel statement found in config
     exit
 else
-    /usr/bin/tftp -g -l /tmp/kernel -r $kernel $siaddr
+    echo fetch kernel $kernel from $siaddr
+    /usr/bin/tftp -g -l /tmp/kernel -r $pxepathprefix$kernel $siaddr
 fi
 
 if [ -n "$initrd" ]
 then
-    /usr/bin/tftp -g -l /tmp/initrd -r $initrd $siaddr
+    echo fetch initrd $initrd from $siaddr
+    /usr/bin/tftp -g -l /tmp/initrd -r $pxepathprefix$initrd $siaddr
     INITRD="--initrd=/tmp/initrd"
 else
     INITRD=""
 fi
 
-if [ -n "$append" ]
-then
-    APPEND="--append=$append"
+if [ -z "$append" ]; then
+    echo "Kexec load: kexec -l /tmp/kernel $INITRD"
+    kexec -l /tmp/kernel $INITRD
 else
-    APPEND=""
+    if [ "$ipappend" = "2" ]; then
+       $append="$append BOOTIF=01-$ifaddr"
+    fi
+    echo "Kexec load: kexec -l /tmp/kernel $INITRD --append=\"$append\""
+    kexec -l /tmp/kernel $INITRD --append="$append"
 fi
-
-kexec -l /tmp/kernel $INITRD $APPEND
 kexec -e
 EOF
 # -- end pxeboot script

osasnmpd/Makefile

@@ -1,6 +1,9 @@
 include ../common.mak
 LDLIBS = `net-snmp-config --agent-libs`
-CFLAGS += `net-snmp-config --cflags`
+# On some Linux systems `net-snmp-config --agent-libs` introduces -pie,
+# therefore add -fPIC to prevent link failures.
+ALL_CFLAGS += -fPIC
+ALL_CFLAGS += `net-snmp-config --cflags`
 
 OBJS = ibmOSAMib.o ibmOSAMibUtil.o osasnmpd.o
 

qethconf/Makefile

@@ -3,7 +3,7 @@ include ../common.mak
 all:
 
 install: qethconf
-	$(SED) -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
+	$(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
 	< qethconf >$(DESTDIR)$(BINDIR)/qethconf; \
 	chown $(OWNER).$(GROUP) $(DESTDIR)$(BINDIR)/qethconf; \
 	chmod 755 $(DESTDIR)$(BINDIR)/qethconf; \

scripts/Makefile

@@ -1,7 +1,7 @@
 include ../common.mak
 
-SCRIPTS	= dbginfo.sh zfcpdbf scsi_logging_level
-MAN_PAGES = dbginfo.sh.1 zfcpdbf.1
+SCRIPTS	= dbginfo.sh zfcpdbf zipl-switch-to-blscfg scsi_logging_level
+MAN_PAGES = dbginfo.sh.1 zfcpdbf.1 zipl-switch-to-blscfg.1
 
 all:
 
@@ -10,13 +10,13 @@ install:
 	@for i in $(SCRIPTS); \
 	do \
 		cat $$i | \
-		sed -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
+		sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
 		>$(DESTDIR)$(BINDIR)/$$i; \
 		chown $(OWNER):$(GROUP) $(DESTDIR)$(BINDIR)/$$i; \
 		chmod 755 $(DESTDIR)$(BINDIR)/$$i; \
 	done
 
-	sed -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' cpictl > \
+	sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' cpictl > \
 		$(DESTDIR)$(TOOLS_LIBDIR)/cpictl
 	chown $(OWNER):$(GROUP) $(DESTDIR)$(TOOLS_LIBDIR)/cpictl
 	chmod 775 $(DESTDIR)$(TOOLS_LIBDIR)/cpictl

scripts/dbginfo.sh

@@ -2,7 +2,7 @@
 #
 # dbginfo.sh - Tool to collect runtime, configuration, and trace information
 #
-# Copyright IBM Corp. 2002, 2017
+# Copyright IBM Corp. 2002, 2018
 #
 # s390-tools is free software; you can redistribute it and/or modify
 # it under the terms of the MIT license. See LICENSE for details.
@@ -21,7 +21,7 @@ readonly SCRIPTNAME="${0##*/}"
 print_version() {
     cat <<EOF
 ${SCRIPTNAME}: Debug information script version %S390_TOOLS_VERSION%
-Copyright IBM Corp. 2002, 2017
+Copyright IBM Corp. 2002, 2018
 EOF
 }
 
@@ -182,11 +182,14 @@ readonly OUTPUT_FILE_XML="${WORKPATH}domain_xml"
 # File that includes the docker inspect output
 readonly OUTPUT_FILE_DOCKER="${WORKPATH}docker_inspect.out"
 
+# File that includes nvme related information
+readonly OUTPUT_FILE_NVME="${WORKPATH}nvme.out"
+
 # Mount point of the debug file system
 readonly MOUNT_POINT_DEBUGFS="/sys/kernel/debug"
 
 # The amount of steps running the whole collections
-readonly COLLECTION_COUNT=11
+readonly COLLECTION_COUNT=12
 
 # The kernel version (e.g. '2' from 2.6.32 or '3' from 3.2.1)
 readonly KERNEL_VERSION=$(uname -r 2>/dev/null | cut -d'.' -f1)
@@ -375,7 +378,8 @@ CMDS="uname -a\
   :runlevel\
   :iptables -L\
   :ulimit -a\
-  :ps -eo pid,tid,nlwp,policy,user,tname,ni,pri,psr,sgi_p,stat,wchan,start_time,time,pcpu,pmem,vsize,size,rss,share,command\
+  :ps -emo pid,tid,nlwp,policy,user,tname,ni,pri,psr,sgi_p,stat,wchan,start_time,time,pcpu,pmem,vsize,size,rss,share,command\
+  :ps -eHo pid,tid,nlwp,policy,user,tname,ni,pri,psr,sgi_p,stat,wchan,start_time,time,pcpu,pmem,vsize,size,rss,share,command\
   :ps axX\
   :dmesg -s 1048576\
   :last\
@@ -470,10 +474,13 @@ VM_CMDS="q userid\
   :q privclass\
   :q cplevel\
   :q cpservice\
+  :q cpprot user\
+  :q specex\
   :q ssi\
   :q cpus\
   :q srm\
   :q vtod\
+  :q time full\
   :q timezone\
   :q loaddev\
   :q v osa\
@@ -508,6 +515,7 @@ VM_CMDS="q userid\
   :q cache\
   :q nic\
   :q pav\
+  :q proc\
   :q proc topology\
   :q mt\
   :q qioass\
@@ -824,6 +832,25 @@ collect_docker() {
     pr_log_stdout " "
 }
 
+########################################
+collect_nvme() {
+    local NVME
+
+    pr_syslog_stdout "11 of ${COLLECTION_COUNT}: Collecting nvme output"
+    call_run_command "nvme list" "${OUTPUT_FILE_NVME}"
+
+    for NVME in /dev/nvme[0-9]*; do
+	if [ -c $NVME ]; then
+	    call_run_command "smartctl -x $NVME" "${OUTPUT_FILE_NVME}"
+	    call_run_command "nvme fw-log $NVME" "${OUTPUT_FILE_NVME}"
+	    call_run_command "nvme smart-log $NVME" "${OUTPUT_FILE_NVME}"
+	    call_run_command "nvme error-log $NVME" "${OUTPUT_FILE_NVME}"
+	fi
+    done
+
+    pr_log_stdout " "
+}
+
 ########################################
 post_processing() {
     local file_mtime
@@ -831,7 +858,7 @@ post_processing() {
     local tmp_file
     local file_name
 
-    pr_syslog_stdout "11 of ${COLLECTION_COUNT}: Postprocessing"
+    pr_syslog_stdout "${COLLECTION_COUNT} of ${COLLECTION_COUNT}: Postprocessing"
 
     find "${WORKPATH}etc/libvirt/qemu/" -maxdepth 1 -name "*.xml" 2>/dev/null | while IFS= read -r file_name; do
 	file_mtime_epoche=$(stat --format=%Y "${file_name}")
@@ -990,25 +1017,31 @@ environment_setup()
 # create gzip-ped tar file
 create_package()
 {
+    local rc_tar
     pr_stdout "Finalizing: Creating archive with collected data"
     cd "${WORKDIR_BASE}"
 
-    if ! tar -czf "${WORKARCHIVE}" "${WORKDIR_CURRENT}"; then
-	pr_stdout " "
-	pr_stdout "${SCRIPTNAME}: Error: Collection of data failed!"
-	pr_stdout "       The creation of \"${WORKARCHIVE}\" was not successful."
-	pr_stdout "       Please check the directory \"${WORKDIR_BASE}\""
-	pr_stdout "       to provide enough free available space."
+    tar -czf "${WORKARCHIVE}" "${WORKDIR_CURRENT}"
+    rc_tar=$?
+    if [ $rc_tar -eq 0 ]; then
+        chmod 0600 "${WORKARCHIVE}"
+        pr_stdout " "
+        pr_stdout "Collected data was saved to:"
+        pr_stdout " >>  ${WORKARCHIVE}  <<"
+        pr_stdout " "
+        pr_stdout "Review the collected data before sending to your service organization. "
+        pr_stdout " "
+    elif [ $rc_tar -eq 127 ]; then
+        pr_stdout " "
+        pr_stdout "${SCRIPTNAME}: Error: tar command is not available!"
+        pr_stdout "     Please install the corresponding package!"
     else
-	chmod 0600 "${WORKARCHIVE}"
-	pr_stdout " "
-	pr_stdout "Collected data was saved to:"
-	pr_stdout " >>  ${WORKARCHIVE}  <<"
+        pr_stdout " "
+        pr_stdout "${SCRIPTNAME}: Error: Collection of data failed!"
+        pr_stdout "       The creation of \"${WORKARCHIVE}\" was not successful."
+        pr_stdout "       Please check the directory \"${WORKDIR_BASE}\""
+        pr_stdout "       to provide enough free available space."
     fi
-
-    pr_stdout " "
-    pr_stdout "Review the collected data before sending to your service organization. "
-    pr_stdout " "
 }
 
 
@@ -1116,6 +1149,8 @@ collect_domain_xml
 
 collect_docker
 
+collect_nvme
+
 post_processing
 
 create_package

scripts/zipl-switch-to-blscfg

@@ -0,0 +1,213 @@
+#!/bin/bash
+#
+# zipl-switch-to-blscfg - Switch zipl to use BootLoaderSpec configuration
+#
+# Copyright 2018 Red Hat, Inc.
+#
+# s390-tools is free software; you can redistribute it and/or modify
+# it under the terms of the MIT license. See LICENSE for details.
+#
+
+readonly SCRIPTNAME="${0##*/}"
+
+declare -A zipl_to_bls
+zipl_to_bls["image"]="linux"
+zipl_to_bls["ramdisk"]="initrd"
+zipl_to_bls["parameters"]="options"
+
+print_error() {
+    echo "$1" >&2
+    exit 1
+}
+
+function on_exit() {
+    if ! rm -rf $TMP; then
+        echo "Delete temporary files failed!" >&2
+        exit 1
+    fi
+}
+
+if ! TMP="$(mktemp -d)"; then
+    print_error "Creating a temporary dir for config files failed!"
+fi
+
+trap 'on_exit' EXIT
+
+print_version() {
+    cat <<EOF
+${SCRIPTNAME}: version %S390_TOOLS_VERSION%
+Copyright Red Hat, Inc. 2018
+EOF
+}
+
+print_usage()
+{
+    print_version
+
+    cat <<EOF
+
+Usage: ${SCRIPTNAME} [OPTIONS]
+
+Switches the zipl boot-loader configuration to use BootLoaderSpec files.
+
+Options:
+
+	-h, --help		print this help and exit
+	-v, --version      	print version information and exit
+	--backup-suffix=SUFFIX  suffix used for backup files, defaults to .bak
+	--bls-directory=DIR     path to generate BLS files, defaults to /boot/loader/entries
+	--config-file=FILE      path to zipl configuration file, defaults to /etc/zipl.conf
+	--ignore-default	ignore the default option from the zipl configuration file
+	--use-version-name	use the section kernel version as the BLS file name
+
+EOF
+}
+
+OPTS="$(getopt -o hv --long help,version,backup-suffix:,bls-directory:,config-file:,\
+ignore-default,use-version-name -n \'$SCRIPTNAME\' -- "$@")"
+eval set -- "$OPTS"
+
+BACKUP_SUFFIX=.bak
+BLS_DIR="/boot/loader/entries"
+CMDLINE_LINUX_DEBUG=" systemd.log_level=debug systemd.log_target=kmsg"
+LINUX_DEBUG_VERSION_POSTFIX="_with_debugging"
+LINUX_DEBUG_TITLE_POSTFIX=" with debugging"
+CONFIG="/etc/zipl.conf"
+
+while [ ${#} -gt 0 ]; do
+    case "$1" in
+	--help|-h)
+	    print_usage
+	    exit 0
+	    ;;
+	--version|-v)
+	    print_version
+	    exit 0
+	    ;;
+	--backup-suffix)
+	    BACKUP_SUFFIX=${2}
+	    shift
+	    ;;
+	--bls-directory)
+	    BLS_DIR=${2}
+	    shift
+	    ;;
+	--config-file)
+	    CONFIG=${2}
+	    shift
+	    ;;
+	--ignore-default)
+	    ignore_default=true
+	    ;;
+	--use-version-name)
+	    version_name=true
+	    ;;
+	--)
+	    shift
+	    break
+	    ;;
+	*)
+	    echo >&2
+	    echo "${SCRIPTNAME}: invalid option \"${1}\"" >&2
+	    echo "Try '${SCRIPTNAME} --help' for more information" >&2
+	    echo >&2
+	    exit 1
+	    ;;
+    esac
+    shift
+done
+
+TMP_CONFIG="${TMP}/${CONFIG##*/}"
+
+[[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR"
+
+if [ -f /etc/machine-id ]; then
+    read MACHINE_ID < /etc/machine-id
+    MACHINE_ID=${MACHINE_ID}-
+fi
+
+count=0
+OUTPUT=""
+TARGET=""
+while IFS='= ' read key val; do
+    # for BLS the default kernel is always the latest one
+    if [[ $key == \#* ]] || [[ $key == "default" && $ignore_default == true ]]; then
+        continue
+    fi
+
+    # remove spaces
+    key="$(echo $key | sed -e 's/^[ \t"]*//;s/[ \t"]*$//')"
+
+    if [[ $key = \[*] ]]; then
+        if [[ $key == "[defaultboot]" ]]; then
+            OUTPUT=${TMP_CONFIG}
+            echo $key >> ${OUTPUT}
+        else
+            key="${key%\]}"
+            key="${key#\[}"
+            section=$key
+            OUTPUT=${BLS_DIR}/${MACHINE_ID}${section}.conf
+            if [ -f "${OUTPUT}" ]; then
+                print_error "BLS file ${OUTPUT} already exists"
+            fi
+        fi
+    elif [[ $val ]]; then
+        val="$(echo $val | sed -e 's/^[ \t"]*//;s/[ \t"]*$//')"
+        if [[ $key == "target" ]]; then
+            if [ -z ${TARGET} ]; then
+                echo $key=$val >> ${TMP_CONFIG}
+                TARGET=$val
+            else if [ "${TARGET}" != "${val}" ]; then
+                     print_error "BLS is only supported if all sections have the same target"
+                 fi
+            fi
+        else
+            if [ -n "${zipl_to_bls[$key]}" ]; then
+		if [[ $key = "image" && $version_name == true ]]; then
+                    if [[ $val = *"vmlinuz-"* ]]; then
+                        version="${val##*/vmlinuz-}"
+                    else
+                        version="${val##*/}"
+                    fi
+                    echo "version $version" >> ${OUTPUT}
+                    if [[ $version = *"rescue"* ]]; then
+                        FILENAME=${BLS_DIR}/${MACHINE_ID}0-rescue.conf
+                    else
+                        FILENAME=${BLS_DIR}/${MACHINE_ID}${version}.conf
+                    fi
+
+                    if [[ ${OUTPUT} != ${FILENAME} ]]; then
+			if [ -f "${FILENAME}" ]; then
+			    print_error "BLS file ${FILENAME} already exists"
+			fi
+                        mv ${OUTPUT} ${FILENAME}
+                        if [ ! $? -eq 0 ]; then
+                            print_error "Creating BLS file ${FILENAME} failed"
+                        fi
+                        OUTPUT=${FILENAME}
+                    fi
+		elif [[ $key = "image" ]]; then
+                    echo "version $section" >> ${OUTPUT}
+		fi
+
+                echo "${zipl_to_bls[$key]} ${val}" >> ${OUTPUT}
+            else
+                echo $key=$val >> ${TMP_CONFIG}
+            fi
+        fi
+    fi
+done < "${CONFIG}"
+
+if [ -f "${CONFIG}${BACKUP_SUFFIX}" ]; then
+    print_error "Backup file ${CONFIG}${BACKUP_SUFFIX} already exists"
+fi
+
+cp -af "${CONFIG}" "${CONFIG}${BACKUP_SUFFIX}"
+mv "${TMP_CONFIG}" "${CONFIG}"
+
+zipl > /dev/null
+if [ ! $? -eq 0 ]; then
+    mv "${CONFIG}${BACKUP_SUFFIX}" "${CONFIG}"
+fi
+
+exit 0

scripts/zipl-switch-to-blscfg.1

@@ -0,0 +1,45 @@
+.TH ZIPL-SWITCH-TO-BLSCFG  1 "April 2018" "s390-tools"
+
+.SH NAME
+zipl-switch-to-blscfg \- Switch zipl to use BootLoaderSpec configuration
+
+.SH SYNOPSIS
+.br
+\fBzipl-switch-to-blscfg\fP [OPTIONS]
+.br
+\fBzipl-switch-to-blscfg\fP {\-h|\-v}
+
+.SH DESCRIPTION
+This script switches the zipl boot-loader configuration to use BootLoaderSpec files
+to define IPL sections. For each Linux kernel defined in the zipl.conf config file,
+a BLS fragment is generated in the BLS directory specified. Also, the zipl.conf is
+modified it only contains global configurations, all IPL sections comes from BLS.
+
+.SH OPTIONS
+.TP
+\fB\-h\fP, \fB\-\-help\fP
+Print this help and exit
+
+.TP
+\fB\-v\fP, \fB\-\-version\fP
+Print version information and exit
+
+.TP
+\fB\-\-backup-suffix <SUFFIX>\fP
+The suffix used for backup files, defaults to .bak.
+
+.TP
+\fB\-\-bls-directory <DIRECTORY>\fP
+The DIRECTORY where the BLS fragments will be generated. The directory is created if it doesn't exists, by default /boot/loader/entries is used.
+
+.TP
+\fB\-\-config-file <FILE>\fP
+The FILE used for zipl configuration file, defaults to /etc/zipl.conf.
+
+.TP
+\fB\-\-ignore-default\fP
+Ignore the default option from the zipl configuration file
+
+.TP
+\fB\-\-use-version-name\fP
+Use the section kernel version as the BLS file name

systemd/Makefile

@@ -35,10 +35,12 @@ clean:
 	real_usrbin_dir=$(USRBINDIR); \
 	real_usrsbin_dir=$(USRSBINDIR); \
 	real_toolslib_dir=$(TOOLS_LIBDIR); \
+	real_sysconf_dir=$(SYSCONFDIR); \
 	$(SED) -e "s#@bin_path@#$$real_bin_dir#g" \
 	       -e "s#@usrbin_path@#$$real_usrbin_dir#g" \
 	       -e "s#@usrsbin_path@#$$real_usrsbin_dir#g" \
 	       -e "s#@toolslib_path@#$$real_toolslib_dir#g" \
+	       -e "s#@sysconf_path@#$$real_sysconf_dir#g" \
 	       -e 's#@S390_TOOLS_RELEASE@#$(S390_TOOLS_RELEASE)#g' \
 	< $< > $@
 

systemd/cpi.service.in

@@ -19,7 +19,7 @@ Type=oneshot
 # Specify a file with the environment variables using the EnvironmentFile=
 # service property.
 #
-EnvironmentFile=/etc/sysconfig/cpi
+EnvironmentFile=@sysconf_path@/sysconfig/cpi
 #
 # Alternatively, you can specify the environment variables directly,
 # using the Environment= service properties, which can be overridden by
@@ -38,3 +38,6 @@ EnvironmentFile=/etc/sysconfig/cpi
 #
 # Sending data to the HMC/SE
 ExecStart=@toolslib_path@/cpictl -e
+
+[Install]
+WantedBy=multi-user.target

systemd/cpuplugd.service.in

@@ -13,10 +13,11 @@ Documentation=man:cpuplugd(8) man:cpuplugd.conf(5)
 After=remote-fs.target
 
 [Service]
-ExecStart=@usrsbin_path@/cpuplugd -f -c /etc/cpuplugd.conf
+ExecStart=@usrsbin_path@/cpuplugd -c @sysconf_path@/cpuplugd.conf
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
-Type=simple
+Type=forking
+PIDFile=/var/run/cpuplugd.pid
 
 [Install]
 WantedBy=multi-user.target

systemd/mon_fsstatd.service.in

@@ -18,7 +18,7 @@ After=remote-fs.target
 # Specify a file with the environment variables using the EnvironmentFile=
 # service property.
 #
-EnvironmentFile=/etc/sysconfig/mon_fsstatd
+EnvironmentFile=@sysconf_path@/sysconfig/mon_fsstatd
 #
 # Alternatively, you can specify the environment variables directly,
 # using the Environment= service property, which can be overridden by
@@ -30,10 +30,11 @@ EnvironmentFile=/etc/sysconfig/mon_fsstatd
 
 ExecStartPre=-/sbin/modprobe monwriter
 ExecStartPre=/sbin/udevadm settle --timeout=10
-ExecStart=@usrsbin_path@/mon_fsstatd -a -i $FSSTAT_INTERVAL
+ExecStart=@usrsbin_path@/mon_fsstatd -i $FSSTAT_INTERVAL
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
-Type=simple
+Type=forking
+PIDFile=/var/run/mon_fsstatd.pid
 
 [Install]
 WantedBy=multi-user.target

systemd/mon_procd.service.in

@@ -18,7 +18,7 @@ After=remote-fs.target
 # Specify a file with the environment variables using the EnvironmentFile=
 # service property.
 #
-EnvironmentFile=/etc/sysconfig/mon_procd
+EnvironmentFile=@sysconf_path@/sysconfig/mon_procd
 #
 # Alternatively, you can specify the environment variables directly,
 # using the Environment= service property, which can be overridden by
@@ -30,10 +30,11 @@ EnvironmentFile=/etc/sysconfig/mon_procd
 
 ExecStartPre=-/sbin/modprobe monwriter
 ExecStartPre=/sbin/udevadm settle --timeout=10
-ExecStart=@usrsbin_path@/mon_procd -a -i $PROC_INTERVAL
+ExecStart=@usrsbin_path@/mon_procd -i $PROC_INTERVAL
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
-Type=simple
+Type=forking
+PIDFile=/var/run/mon_procd.pid
 
 [Install]
 WantedBy=multi-user.target

vmcp/Makefile

@@ -2,7 +2,9 @@ include ../common.mak
 
 all: vmcp
 
-vmcp: vmcp.o
+libs =	$(rootdir)/libvmcp/libvmcp.a $(rootdir)/libutil/libutil.a
+
+vmcp: vmcp.o $(libs)
 
 install: all
 	$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man8

vmcp/vmcp.c

@@ -4,7 +4,7 @@
  * Tool for accessing the control program of z/VM using the
  * kernel module vmcp
  * return codes:
- *	0: everything was fine                      (VMCP_OK)
+ *	0: everything was fine                      (EXIT_SUCCESS)
  *	1: CP returned a nn zero response code      (VMCP_CP)
  *	2: the response buffer was not large enough (VMCP_BUF)
  *	3: an internal Linux error occurred         (VMCP_LIN)
@@ -28,33 +28,58 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/param.h>
 #include <unistd.h>
 
-#include "vmcp.h"
+#include "lib/zt_common.h"
+#include "lib/vmcp.h"
+#include "lib/util_opt.h"
+#include "lib/util_prg.h"
+
+#define MAXBUFFER 1048576
+#define MINBUFFER 4096
+#define MAXCMDLEN 240
+
+#define VMCP_OK 0
+#define VMCP_CP 1
+#define VMCP_BUF 2
+#define VMCP_LIN 3
+#define VMCP_OPT 4
 
 static int keep_case = 0;
-static int buffersize = 8192;
+static int buffersize = VMCP_DEFAULT_BUFSZ;
 static char command[MAXCMDLEN + 1];
 
-static void print_help(const char *name)
-{
-	printf("%s: z/VM CP command interface.\n%s", name, help_text);
-}
+static struct util_opt opt_vec[] = {
+	UTIL_OPT_SECTION("OPTIONS"),
+	{
+		.option = { "keepcase", no_argument, NULL, 'k' },
+		.desc = "Do not convert CP-command string to uppercase",
+	},
+	{
+		.option = { "buffer", required_argument, NULL, 'b' },
+		.argument = "SIZE",
+		.desc = "Specify buffer size in bytes, kilobytes (k) "
+			"or megabytes (M). SIZE range from 4096 to 1048576 "
+			"bytes"
+	},
+	UTIL_OPT_HELP,
+	UTIL_OPT_VERSION,
+	UTIL_OPT_END
+};
 
-static void print_version(const char *name)
-{
-	printf("%s: z/VM CP command interface version %s\n"
-	       "Copyright IBM Corp. 2005, 2017\n",
-	       name, RELEASE_STRING);
-}
-
-static void uppercase(char *string)
-{
-	while (*string != '\0') {
-		*string = toupper(*string);
-		string++;
+static const struct util_prg prg = {
+	.desc = "z/VM CP command interface",
+	.args = "CP-command",
+	.copyright_vec = {
+		{
+			.owner = "IBM Corp.",
+			.pub_first = 2005,
+			.pub_last = 2018,
+		},
+		UTIL_PRG_COPYRIGHT_END
 	}
-}
+};
 
 /* Parse STRING for buffer size in bytes, allowing size modifier suffix 'k' and
  * 'm'. Return buffer size in bytes on success, -1 on error. */
@@ -95,17 +120,18 @@ static int parse_args(int argc, char **argv)
 	int index;
 
 	do {
-		opt = getopt_long(argc, argv, opt_string, options, NULL);
+		opt = util_opt_getopt_long(argc, argv);
 		switch (opt) {
 		case -1:
 			/* Reached end of parameter list. */
 			break;
 		case 'h':
-			print_help(argv[0]);
-			exit(VMCP_OK);
+			util_prg_print_help();
+			util_opt_print_help();
+			exit(EXIT_SUCCESS);
 		case 'v':
-			print_version(argv[0]);
-			exit(VMCP_OK);
+			util_prg_print_version();
+			exit(EXIT_SUCCESS);
 		case 'k':
 			keep_case = 1;
 			break;
@@ -137,7 +163,8 @@ static int parse_args(int argc, char **argv)
 		strcat(command, argv[index]);
 	}
 	if (strlen(command) == 0) {
-		print_help(argv[0]);
+		util_prg_print_help();
+		util_opt_print_help();
 		return VMCP_OPT;
 	}
 	return VMCP_OK;
@@ -148,25 +175,6 @@ static inline void linux_error(const char *message)
 	fprintf(stderr, "Error: %s: %s\n", message, strerror(errno));
 }
 
-/* Read at most COUNT bytes from FD into memory at location BUF. Return
- * number of bytes read on success, -1 on error. */
-static ssize_t read_buffer(int fd, char *buf, size_t count)
-{
-	ssize_t ret;
-	ssize_t done;
-
-	for (done = 0; done < (ssize_t) count; done += ret) {
-		ret = read(fd, &buf[done], count - done);
-		if (ret == -1 && errno == EINTR)
-			continue;
-		if (ret == -1)
-			return -1;
-		if (ret == 0)
-			break;
-	}
-	return done;
-}
-
 /* Write COUNT bytes to FD from memory at location BUF. Return number of bytes
  * written on success, -1 otherwise. */
 static ssize_t write_buffer(int fd, const char *buf, size_t count)
@@ -188,77 +196,54 @@ static ssize_t write_buffer(int fd, const char *buf, size_t count)
 
 int main(int argc, char **argv)
 {
+	struct vmcp_parm cp;
 	int ret;
-	int fd;
-	int response_code;
-	int response_size;
-	char *buffer;
+
+	util_prg_init(&prg);
+	util_opt_init(opt_vec, NULL);
 
 	ret = parse_args(argc, argv);
 	if (ret != VMCP_OK)
 		return ret;
 
-	if (!keep_case)
-		uppercase(command);
+	cp.buffer_size = buffersize;
+	cp.cpcmd = command;
+	cp.do_upper = !keep_case;
 
-	buffer = malloc(buffersize);
-	if (!buffer) {
-		linux_error("Could not allocate return buffer");
+	ret = vmcp(&cp);
+
+	switch (ret) {
+	case VMCP_ERR_OPEN:
+		linux_error("Could not open device " VMCP_DEVICE_NODE);
 		return VMCP_LIN;
-	}
-	fd = open(DEVICE_NODE, O_RDWR);
-	if (fd == -1) {
-		linux_error("Could not open device " DEVICE_NODE);
-		free(buffer);
-		return VMCP_LIN;
-	}
-	if (ioctl(fd, VMCP_SETBUF, &buffersize) == -1) {
+	case VMCP_ERR_SETBUF:
 		linux_error("Could not set buffer size");
-		free(buffer);
-		close(fd);
 		return VMCP_LIN;
-	}
-	if (write(fd, command, strlen(command)) == -1) {
+	case VMCP_ERR_WRITE:
 		linux_error("Could not issue CP command");
-		free(buffer);
-		close(fd);
 		return VMCP_LIN;
-	}
-	if (ioctl(fd, VMCP_GETCODE, &response_code) == -1) {
+	case VMCP_ERR_GETCODE:
 		linux_error("Could not query return code");
-		free(buffer);
-		close(fd);
 		return VMCP_LIN;
-	}
-	if (ioctl(fd, VMCP_GETSIZE, &response_size) == -1) {
+	case VMCP_ERR_GETSIZE:
 		linux_error("Could not query response size");
-		free(buffer);
-		close(fd);
 		return VMCP_LIN;
-	}
-	ret = read_buffer(fd, buffer, buffersize);
-	if (ret == -1) {
+	case VMCP_ERR_READ:
 		linux_error("Could not read CP response");
-		free(buffer);
-		close(fd);
 		return VMCP_LIN;
 	}
-	write_buffer(STDOUT_FILENO, buffer, ret);
-	if (response_size > buffersize) {
+	write_buffer(STDOUT_FILENO, cp.response,
+		     MIN(cp.response_size, cp.buffer_size));
+	free(cp.response);
+	if (ret == VMCP_ERR_TOOSMALL) {
 		fprintf(stderr, "Error: output (%d bytes) was truncated, try "
-			"--buffer to increase size\n", response_size);
-		free(buffer);
-		close(fd);
+			"--buffer to increase size\n", cp.response_size);
 		return VMCP_BUF;
 	}
-	if (response_code > 0) {
+	if (cp.cprc > 0) {
 		fprintf(stderr, "Error: non-zero CP response for command '%s': "
-			"#%d\n", command, response_code);
-		free(buffer);
-		close(fd);
+			"#%d\n", command, cp.cprc);
 		return VMCP_CP;
 	}
-	free(buffer);
-	close(fd);
-	return VMCP_OK;
+	return EXIT_SUCCESS;
 }

vmcp/vmcp.h

@@ -1,59 +0,0 @@
-/*
- * vmcp - Send commands to the z/VM control program
- *
- * Definitions used by vmcp
- *
- * Copyright IBM Corp. 2005, 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.
- */
-
-#ifndef __vmcp_h__
-#define __vmcp_h__
-
-#include <getopt.h>
-#include <sys/ioctl.h>
-
-#include "lib/zt_common.h"
-
-#define DEVICE_NODE "/dev/vmcp"
-
-#define VMCP_GETCODE _IOR(0x10, 1, int)
-#define VMCP_SETBUF _IOW(0x10, 2, int)
-#define VMCP_GETSIZE _IOR(0x10, 3, int)
-
-#define MAXBUFFER 1048576
-#define MINBUFFER 4096
-#define MAXCMDLEN 240
-
-#define VMCP_OK 0
-#define VMCP_CP 1
-#define VMCP_BUF 2
-#define VMCP_LIN 3
-#define VMCP_OPT 4
-
-static struct option options[] = {
-	{"help", no_argument, NULL, 'h'},
-	{"version", no_argument, NULL, 'v'},
-	{"keepcase", no_argument, NULL, 'k'},
-	{"buffer", required_argument, NULL, 'b'},
-	{NULL, 0, NULL, 0}
-};
-
-static const char opt_string[] = "+hvkb:";
-
-static const char help_text[] =
-    "Usage:\n"
-    "vmcp [-k] [-b <size>] command\n"
-    "vmcp [-h|-v]\n\n"
-    "Options:\n"
-    "-h or --help     :Print usage information, then exit\n"
-    "-v or --version  :Print version information, then exit\n"
-    "-k or --keepcase :Using this option, vmcp does not convert the command\n"
-    "                  to uppercase. The default is to translate the command\n"
-    "                  string.\n"
-    "-b <size> or     :defines the buffer size for the response\n"
-    "--buffer=<size>   valid values are from 4096 to 1048576 bytes\n"
-    "                  the k and M suffixes are also supported\n";
-#endif

vmur/Makefile

@@ -5,7 +5,9 @@ LDLIBS += -lz
 
 all: vmur
 
-libs =  $(rootdir)/libvmdump/libvmdump.a
+libs =  $(rootdir)/libvmdump/libvmdump.a \
+	$(rootdir)/libvmcp/libvmcp.a $(rootdir)/libutil/libutil.a
+
 objects = vmur.o
 
 vmur: $(objects) $(libs)

vmur/vmur.cpp

@@ -31,9 +31,13 @@
 
 #include "lib/vmdump.h"
 #include "lib/zt_common.h"
+#include "lib/util_libc.h"
+#include "lib/vmcp.h"
 
 #include "vmur.h"
 
+#define	CP_PREFIX_LEN	11
+
 /* Program name */
 static char *prog_name;
 
@@ -243,24 +247,6 @@ fail:
 	ERR_EXIT("Could not initialize signal handler (errno = %i)\n", errno);
 }
 
-/*
- * Read at most COUNT bytes from FD into memory at location BUF.
- * Return number of bytes read on success, -1 on error.
- */
-static ssize_t read_buf(int fd, char *buf, ssize_t count)
-{
-	ssize_t rc, len;
-
-	for (len = 0; len < count; len += rc) {
-		rc = read(fd, &buf[len], count - len);
-		if (rc == -1)
-			return -1;
-		if (rc == 0)
-			break;
-	}
-	return len;
-}
-
 /*
  * Strip leading CP header from error message
  */
@@ -293,64 +279,63 @@ static void cperr_exit(char *cpcmd, int cprc, char *buf)
 
 static void _cpcmd(char *cpcmd, char **resp, int *rc, int retry, int upper)
 {
-	int fd, len, cprc, bufsize = VMCP_BUFSIZE;
-	char *buf;
+	struct vmcp_parm cp;
 	char cmd[MAXCMDLEN];
+	int ret;
 
 	strcpy(cmd, cpcmd);
-	if (upper)
-		to_upper(cmd);
+	cp.cpcmd = cmd;
+	cp.do_upper = upper;
+	cp.buffer_size = VMCP_DEFAULT_BUFSZ;
 
-	fd = open(VMCP_DEVICE_NODE, O_RDWR);
-	if (fd == -1)
+retry:
+	ret = vmcp(&cp);
+
+	switch (ret) {
+	case VMCP_ERR_OPEN:
 		ERR_EXIT("Could not issue CP command: \"%s\"\n"
 			 "Ensure that vmcp kernel module is loaded!\n", cmd);
 
-	do {
-		if (ioctl(fd, VMCP_SETBUF, &bufsize) == -1)
-			goto fail;
-
-		if (write(fd, cmd, strlen(cmd)) == -1)
-			goto fail;
-
-		if (ioctl(fd, VMCP_GETCODE, &cprc) == -1)
-			goto fail;
-
-		if (ioctl(fd, VMCP_GETSIZE, &len) == -1)
-			goto fail;
-
-		if (len <= bufsize)
-			break;
-		else if (retry)
-			bufsize = len;
-		else
-			ERR_EXIT("Not enough buffer space (%i/%i) for CP "
-				 "command '%s'.\nSorry, please issue command "
-				 "on your 3270 console!\n", len, bufsize, cmd);
-	} while (1);
-
-	buf = (char *) malloc(len + 1);
-	if (!buf)
-		ERR_EXIT("Out of memory for CP command '%s'\n", cmd);
-
-	memset(buf, 0, len + 1);
-	if (read_buf(fd, buf, len) == -1)
+	case VMCP_ERR_SETBUF:
 		goto fail;
 
+	case VMCP_ERR_WRITE:
+		goto fail;
+
+	case VMCP_ERR_GETCODE:
+		goto fail;
+
+	case VMCP_ERR_GETSIZE:
+		goto fail;
+
+	case VMCP_ERR_READ:
+		goto fail;
+
+	case VMCP_ERR_TOOSMALL:
+		if (retry) {
+			cp.buffer_size = cp.response_size;
+			free(cp.response);
+			goto retry;
+		}
+		ERR_EXIT("Not enough buffer space (%u/%u) for CP "
+			 "command '%s'.\nSorry, please issue command "
+			 " on your 3270 console!\n", cp.response_size,
+			 cp.buffer_size, cmd);
+	}
+
 	if (rc == NULL) {
-		if (cprc != 0) {
+		if (cp.cprc != 0) {
 			/* caller wants us to handle the error */
-			cperr_exit(cmd, cprc, buf);
+			cperr_exit(cmd, cp.cprc, cp.response);
 		}
 	} else {
-		*rc = cprc;
+		*rc = cp.cprc;
 	}
 
 	if (resp)
-		*resp = buf;
+		*resp = cp.response;
 	else
-		free(buf);
-	close(fd);
+		free(cp.response);
 	return;
 
 fail:
@@ -1369,30 +1354,6 @@ static void close_reader(struct vmur *info, const char *hold)
 	cpcmd(cmd, NULL, NULL, 0);
 }
 
-/*
- * strip leading and trailing blanks
- */
-static char *strstrip(char *s)
-{
-	size_t size;
-	char *end;
-
-	size = strlen(s);
-
-	if (!size)
-		return s;
-
-	end = s + size - 1;
-	while (end >= s && isspace(*end))
-		end--;
-	*(end + 1) = '\0';
-
-	while (*s && isspace(*s))
-		s++;
-
-	return s;
-}
-
 /*
  *  Check whether reader can handle class of reader spool file
  */
@@ -1431,9 +1392,9 @@ static int get_filename_from_reader(struct vmur *info)
 	sprintf(cmd, "QUERY RDR * %s ALL SHORTDATE", info->spoolid);
 	cpcmd(cmd, &buf, NULL, 0);
 	memcpy(name, &buf[130], 8);
-	strstrip(name);
+	util_strstrip(name);
 	memcpy(type, &buf[140], 8);
-	strstrip(type);
+	util_strstrip(type);
 	free(buf);
 	if (strlen(name) == 0) {
 		ERR("Please specify name to receive "

vmur/vmur.h

@@ -31,14 +31,6 @@ do { \
 		ERR_EXIT(str " can only be specified once.\n"); \
 } while (0)
 
-#define VMCP_DEVICE_NODE "/dev/vmcp"
-#define VMCP_BUFSIZE 0x4000
-#define VMCP_GETSIZE _IOR(0x10, 3, int)
-#define VMCP_SETBUF  _IOW(0x10, 2, int)
-#define VMCP_GETCODE _IOR(0x10, 1, int)
-
-#define CP_PREFIX_LEN 11
-
 #define VMRDR_DEVICE_NODE "/dev/vmrdr-0.0.000c"
 #define VMPUN_DEVICE_NODE "/dev/vmpun-0.0.000d"
 #define VMPRT_DEVICE_NODE "/dev/vmprt-0.0.000e"

zconf/Makefile

@@ -4,9 +4,9 @@
 include ../common.mak
 
 SCRIPTS	= lsdasd lstape chccwdev lszfcp cio_ignore znetconf dasdstat
-USRSBIN_SCRIPTS = lsmem chmem lsluns
+USRSBIN_SCRIPTS = lsluns
 MANPAGES= lsdasd.8 lstape.8 chccwdev.8 lszfcp.8 lsluns.8 \
-	  cio_ignore.8 znetconf.8 chmem.8 lsmem.8 dasdstat.8
+	  cio_ignore.8 znetconf.8 dasdstat.8
 
 SUB_DIRS = zcrypt scm chp css qeth
 
@@ -23,7 +23,7 @@ install:	install-scripts install-manpages install-usrsbin-scripts $(SUB_DIRS)
 install-scripts:	$(SCRIPTS)
 	@for i in $^; do \
 		cat $$i | \
-		sed -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
+		sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
 		>$(DESTDIR)$(BINDIR)/$$i; \
 		chown $(OWNER).$(GROUP) $(DESTDIR)$(BINDIR)/$$i; \
 		chmod 755 $(DESTDIR)$(BINDIR)/$$i; \
@@ -32,7 +32,7 @@ install-scripts:	$(SCRIPTS)
 install-usrsbin-scripts:	$(USRSBIN_SCRIPTS)
 	@for i in $^; do \
 		cat $$i | \
-		sed -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
+		sed -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
 		>$(DESTDIR)$(USRSBINDIR)/$$i; \
 		chown $(OWNER).$(GROUP) $(DESTDIR)$(USRSBINDIR)/$$i; \
 		chmod 755 $(DESTDIR)$(USRSBINDIR)/$$i; \

zconf/chmem

@@ -1,334 +0,0 @@
-#!/usr/bin/perl
-#
-# chmem - Tool to change memory hotplug status
-#
-# Copyright IBM Corp. 2010, 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 Getopt::Long qw(:config no_ignore_case no_auto_abbrev);
-use File::Basename;
-
-my $script_name = fileparse($0);
-my $online = 0;
-my $offline = 0;
-my $memdir = "/sys/devices/system/memory";
-my $block_size = 0;
-my $max_block_nr = 0;
-my $devices = {};
-my $dev_size;
-my $blocks_per_dev = 0;
-my $devs_per_block = 0;
-my $ret = 0;
-my @entries;
-
-sub chmem_usage()
-{
-	print <<HERE;
-Usage: $script_name [OPTIONS] SIZE|RANGE
-
-The $script_name command sets a particular size or range of memory online
-or offline.
-
-Specify SIZE as <size>[m|M|g|G]. With m or M, <size> specifies the memory
-size in MB (1024 x 1024 bytes). With g or G, <size> specifies the memory size
-in GB (1024 x 1024 x 1024 bytes). The default unit is MB.
-
-Specify RANGE in the form 0x<start>-0x<end> as shown in the output of the
-lsmem command. <start> is the hexadecimal address of the first byte and <end>
-is the hexadecimal address of the last byte in the memory range.
-
-SIZE and RANGE must be aligned to the Linux memory block size, as shown in
-the output of the lsmem command.
-
-OPTIONS
-    -e, --enable
-        Set the given RANGE or SIZE of memory online.
-
-    -d, --disable
-        Set the given RANGE or SIZE of memory offline.
-
-    -h, --help
-        Print a short help text, then exit.
-
-    -v, --version
-        Print the version number, then exit.
-HERE
-}
-
-sub chmem_version()
-{
-	print "$script_name: version %S390_TOOLS_VERSION%\n";
-	print "Copyright IBM Corp. 2010, 2017\n";
-}
-
-sub chmem_get_dev_size()
-{
-	my ($device, $old_device, $block, $old_block) = (0, 0, 0, 0);
-
-	foreach (@entries) {
-		$_ =~ /memory(\d+)/;
-		$block = $1;
-		$device = `cat $_/phys_device`;
-		chomp($device);
-		if ($device > $old_device) {
-			$dev_size = int((($block - $old_block) * $block_size) /
-				    ($device - $old_device));
-			last;
-		}
-		$dev_size += $block_size;
-		$old_block = $block;
-	}
-}
-
-sub chmem_online($)
-{
-	my $block = shift;
-
-	qx(echo online_movable > $memdir/memory$block/state 2>/dev/null);
-	if ($? >> 8 != 0) {
-		qx(echo online > $memdir/memory$block/state 2>/dev/null);
-	}
-	return $? >> 8;
-}
-
-sub chmem_offline($)
-{
-	my $block = shift;
-
-	qx(echo offline > $memdir/memory$block/state 2>/dev/null);
-	return $? >> 8;;
-}
-
-sub chmem_read_attr($$$)
-# parameters: state, device, block
-{
-	my @attributes = qw(state phys_device);
-	foreach (0..1) {
-		$_[$_] = `cat $memdir/memory$_[2]/$attributes[$_]`;
-		chomp($_[$_]);
-	}
-}
-
-sub chmem_read_devices()
-{
-	my $block = 0;
-	my $device = 0;
-	my $old_device = 0;
-	my $blocks = 0;
-	my $state;
-
-	foreach (@entries) {
-		$_ =~ /memory(\d+)/;
-		$block = $1;
-		chmem_read_attr($state, $device, $block);
-		if ($device != $old_device) {
-			$devices->{$old_device}->{'id'} = $old_device;
-			$devices->{$old_device}->{'blocks'} = $blocks;
-			$old_device = $device;
-			$blocks = 0;
-		}
-		if ($state eq "online") {
-			$blocks++;
-		}
-	}
-	$devices->{$old_device}->{'blocks'} = $blocks;
-	$devices->{$old_device}->{'id'} = $old_device;
-}
-
-sub chmem_dev_action($$)
-{
-	my ($dev_id, $blocks) = @_;
-	my ($start_block, $end_block, $tmp_block, $max_blocks);
-	my $state;
-	my $i = 0;
-	my $count = 0;
-
-	if ($blocks_per_dev > 0) {
-		$start_block = $dev_id * $blocks_per_dev;
-		$end_block = $start_block + $blocks_per_dev - 1;
-		$max_blocks = $blocks_per_dev;
-	} else {
-		$start_block = int($dev_id / $devs_per_block);
-		$end_block = $start_block;
-		$max_blocks = 1;
-	}
-	if ($blocks > $max_blocks) {
-		$blocks = $max_blocks;
-	}
-	while ($count < $blocks && $i < $max_blocks) {
-		$tmp_block = $online ? $start_block + $i : $end_block - $i;
-		$state = `cat $memdir/memory$tmp_block/state`;
-		chomp($state);
-		if ($offline && $state eq "online") {
-			$count++ unless chmem_offline($tmp_block);
-		}
-		if ($online && $state eq "offline") {
-			$count++ unless chmem_online($tmp_block);
-		}
-		$i++;
-	}
-	return $count;
-}
-
-sub chmem_size($)
-{
-	my $size = shift;
-	my ($blocks, $dev_blocks, $dev_id);
-
-	$blocks = int($size / $block_size);
-	if ($online) {
-		foreach my $device (sort {$b->{'blocks'} <=> $a->{'blocks'} ||
-					  $a->{'id'} <=> $b->{'id'}}
-				    values %{$devices}) {
-			$dev_blocks = $device->{'blocks'};
-			$dev_id = $device->{'id'};
-			if ($dev_blocks < $blocks_per_dev || $dev_blocks == 0) {
-				$blocks -= chmem_dev_action($dev_id, $blocks);
-				if ($blocks == 0) {
-					last;
-				}
-			}
-		}
-		if ($blocks > 0) {
-			printf(STDERR "chmem: Could only set %lu MB of memory ".
-			       "online.\n", $size - $blocks * $block_size);
-			$ret = 1;
-		}
-	} else {
-		foreach my $device (sort {$a->{'blocks'} <=> $b->{'blocks'} ||
-					  $b->{'id'} <=> $a->{'id'}}
-				    values %{$devices}) {
-			$dev_blocks = $device->{'blocks'};
-			$dev_id = $device->{'id'};
-			if ($dev_blocks > 0) {
-				$blocks -= chmem_dev_action($dev_id, $blocks);
-				if ($blocks == 0) {
-					last;
-				}
-			}
-		}
-		if ($blocks > 0) {
-			printf(STDERR "chmem: Could only set %lu MB of memory ".
-			       "offline.\n", $size - $blocks * $block_size);
-			$ret = 1;
-		}
-	}
-}
-
-sub chmem_range($$)
-{
-	my ($start, $end) = @_;
-	my $block = 0;
-	my $state;
-
-	while ($start < $end && $block < $max_block_nr) {
-		$block = int($start / ($block_size << 20));
-		$state = `cat $memdir/memory$block/state`;
-		chomp($state);
-		if ($online && $state eq "offline") {
-			if (chmem_online($block)) {
-				printf(STDERR "chmem: Could not set ".
-				       "0x%016x-0x%016x online\n", $start,
-				       $start + ($block_size << 20) - 1);
-				$ret = 1;
-			}
-		}
-		if ($offline && $state eq "online") {
-			if (chmem_offline($block)) {
-				printf(STDERR "chmem: Could not set ".
-				       "0x%016x-0x%016x offline\n", $start,
-				       $start + ($block_size << 20) - 1);
-				$ret = 1;
-			}
-		}
-		$start += $block_size << 20;
-	}
-}
-
-sub chmem_check()
-{
-	$block_size = `cat $memdir/block_size_bytes`;
-	chomp($block_size);
-	if ($block_size =~ /(?:0x)?([[:xdigit:]]+)/) {
-		$block_size = unpack("Q", pack("H16",
-				     substr("0" x 16 . $1, -16)));
-		$block_size = $block_size >> 20;
-	} else {
-		die "chmem: Unknown block size format in sysfs.\n";
-	}
-	if ($online == 0 && $offline == 0) {
-		die "chmem: Please specify one of the options -e or -d.\n";
-	}
-	if ($online == 1 && $offline == 1) {
-		die "chmem: You cannot specify both options -e and -d.\n";
-	}
-
-	chmem_get_dev_size();
-	if ($dev_size >= $block_size) {
-		$blocks_per_dev = int($dev_size / $block_size);
-	} else {
-		$devs_per_block = int($block_size / $dev_size);
-	}
-}
-
-sub chmem_action()
-{
-	my ($start, $end, $size, $unit);
-
-	if (!defined($ARGV[0])) {
-		die "chmem: Missing size or range.\n";
-	}
-	if ($ARGV[0] =~ /^0x([[:xdigit:]]+)-0x([[:xdigit:]]+)$/) {
-		$start = unpack("Q", pack("H16", substr("0" x 16 . $1, -16)));
-		$end = unpack("Q", pack("H16", substr("0" x 16 . $2, -16)));
-		if ($start % ($block_size << 20) ||
-		    ($end + 1) % ($block_size << 20)) {
-			die "chmem: Start address and (end address + 1) must ".
-			    "be aligned to memory block size ($block_size MB).\n";
-		}
-		chmem_range($start, $end);
-	} else {
-		if ($ARGV[0] =~ m/^(\d+)([mg]?)$/i) {
-			$size = $1;
-			$unit = $2 || "";
-			if ($unit =~ /g/i) {
-				$size = $size << 10;
-			}
-			if ($size % $block_size) {
-				die "chmem: Size must be aligned to memory ".
-				    "block size ($block_size MB).\n";
-			}
-			chmem_size($size);
-		} else {
-			printf(STDERR "chmem: Invalid size or range: %s\n",
-			       $ARGV[0]);
-			exit 1;
-		}
-	}
-}
-
-
-# Main
-unless (GetOptions('v|version' => sub {chmem_version(); exit 0;},
-		  'h|help'    => sub {chmem_usage(); exit 0;},
-		  'e|enable'  => \$online,
-		  'd|disable' => \$offline)) {
-	die "Try '$script_name --help' for more information.\n";
-};
-
-@entries = (sort {length($a) <=> length($b) || $a cmp $b} <$memdir/memory*>);
-if (@entries == 0) {
-	die "chmem: No memory hotplug interface in sysfs ($memdir).\n";
-}
-$entries[-1] =~ /memory(\d+)/;
-$max_block_nr = $1;
-
-chmem_read_devices();
-chmem_check();
-chmem_action();
-exit $ret;

zconf/chmem.8

@@ -1,75 +0,0 @@
-.\" Copyright 2017 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 CHMEM 8 "Apr 2010" "s390-tools"
-.
-.
-.SH NAME
-chmem \- set memory online or offline.
-.
-.SH SYNOPSIS
-.B chmem
-.RB OPTIONS
-.RB [SIZE|RANGE]
-.
-.
-.SH DESCRIPTION
-The chmem command sets a particular size or range of memory online or offline.
-.
-.IP "\(hy" 2
-Specify SIZE as <size>[m|M|g|G]. With m or M, <size> specifies the memory
-size in MB (1024 x 1024 bytes). With g or G, <size> specifies the memory size
-in GB (1024 x 1024 x 1024 bytes). The default unit is MB.
-.
-.IP "\(hy" 2
-Specify RANGE in the form 0x<start>-0x<end> as shown in the output of the
-lsmem command. <start> is the hexadecimal address of the first byte and <end>
-is the hexadecimal address of the last byte in the memory range.
-.
-.PP
-SIZE and RANGE must be aligned to the Linux memory block size, as shown in
-the output of the lsmem command.
-
-Setting memory online can fail if the hypervisor does not have enough memory
-left, for example because memory was overcommitted. Setting memory offline can
-fail if Linux cannot free the memory. If only part of the requested memory can
-be set online or offline, a message tells you how much memory was set online
-or offline instead of the requested amount.
-.
-.
-.SH OPTIONS
-.TP
-.BR \-h ", " \-\-help
-Print a short help text, then exit.
-.
-.TP
-.BR \-v ", " \-\-version
-Print the version number, then exit.
-.
-.TP
-.BR \-e ", " \-\-enable
-Set the given RANGE or SIZE of memory online.
-.
-.TP
-.BR \-d ", " \-\-disable
-Set the given RANGE or SIZE of memory offline.
-.
-.
-.SH EXAMPLES
-.TP
-.B chmem --enable 1024
-This command requests 1024 MB of memory to be set online.
-.
-.TP
-.B chmem -e 2g
-This command requests 2 GB of memory to be set online.
-.
-.TP
-.B chmem --disable 0x00000000e4000000-0x00000000f3ffffff
-This command requests the memory range starting with 0x00000000e4000000
-and ending with 0x00000000f3ffffff to be set offline.
-.
-.
-.SH SEE ALSO
-.BR lsmem (8)

zconf/css/lscss.8

@@ -111,6 +111,10 @@ In rare situations a device might temporarily not be accessible to
 the subchannel. Then "none" is displayed as the device identifier and the
 other device attributes are empty.
 
+For subchannels bound to an alternate driver (most notably vfio_ccw) the
+device identifier may also be displayed as "none". In this case use the
+\fB--vfio\fR option to show VFIO specific subchannel information.
+
 .SH AUTHOR
 .nf
 This man-page was written by Stefan Bader <shbader@de.ibm.com>.

zconf/css/lscss.c

@@ -649,14 +649,12 @@ static void print_defunct_devices(struct util_rec *rec, char *path)
 			snprintf(buf, sizeof(buf), "%s", device);
 		}
 		if (cmd.opt_devrange && cmd.rng_count > 0 &&
-		   !id_in_ranges_list(device)) {
-			util_scandir_free(de_vec, count);
+		   !id_in_ranges_list(device))
 			continue;
-		}
-		if (fill_device_info(rec, path, device) != 0) {
-			util_scandir_free(de_vec, count);
+
+		if (fill_device_info(rec, path, device) != 0)
 			continue;
-		}
+
 		if (cmd.opt_uppercase)
 			util_str_toupper(buf);
 		util_rec_set(rec, "device", "%s", buf);
@@ -719,7 +717,7 @@ static void print_subchannels_of_type(enum sch_type type_requested,
 	if (!cmd.opt_devrange && cmd.rng_count > 0)
 		return;
 	path = util_path_sysfs("devices");
-	count = util_scandir(&de_vec, alphasort, path, "css.*/");
+	count = util_scandir(&de_vec, alphasort, path, "css.*");
 	free(path);
 	for (i = 0; i < count; i++) {
 		path = util_path_sysfs("devices/%s/defunct", de_vec[i]->d_name);

zconf/lsluns

@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# lsluns - Tool to list all available LUNs
+# lsluns - list LUNs discovered in the FC SAN, or show encryption state of attached LUNs
 #
 # Copyright IBM Corp. 2008, 2017
 #
@@ -169,32 +169,51 @@ sub get_lun_hash
 
 sub lsluns_usage {
     print <<EOD;
-Usage: $PROGRAM_NAME [<options>]
+Usage:
+This tool is designed for environments where all SCSI devices are attached
+through the zfcp device driver. Expect error messages in mixed environments
+such as with iSCSI.
 
-    lsluns provides information for LUNs.
+$PROGRAM_NAME [-c <busid>] ... [-p <wwpn>] ... [-h] [-v]
 
-    The default is to list all LUNs that are available via the attached ports.
-    The display can be limited by specifying an adapter or a port.
+    List LUNs discovered in the Fibre Channel (FC) Storage Area Network (SAN).
+    This causes extra SAN traffic for each target port WWPN.
+      Discovering LUNs only makes sense for NPIV-enabled FCP devices
+    without zfcp automatic LUN scan. zfcp automatic LUN scan is available
+    as of kernel version 2.6.37, if not disabled with zfcp.allow_lun_scan=0.
+      For storage products that do not support a REPORT LUNS
+    well-known logical unit (such as IBM Storwize products),
+    ensure that LUN 0 represents a valid peripheral device type.
+    See the man page for more information.
+
+$PROGRAM_NAME -a [-c <busid>] ... [-p <wwpn>] ... [-h] [-v]
+
+    Show encryption state of the attached LUNs.
+    This causes extra SAN traffic for each attached LUN.
+
+For all other uses, such as listing attached LUNs or properties other than
+encryption, use other tools such as "lszfcp -D" or "lsscsi -tv"
+or "lszdev zfcp-lun -ii".
+
+Limit the listing by specifying one or more adapters (FCP device
+bus-IDs) or target port WWPNs or both.
 
 Options:
-    -a, --active
-    Shows all activated LUNs.
-    In addition LUN encryption information is provided.
-    e.g. "lsluns -a"
+    -c <busid>, --ccw <busid>
+        Filter LUNs by adapter with the specified FCP device bus-ID. Can be
+        specified multiple times.
+        For example: "$PROGRAM_NAME -c 0.0.3922"
 
-    -c, --ccw
-    Shows LUNs for a specific ccw device.
-    e.g. "lsluns -c 0.0.3922"
-
-    -p, --port
-    Shows LUNs for a specific port.
-    e.g. "lsluns -p 0x5005123456789000"
+    -p <wwpn>, --port <wwpn>
+        Filter LUNs by target port with the specified WWPN. Can be specified
+        multiple times.
+        For example: "$PROGRAM_NAME -p 0x5005123456789000"
 
     -h, --help
-    Print help message and exit.
+        Print help message and exit.
 
     -v, --version
-    Display version info and exit.
+        Display version information and exit.
 EOD
     exit 0;
 }
@@ -215,11 +234,16 @@ sub get_env_list
     my $p_ref_list = shift();
     my @res ;
     my %res_hash;
-    my @t_arr;
 
+    if (!</sys/bus/ccw/drivers/zfcp/*.*.*/>) {
+        print "$PROGRAM_NAME: No adapter exists\n";
+        return;
+    }
     @res = </sys/bus/ccw/drivers/zfcp/*.*.*/0x*>;
-    return () if (!@res);
-reload:
+    if (!@res) {
+        print "$PROGRAM_NAME: No port on any adapter exists\n";
+        return;
+    }
     foreach my $entry (@res) {
         my $a = ${[split('/', $entry)]}[-2];
         my $p = ${[split('/', $entry)]}[-1];
@@ -227,28 +251,9 @@ reload:
         next if (@$p_ref_list && "@$p_ref_list" !~ /$p/);
         push @{ $res_hash{$a} }, $p;
     }
-    foreach my $a (sort @$a_ref_list) {
-        if ("@{[keys %res_hash]}" !~ /$a/) {
-            print "\tNo valid combination found for adapter '$a'. ",
-            "Removing from resource list.\n";
-        }
-    }
-
-    push @t_arr, map { @{$res_hash{$_}} } keys %res_hash;
-    foreach my $p (@$p_ref_list) {
-        if ("@t_arr" !~ /$p/) {
-            print "\tNo valid combination found for port '$p'. ",
-            "Removing from resource list.\n";
-        }
-    }
 
     if (!%res_hash) {
-        print "\nNo valid parameters left, ",
-        "using all available resources in system.\n\n";
-        @$a_ref_list = ();
-        @$p_ref_list = ();
-        @t_arr = ();
-        goto reload;
+        print "$PROGRAM_NAME: Adapter and/or port filter(s) did not match anything\n";
     }
     return %res_hash;
 }

zconf/lsluns.8

@@ -2,62 +2,140 @@
 .\" 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 LSLUNS 8 "June 2008" "s390-tools"
+.TH LSLUNS 8 "2017-02-17" "s390-tools"
 .SH NAME
-lsluns \- list available LUNs
+lsluns \- list LUNs discovered in the FC SAN through zfcp, or show encryption state of
+zfcp-attached LUNs
 
 .SH SYNOPSIS
 .B lsluns
-.RB [ \-h]
-.RB [ \-v]
-.RB [ \-c
-.IR adapter id:0.0.XXXX ]
-.RB [ \-p
-.IR port number:0xXXXXXXXXXXXXXXXX ]
+.RB [\| \-c
+.IR busid \|]\ .\|.\|.
+.RB [\| \-p
+.IR wwpn \|]\ .\|.\|.
+.\" --active
+.br
+.B lsluns \-a
+.RB [\| \-c
+.IR busid \|]\ .\|.\|.
+.RB [\| \-p
+.IR wwpn \|]\ .\|.\|.
+.\" --help and --version
+.br
+.B lsluns
+.RB [\| \-h \|]
+.RB [\| \-v \|]
 
 .SH DESCRIPTION
 .PP
-.B lsluns
-does a listing of all available LUNs.
+This tool is designed for environments where all SCSI devices are attached
+through the zfcp device driver. Expect error messages in mixed environments
+such as with iSCSI.
 
-The default is to list all LUNs that are found. The listing can be
-limited by specifying an adapter or a port.
+.B lsluns
+lists all logical unit numbers (LUNs) discovered in the
+Fibre Channel (FC) Storage Area Network (SAN).
+This causes extra SAN traffic for each target port WWPN.
+
+.B lsluns -a
+shows the encryption state of the attached LUNs.
+This causes extra SAN traffic for each attached LUN.
+
+Limit the listing by specifying one or more adapters (FCP device
+bus-IDs) or target port WWPNs or both.
+
+For all other uses, such as listing attached LUNs or properties other than
+encryption, use other tools such as
+.B lszfcp \-D
+or
+.BR "lsscsi \-tv"
+or
+.BR "lszdev zfcp-lun \-ii" .
+
+.SS Details on lsluns without -a option
+
+.TP
+Prerequisite
+Discovering LUNs only makes sense for NPIV-enabled FCP devices
+without zfcp automatic LUN scan. zfcp automatic LUN scan is available
+as of kernel version 2.6.37, if not disabled with zfcp.allow_lun_scan=0.
+
+With available and enabled zfcp automatic LUN scan,
+the kernel already performs LUN discovery.
+
+.TP
+Temporary LUN Attachment
+If not attached already, lsluns temporarily attaches LUN 0
+(or if this fails the WLUN 0xc101000000000000) during runtime.
+Do not terminate lsluns with a signal. Signals interfere
+with the removal of temporarily attached LUNs.
+
+.TP
+Storage Products
+Some storage products return a peripheral device type of 31==0x1f
+with peripheral qualifier 0 in a SCSI standard INQUIRY command
+for an unmapped FCP LUN 0. Examples are: IBM Storwize products,
+including IBM V7000, IBM V840, IBM V9000, and IBM SAN Volume Controller.
+For lsluns to work with such storage products,
+you must have a host mapping on the storage, which maps some volume
+to exported FCP LUN 0x0000000000000000 (Storwize host map property "SCSI ID" 0)
+for each used FCP-device initiator WWPN. The volume can be
+a minimum-sized thin-provisioned shared stand-in volume.
 
 .SH OPTIONS
 .TP
-.B -h, --help
+.BR \-a ", " \-\-active
+Show the encryption state of the attached LUNs. Encrypted devices are indicated
+with a bracketed X immediately following the LUN number.
+.TP
+.BI \-c\  busid \fR,\ \fB\-\-ccw= busid
+Filter LUNs by adapter with the specified FCP device bus-ID. This option can be
+specified multiple times. When used in conjunction with \fB\-p\fR, only those
+LUNs are listed that also satisfy at least one of the \fB\-p\fR constraints.
+.TP
+.BI \-p\  wwpn \fR,\ \fB\-\-port= wwpn
+Filter LUNs by target port with the specified WWPN. This option can be
+specified multiple times. When used in conjunction with \fB\-c\fR, only those
+LUNs are listed that also satisfy at least one of the \fB\-c\fR constraints.
+.TP
+.BR \-h ", " \-\-help
 Print help message and exit.
 .TP
-.B -v, --version
-Display version info and exit.
-.TP
-.B -c, --ccw
-Shows LUNs for a specific adapter.
-.TP
-.B -p, --port
-Shows LUNs for a specific port.
-.TP
-.B -a, --active
-Shows all activated LUNs. In addition information is provided
-whether the LUN is encrypted or not. This is indicated with a bracketed X 
-right after the LUN number.
+.BR \-v ", " \-\-version
+Display version information and exit.
 
 .SH EXAMPLES
-.PP
-.IP "lsluns"
+.TP
+.B "lsluns"
 .RS
-Shows all available LUNs.
+Lists all LUNs discovered in the FC SAN.
 .RE
-.IP "lsluns -c 0.0.3922"
-Shows all LUNs found on adapter 0.0.3922.
-.IP "lsluns -p 0x5005123456789000"
-Shows all LUNs for port 0x5005123456789000.
-.IP "lsluns -c 0.0.3922 -p 0x5005123456789000"
-Shows all LUNs for adapter 0.0.3922 and port 0x5005123456789000.
-.IP "lsluns -a "
+.TP
+.BI "lsluns \-c " 0.0.3922
+Lists all LUNs discovered in the FC SAN on adapter \fI0.0.3922\fR.
+.TP
+.BI "lsluns \-p " 0x5005123456789000
+Lists all LUNs discovered in the FC SAN on target port
+\fI0x5005123456789000\fR.
+.TP
+.BI "lsluns \-c " 0.0.3922 " \-c " 0.0.fc00 \
+" \-p " 0x5005123456789000 " \-p " 0x5005abcdefabc000
+Lists all LUNs discovered in the FC SAN on:
+adpater \fI0.0.3922\fR and port \fI0x5005123456789000\fR,
+adapter \fI0.0.3922\fR and port \fI0x5005abcdefabc000\fR,
+adapter \fI0.0.fc00\fR and port \fI0x5005123456789000\fR, or
+adapter \fI0.0.fc00\fR and port \fI0x5005abcdefabc000\fR.
+.TP
+.B "lsluns -a"
 adapter = 0.0.3c02
         port = 0x500507630300c562
                 lun = 0x401040a200000000(X)     /dev/sg0        Disk    IBM:2107900
                 lun = 0x401040a300000000        /dev/sg1        Disk    IBM:2107900
 
-Shows all active LUNs including the information whether the device is encrypted or not.
+Shows the encryption status of attached LUNs. A bracketed X suffixed to a LUN
+indicates that the device is encrypted.
+
+.SH "SEE ALSO"
+.BR lszfcp (8),
+.BR lsscsi (8),
+.BR lszdev (8)

zconf/lsmem

@@ -1,172 +0,0 @@
-#!/usr/bin/perl
-#
-# lsmem - Tool to show memory hotplug status
-#
-# Copyright IBM Corp. 2010, 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 Getopt::Long qw(:config no_ignore_case no_auto_abbrev);
-use File::Basename;
-
-my $script_name = fileparse($0);
-my $memdir = "/sys/devices/system/memory";
-my $block_size = 0;
-my $list_all = 0;
-my $dev_size = 0;
-my @entries;
-
-
-sub lsmem_read_attr($$$$)
-# parameters: state, rem, device, block_nr
-{
-	my @attributes = qw(state removable phys_device);
-	foreach (0..2) {
-		$_[$_] = `cat $memdir/memory$_[3]/$attributes[$_]`;
-		chomp($_[$_]);
-	}
-}
-
-sub lsmem_get_dev_size()
-{
-	my ($device, $old_device, $block, $old_block) = (0, 0, 0, 0);
-
-	foreach (@entries) {
-		$_ =~ /memory(\d+)/;
-		$block = $1;
-		$device = `cat $_/phys_device`;
-		chomp($device);
-		if ($device > $old_device) {
-			$dev_size = int((($block - $old_block) * $block_size) /
-				    ($device - $old_device));
-			last;
-		}
-		$dev_size += $block_size;
-		$old_block = $block;
-	}
-}
-
-sub lsmem_list()
-{
-	my $block = 0;
-	my ($start, $end, $size) = (0, 0, 0);
-	my ($state, $next_state) = (0, 0);
-	my ($rem, $next_rem) = (0, 0);
-	my ($device, $next_device, $end_dev) = (0, 0, 0);
-	my ($mem_online, $mem_offline) = (0, 0);
-	my $mem_hole;
-
-	$block_size = `cat $memdir/block_size_bytes`;
-	chomp($block_size);
-	if ($block_size =~ /(?:0x)?([[:xdigit:]]+)/) {
-		$block_size = unpack("Q", pack("H16",
-				     substr("0" x 16 . $1, -16)));
-		$block_size = $block_size >> 20;
-	} else {
-		die "lsmem: Unknown block size format in sysfs.\n";
-	}
-	lsmem_get_dev_size();
-	# Start with $mem_hole = 1 to initialize $start, $state, $rem, $device
-	$mem_hole = 1;
-
-	print <<HERE;
-Address Range                          Size (MB)  State    Removable  Device
-===============================================================================
-HERE
-	foreach (@entries) {
-		$_ =~ /memory(\d+)/;
-		$block = $1;
-		if ($mem_hole) {
-			lsmem_read_attr($state, $rem, $device, $block);
-			$start = ($block) * ($block_size << 20);
-			$mem_hole = 0;
-		}
-		# check next block or memory hole
-		$block++;
-		if (-d "$memdir/memory".$block) {
-			lsmem_read_attr($next_state, $next_rem, $next_device,
-					$block);
-		} else {
-			$mem_hole = 1
-		}
-		if ($state ne $next_state || $rem != $next_rem || $list_all ||
-		    $mem_hole) {
-			$end = ($block) * ($block_size << 20) - 1;
-			$size = ($end - $start + 1) >> 20;
-			if ($state eq "going-offline") {
-				$state = "on->off";
-			}
-			printf("0x%016x-0x%016x %10lu  %-7s ", $start, $end,
-				$size, $state);
-			if ($state eq "online") {
-				printf(" %-9s  ", $rem ? "yes" : "no");
-				$mem_online += $size;
-			} else {
-				printf(" %-9s  ", "-");
-				$mem_offline += $size;
-			}
-			$end_dev = ($end / $dev_size) >> 20;
-			if ($device == $end_dev) {
-				printf("%d\n", $device);
-			} else {
-				printf("%d-%d\n", $device, $end_dev);
-			}
-			$state = $next_state;
-			$rem = $next_rem;
-			$device = $end_dev + 1;
-			$start = $end + 1;
-		}
-	}
-	printf("\n");
-	printf("Memory device size  : %lu MB\n", $dev_size);
-	printf("Memory block size   : %lu MB\n", $block_size);
-	printf("Total online memory : %lu MB\n", $mem_online);
-	printf("Total offline memory: %lu MB\n", $mem_offline);
-}
-
-sub lsmem_usage()
-{
-	print <<HERE;
-Usage: $script_name [OPTIONS]
-
-The $script_name command lists the ranges of available memory with their online
-status. The listed memory blocks correspond to the memory block representation
-in sysfs. The command also shows the memory block size, the device size, and
-the amount of memory in online and offline state.
-
-OPTIONS
-    -a, --all
-       List each individual memory block, instead of combining memory blocks
-       with similar attributes.
-
-    -h, --help
-       Print a short help text, then exit.
-
-    -v, --version
-       Print the version number, then exit.
-HERE
-}
-
-sub lsmem_version()
-{
-	print "$script_name: version %S390_TOOLS_VERSION%\n";
-	print "Copyright IBM Corp. 2010, 2017\n";
-}
-
-
-# Main
-unless (GetOptions('v|version' => sub {lsmem_version(); exit 0;},
-		   'h|help'    => sub {lsmem_usage(); exit 0;},
-		   'a|all'     => \$list_all)) {
-	die "Try '$script_name --help' for more information.\n";
-};
-
-@entries = (sort {length($a) <=> length($b) || $a cmp $b} <$memdir/memory*>);
-if (@entries == 0) {
-	die "lsmem: No memory hotplug interface in sysfs ($memdir).\n";
-}
-lsmem_list();

zconf/lsmem.8

@@ -1,73 +0,0 @@
-.\" Copyright 2017 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 LSMEM 8 "Apr 2010" s390\-tools
-.
-.
-.SH NAME
-lsmem \- list the ranges of available memory with their online status.
-.
-.
-.SH SYNOPSIS
-.B lsmem
-.RB [OPTIONS]
-.
-.
-.SH DESCRIPTION
-The lsmem command lists the ranges of available memory with their online
-status. The listed memory blocks correspond to the memory block representation
-in sysfs. The command also shows the memory block size, the device size, and
-the amount of memory in online and offline state.
-.
-.SS "Column description"
-.
-.TP 4
-Address Range
-Start and end address of the memory range.
-.
-.TP 4
-Size
-Size of the memory range in MB (1024 x 1024 bytes).
-.
-.TP 4
-State
-Indication of the online status of the memory range. State on->off means
-that the address range is in transition from online to offline.
-.
-.TP 4
-Removable
-"yes" if the memory range can be set offline, "no" if it cannot be set offline.
-A dash ("\-") means that the range is already offline.
-.
-.TP 4
-Device
-Device number or numbers that correspond to the memory range.
-
-Each device represents a memory unit for the hypervisor in control of the
-memory. The hypervisor cannot reuse a memory unit unless the corresponding
-memory range is completely offline. For best memory utilization, each device
-should either be completely online or completely offline.
-
-The chmem command with the size parameter automatically chooses the best suited
-device or devices when setting memory online or offline. The device size depends
-on the hypervisor and on the amount of total online and offline memory.
-.
-.
-.SH OPTIONS
-.TP
-.BR \-a ", " \-\-all
-List each individual memory block, instead of combining memory blocks with
-similar attributes.
-.
-.TP
-.BR \-h ", " \-\-help
-Print a short help text, then exit.
-.
-.TP
-.BR \-v ", " \-\-version
-Print the version number, then exit.
-.
-.
-.SH SEE ALSO
-.BR chmem (8)

zconf/qeth/Makefile

@@ -2,7 +2,7 @@ include ../../common.mak
 
 all: lsqeth
 
-libs = $(rootdir)/libutil/libutil.a
+libs = $(rootdir)/libvmcp/libvmcp.a $(rootdir)/libutil/libutil.a
 
 lsqeth: lsqeth.o misc.o $(libs)
 

zconf/qeth/lsqeth.c

@@ -37,6 +37,7 @@
 #include "lib/util_rec.h"
 #include "lib/util_scandir.h"
 #include "lib/zt_common.h"
+#include "lib/vmcp.h"
 
 #include "misc.h"
 
@@ -44,15 +45,6 @@
 #define MAX_ID_LENGTH		10
 #define PAGE_SIZE		4096
 
-/*
- * Constants for CP call (taken from vmcp.h)
- */
-#define VMCP_DEVICE_NODE "/dev/vmcp"
-#define VMCP_GETCODE _IOR(0x10, 1, int)
-#define VMCP_SETBUF _IOW(0x10, 2, int)
-#define VMCP_GETSIZE _IOR(0x10, 3, int)
-#define CP_BUF_SIZE	8192
-
 /*
  * Private data
  */
@@ -197,32 +189,38 @@ static void ethtool_checksumming(char *buf, const char *if_name)
  */
 static void exec_cp(char **argz, size_t *argz_len, const char *fmt, ...)
 {
-	int fd, response_code, response_size, rc;
-	static const int buf_size = CP_BUF_SIZE;
-	char *buf, *command;
+	struct vmcp_parm cp;
+	char *command;
 	va_list ap;
+	int rc;
 
-	fd = open(VMCP_DEVICE_NODE, O_RDWR);
-	if (fd == -1)
-		errx(EXIT_FAILURE, "Could not open device %s", VMCP_DEVICE_NODE);
-	if (ioctl(fd, VMCP_SETBUF, &buf_size) == -1)
-		errx(EXIT_FAILURE, "Could not set buffer size");
 	UTIL_VASPRINTF(&command, fmt, ap);
-	if (write(fd, command, strlen(command)) == -1)
-		errx(EXIT_FAILURE, "Could not issue CP command");
+	cp.cpcmd = command;
+	cp.do_upper = false;
+	cp.buffer_size = VMCP_DEFAULT_BUFSZ;
+	rc = vmcp(&cp);
 	free(command);
-	if (ioctl(fd, VMCP_GETCODE, &response_code) == -1)
+
+	switch (rc) {
+	case VMCP_ERR_OPEN:
+		errx(EXIT_FAILURE, "Could not open device %s", VMCP_DEVICE_NODE);
+	case VMCP_ERR_SETBUF:
+		errx(EXIT_FAILURE, "Could not set buffer size");
+	case VMCP_ERR_GETCODE:
 		errx(EXIT_FAILURE, "Could not query return code");
-	if (ioctl(fd, VMCP_GETSIZE, &response_size) == -1)
+	case VMCP_ERR_GETSIZE:
 		errx(EXIT_FAILURE, "Could not query response size");
-	buf = util_malloc(buf_size);
-	rc = misc_read_buf(fd, buf, buf_size);
-	if (rc == -1)
+	case VMCP_ERR_WRITE:
+		errx(EXIT_FAILURE, "Could not issue CP command");
+	case VMCP_ERR_READ:
 		errx(EXIT_FAILURE, "Could not read CP response");
-	rc = argz_create_sep(buf, '\n', argz, argz_len);
+	case VMCP_ERR_TOOSMALL:
+		break;		/* Truncated CP response treated as good */
+	}
+	rc = argz_create_sep(cp.response, '\n', argz, argz_len);
 	if (rc)
 		errx(EXIT_FAILURE, "Memory allocation error for CP response processing");
-	free(buf);
+	free(cp.response);
 }
 
 /*

zconf/zcrypt/chzcrypt.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 CHZCRYPT 8 "AUG 2008" "s390-tools"
+.TH CHZCRYPT 8 "OCT 2017" "s390-tools"
 .SH NAME
 chzcrypt \- modify zcrypt configuration
 .SH SYNOPSIS
@@ -57,6 +57,7 @@ Set all available cryptographic device(s) online or offline.
 .B <device id>
 Specifies a cryptographic device which will be set either online or offline.
 The device can either be a card device or a queue device.
+A queue device can only get switched online when the providing card is online.
 
 Please note that the card device and queue device representation are both
 in hexadecimal notation.
@@ -95,7 +96,7 @@ Print version information and exit.
 .B chzcrypt -e 0 1 12
 Will set the cryptographic card devices 0, 1 and 12 online.
 .TP
-.B chzcrypt -e 01.0038
+.B chzcrypt -e 10.0038
 Will set the cryptographic device '10.0038' respectively card id 16
 (0x10) with domain 56 (0x38) online.
 .TP

zconf/zcrypt/lszcrypt.8

@@ -10,7 +10,7 @@
 .\"   nroff -man lszcrypt.8
 .\" to process this source
 .\"
-.TH LSZCRYPT 8 "AUG 2008" "s390-tools"
+.TH LSZCRYPT 8 "OCT 2017" "s390-tools"
 .SH NAME
 lszcrypt \- display zcrypt device and configuration information
 .SH SYNOPSIS
@@ -85,6 +85,13 @@ EP11 Secure Key
 .IP "o"
 Long RNG
 .RE
+
+.RS 8
+The CCA Secure Key capability may be limited by a hypervisor
+layer. The remarks 'full function set' or 'restricted function set' may
+reflect this. For details about these limitations please check the
+hypervisor documentation.
+.RE
 .TP 8
 .B -d, --domains
 Shows the usage and control domains of the cryptographic devices.

zconf/zcrypt/lszcrypt.c

@@ -42,11 +42,19 @@ struct lszcrypt_l *lszcrypt_l = &l;
 /*
  * Card types
  */
-#define MASK_APSC	0x80000000
-#define MASK_RSA4K	0x60000000
-#define MASK_COPRO	0x10000000
-#define MASK_ACCEL	0x08000000
-#define MASK_EP11	0x04000000
+#define MASK_APSC	    0x80000000
+#define MASK_RSA4K	    0x60000000
+#define MASK_COPRO	    0x10000000
+#define MASK_ACCEL	    0x08000000
+#define MASK_EP11	    0x04000000
+
+/*
+ * Classification
+ */
+#define MASK_CLASS_FULL	      0x00800000
+#define CLASS_FULL            "full function set"
+#define MASK_CLASS_STATELESS  0x00400000
+#define CLASS_STATELESS       "restricted function set"
 
 /*
  * Program configuration
@@ -226,7 +234,7 @@ static void show_capability(const char *id_str)
 {
 	unsigned long func_val;
 	long hwtype, id;
-	char *p, *ap, *dev, card[16];
+	char *p, *ap, *dev, card[16], cbuf[256];
 
 	/* check if ap driver is available */
 	ap = util_path_sysfs("bus/ap");
@@ -250,6 +258,11 @@ static void show_capability(const char *id_str)
 		printf("Detailed capability information for %s (hardware type %ld) is not available.\n", card, hwtype);
 		return;
 	}
+	cbuf[0] = '\0';
+	if (func_val & MASK_CLASS_FULL)
+		snprintf(cbuf, sizeof(cbuf), "%s", CLASS_FULL);
+	else if (func_val & MASK_CLASS_STATELESS)
+		snprintf(cbuf, sizeof(cbuf), "%s", CLASS_STATELESS);
 	printf("%s provides capability for:\n", card);
 	switch (hwtype) {
 	case 6:
@@ -262,11 +275,15 @@ static void show_capability(const char *id_str)
 	case 7:
 	case 9:
 		printf("%s\n", CAP_RSA4K);
-		printf("%s\n", CAP_CCA);
+		if (cbuf[0])
+			printf("%s (%s)\n", CAP_CCA, cbuf);
+		else
+			printf("%s\n", CAP_CCA);
 		printf("%s", CAP_RNG);
 		break;
 	case 10:
 	case 11:
+	case 12:
 		if (func_val & MASK_ACCEL) {
 			if (func_val & MASK_RSA4K)
 				printf("%s", CAP_RSA4K);
@@ -274,12 +291,14 @@ static void show_capability(const char *id_str)
 				printf("%s", CAP_RSA2K);
 		} else if (func_val & MASK_COPRO) {
 			printf("%s\n", CAP_RSA4K);
-			printf("%s\n", CAP_CCA);
+			if (cbuf[0])
+				printf("%s (%s)\n", CAP_CCA, cbuf);
+			else
+				printf("%s\n", CAP_CCA);
 			printf("%s", CAP_RNG);
 		} else if (func_val & MASK_EP11) {
 			printf("%s", CAP_EP11);
 		} else {
-
 			printf("Detailed capability information for %s (hardware type %ld) is not available.", card, hwtype);
 		}
 		break;

zdev/Makefile

@@ -8,6 +8,7 @@ install: all
 	$(MAKE) -C src install
 	$(MAKE) -C man install
 	$(MAKE) -C dracut install
+	$(MAKE) -C initramfs install
 
 clean:
 	$(MAKE) -C src clean

zdev/dracut/95zdev/module-setup.sh

@@ -9,7 +9,8 @@
 # 95zdev/module_setup.sh
 #   This module installs configuration files (udev rules and modprobe.conf
 #   files) required to enable the root device on s390. It will only work when
-#   the root device was configured using the chzdev tool.
+#   the root device was configured using the chzdev tool. In addition,
+#   a hook is installed to parse rd.zdev= kernel parameters.
 #
 
 check() {
@@ -29,22 +30,27 @@ depends() {
 }
 
 installkernel() {
-    local _modules=$(lszdev --by-path / --columns MODULES --no-headings)
-
-    [ ! -z "$_modules" ] && instmods $_modules
+    # Add modules for all device types supported by chzdev (required for
+    # auto-configuration)
+    instmods lcs qeth qeth_l2 qeth_l3 dasd_mod dasd_eckd_mod dasd_fba_mod \
+	     dasd_diag_mod zfcp
 }
 
 install() {
-    local _tempfile=$(mktemp --tmpdir dracut-zdev.XXXXXX)
+    local _tempfile
 
-    if chzdev --export - --persistent --by-path / >/dev/null 2>&1 ; then
-        # Use persistent configuration
-        chzdev --export "$_tempfile" --persistent --by-path / --quiet --type
-    else
-        # Use active configuration
-        chzdev --export "$_tempfile" --active --by-path / --quiet --type
-        sed -i -e 's/active/persistent/g' "$_tempfile"
-    fi
+    # Ensure that required tools are available
+    inst_multiple chzdev lszdev vmcp
+
+    # Hook to parse zdev kernel parameter
+    inst_hook cmdline 95 "$moddir/parse-zdev.sh"
+
+    # Obtain early + root device configuration
+    _tempfile=$(mktemp --tmpdir dracut-zdev.XXXXXX)
+    chzdev --export "$_tempfile" --persistent --by-path / --quiet \
+	   --type 2>/dev/null
+    chzdev --export - --persistent --by-attrib "zdev:early=1" --quiet \
+	   --type 2>/dev/null >> "$_tempfile"
 
     # Apply via --import to prevent other devices from being configured
     chzdev --import "$_tempfile" --persistent --base "/etc=$initdir/etc" \

zdev/dracut/95zdev/parse-zdev.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# Copyright IBM Corp. 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.
+#
+# 95zdev/parse-zdev.sh
+#   Parse the kernel command line for rd.zdev kernel parameters. These
+#   parameters are evaluated and used to configure z Systems specific devices.
+#
+# Format:
+#   rd.zdev=no-auto
+#
+#     where
+#
+#   no-auto:       Indicates that firmware-provided I/O configuration data
+#                  should not be applied.
+#
+
+zdev_fw_file="/sys/firmware/sclp_sd/config/data"
+zdev_base_args="--force --yes --no-root-update --no-settle --auto-conf --quiet"
+
+if [ -e "$zdev_fw_file" ] ; then
+    zdev_auto=1
+else
+    zdev_auto=0
+fi
+
+for zdev_arg in $(getargs rd.zdev); do
+    if [ "$zdev_arg" = "no-auto" ] ; then
+        zdev_auto=0
+    fi
+done
+
+if [ $zdev_auto -eq 1 ] ; then
+    chzdev --import "$zdev_fw_file" $zdev_base_args
+fi

zdev/dracut/Makefile

@@ -11,11 +11,14 @@ ZDEVDIR := 95zdev
 # performs the following functions when dracut is run:
 #
 #  - copy the persistent root device configuration to the initial ram disk
+#  - install a boot-time hook to apply firmware-provided configuration data
+#    to the system
 #
 ifeq ($(HAVE_DRACUT),1)
 install:
 	$(INSTALL) -m 755 -d $(DESTDIR)$(MODDIR)
 	$(INSTALL) -m 755 -d $(DESTDIR)$(MODDIR)/$(ZDEVDIR)
 	$(INSTALL) -m 755 $(ZDEVDIR)/module-setup.sh \
+		$(ZDEVDIR)/parse-zdev.sh \
 		$(DESTDIR)$(MODDIR)/$(ZDEVDIR)/
 endif

zdev/include/attrib.h

@@ -189,6 +189,7 @@ struct value_map {
  *              in the persistent configuration
  * @nounload:   (Device type attributes only) This attribute can be set while
  *              the corresponding kernel module remains loaded.
+ * @internal:   This attribute only affects internal handling
  * @order:	A number indicating the order in which to apply attribute
  * @order_cmp:  A function determining if a setting for this attribute should
  *              be applied before (-1) or after (1) another setting, or
@@ -216,6 +217,7 @@ struct attrib {
 	unsigned int activerem	:1;
 	unsigned int defunset	:1;
 	unsigned int nounload	:1;
+	unsigned int internal	:1;
 
 	/* Optional */
 	int order;

zdev/include/dasd.h

@@ -11,7 +11,10 @@
 #define DASD_H
 
 struct devtype;
+struct subtype;
 
 extern struct devtype dasd_devtype;
+extern struct subtype dasd_subtype_eckd;
+extern struct subtype dasd_subtype_fba;
 
 #endif /* DASD_H */