New release s390-tools-2.4.0

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

.gitignore

@@ -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

@@ -96,6 +96,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,6 +1,42 @@
 Release history for s390-tools (MIT version)
 --------------------------------------------
 
+ * __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

Makefile

@@ -3,7 +3,7 @@ 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 \

README.md

@@ -264,6 +264,7 @@ build options:
 | pfm            | `HAVE_PFM`         | cpacfstats                            |
 | net-snmp       | `HAVE_SNMP`        | osasnmpd                              |
 | glibc-static   | `HAVE_LIBC_STATIC` | zfcpdump                              |
+| openssl        | `HAVE_OPENSSL`     | zkey                                  |
 
 This table lists additional build or install options:
 
@@ -366,3 +367,12 @@ 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). Tip: you may skip the zkey build by adding
+  `HAVE_OPENSSL=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            = 2
+RELEASE            = 4
 PATCHLEVEL         = 0
 DISTRELEASE        = build-$(shell date +%Y%m%d)
 S390_TOOLS_RELEASE = $(VERSION).$(RELEASE).$(PATCHLEVEL)-$(DISTRELEASE)
@@ -218,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 $@
@@ -328,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)
 .

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);
 }
@@ -497,30 +498,15 @@ static void get_device_name(char *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));
 }
 
 /*
@@ -534,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 "
@@ -576,16 +562,15 @@ static void check_layout(dasdfmt_info_t *info, unsigned int intensity)
  */
 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");
@@ -775,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) {
@@ -788,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;
@@ -804,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);
 
@@ -827,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;
@@ -965,7 +953,7 @@ static int dasdfmt_get_volser(char *devname, dasd_information2_t *dasd_info,
 	unsigned int blksize;
 	volume_label_t vlabel;
 
-	get_blocksize(&blksize);
+	get_blocksize(devname, &blksize);
 
 	if ((strncmp(dasd_info->type, "ECKD", 4) == 0) &&
 	    !dasd_info->FBA_layout) {
@@ -992,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");
@@ -1036,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,
@@ -1071,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... ");
@@ -1104,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");
@@ -1225,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;
@@ -1260,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();
 }
 
 /*
@@ -1281,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);
 
@@ -1302,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();
 }
 
 /*
@@ -1318,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");
@@ -1344,25 +1352,20 @@ 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, char *devname,
@@ -1371,7 +1374,7 @@ static void do_format_dasd(dasdfmt_info_t *info, char *devname,
 			   unsigned int heads)
 {
 	char inp_buffer[5];
-	int count;
+	int count, err;
 
 	p->start_unit = 0;
 
@@ -1448,9 +1451,10 @@ static void do_format_dasd(dasdfmt_info_t *info, char *devname,
 			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");
 		}
@@ -1465,7 +1469,6 @@ int main(int argc, char *argv[])
 	volume_label_t vlabel;
 	char old_volser[7];
 
-	char dev_filename[PATH_MAX];
 	char str[ERR_LENGTH];
 	char buf[7];
 
@@ -1636,18 +1639,17 @@ int main(int argc, char *argv[])
 
 	get_device_name(dev_filename, optind, argc, argv);
 
-	filedes = open(dev_filename, O_RDWR);
-	if (filedes == -1)
-		ERRMSG_EXIT(EXIT_FAILURE, "%s: Unable to open device %s: %s\n",
-			    prog_name, dev_filename, 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);
 	}
@@ -1686,9 +1688,5 @@ int main(int argc, char *argv[])
 		do_format_dasd(&info, dev_filename, &vlabel,
 			       &format_params, cylinders, heads);
 
-	if (close(filedes) != 0)
-		ERRMSG("%s: error during close: %s\ncontinuing...\n",
-		       prog_name, strerror(errno));
-
 	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                                          *
  ****************************************************************************/

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;
@@ -555,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;
 	}
@@ -573,7 +516,7 @@ 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) {
+			    MAX(strlen(stat_dev), strlen(readbuf) - 1)) == 0) {
 			rc = snprintf(*uidfile, RD_BUFFER_SIZE,
 				      "/sys/block/%s/device/uid",
 				      dir_entry->d_name);
@@ -591,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;
@@ -635,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;
@@ -661,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);
 	}
 
@@ -693,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;
@@ -715,12 +658,11 @@ int main(int argc, char * argv[])
 				if (!srchuid)
 					break;
 			}
-			if (srchuid) {
+			if (srchuid)
 				srchuid[0] = '\0';
-			}
-			if (export) {
+			if (export)
 				printf("ID_UID=%s\n", readbuf);
-			} else
+			else
 				printf("%s\n", readbuf);
 			if (!print_vlabel && !print_extended_uid)
 				goto out;
@@ -729,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;
@@ -768,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/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/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;

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/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);

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/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;
 }

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);

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

@@ -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

@@ -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)
@@ -471,6 +474,8 @@ VM_CMDS="q userid\
   :q privclass\
   :q cplevel\
   :q cpservice\
+  :q cpprot user\
+  :q specex\
   :q ssi\
   :q cpus\
   :q srm\
@@ -509,6 +514,7 @@ VM_CMDS="q userid\
   :q cache\
   :q nic\
   :q pav\
+  :q proc\
   :q proc topology\
   :q mt\
   :q qioass\
@@ -825,6 +831,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
@@ -832,7 +857,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}")
@@ -1117,6 +1142,8 @@ collect_domain_xml
 
 collect_docker
 
+collect_nvme
+
 post_processing
 
 create_package

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

@@ -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/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/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

@@ -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

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

@@ -29,13 +29,21 @@ depends() {
 }
 
 installkernel() {
-    local _modules=$(lszdev --by-path / --columns MODULES --no-headings)
+    local _modules=$(lszdev --by-path / --columns MODULES --no-headings 2>/dev/null)
 
+    [ -z "$_modules" ] && return 0
     [ ! -z "$_modules" ] && instmods $_modules
 }
 
 install() {
-    local _tempfile=$(mktemp --tmpdir dracut-zdev.XXXXXX)
+    local _tempfile
+
+    # Exit early if root device type is unknown
+    if ! lszdev --by-path / >/dev/null 2>&1 ; then
+        return 0
+    fi
+
+    _tempfile=$(mktemp --tmpdir dracut-zdev.XXXXXX)
 
     if chzdev --export - --persistent --by-path / >/dev/null 2>&1 ; then
         # Use persistent configuration

zdsfs/Makefile

@@ -3,7 +3,8 @@ include ../common.mak
 libs =	$(rootdir)/libzds/libzds.a \
 	$(rootdir)/libvtoc/libvtoc.a \
 	$(rootdir)/libu2s/libu2s.a \
-	$(rootdir)/libutil/libutil.a
+	$(rootdir)/libutil/libutil.a \
+	$(rootdir)/libdasd/libdasd.a
 
 ifeq (${HAVE_FUSE},0)
 

zdump/Makefile

@@ -41,12 +41,16 @@ all: check_dep_fuse check_dep_zlib zgetdump
 
 OBJECTS = zgetdump.o opts.o zg.o \
 	  dfi.o dfi_vmcoreinfo.o \
-	  dfi_lkcd.o dfi_elf.o dfi_s390.o dfi_s390mv.o dfi_s390tape.o \
-	  dfi_kdump.o dfi_devmem.o \
-	  dfo.o dfo_elf.o dfo_s390.o \
+	  dfi_lkcd.o dfi_elf.o \
+	  dfi_s390.o dfi_s390_ext.o\
+	  dfi_s390mv.o dfi_s390mv_ext.o \
+	  dfi_s390tape.o dfi_kdump.o \
+	  dfi_devmem.o dfo.o \
+	  dfo_elf.o dfo_s390.o \
 	  df_s390.o \
-	  dt.o dt_s390sv.o dt_s390mv.o dt_scsi.o \
-	  stdout.o
+	  dt.o dt_s390sv.o dt_s390sv_ext.o \
+	  dt_s390mv.o dt_s390mv_ext.o \
+	  dt_scsi.o stdout.o \
 
 ifeq ("$(HAVE_FUSE)","0")
 FUSE_CFLAGS = -DHAVE_FUSE=0 -D_FILE_OFFSET_BITS=64

zdump/df_s390.c

@@ -3,7 +3,7 @@
  *
  * S390 dump format common functions
  *
- * Copyright IBM Corp. 2001, 2017
+ * Copyright IBM Corp. 2001, 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.
@@ -41,7 +41,7 @@ void df_s390_cpu_info_add(struct df_s390_hdr *hdr, u64 addr_max)
 {
 	unsigned int i;
 
-	if (hdr->version < 5) {
+	if (hdr->version < 5 && hdr->magic == DF_S390_MAGIC) {
 		/* No Prefix registers in header */
 		hdr->cpu_cnt = 0;
 		dfi_cpu_info_init(DFI_CPU_CONTENT_NONE);
@@ -85,11 +85,14 @@ void df_s390_hdr_add(struct df_s390_hdr *hdr)
 	dfi_arch_set(df_s390_to_dfi_arch(hdr->arch));
 	if (hdr->cpu_id)
 		dfi_attr_cpu_id_set(hdr->cpu_id);
-	if (hdr->version >= 3 && hdr->mem_size_real)
-		dfi_attr_mem_size_real_set(hdr->mem_size_real);
-	if (hdr->version >= 2 && hdr->build_arch)
+	if ((hdr->version >= 2 || hdr->magic == DF_S390_MAGIC_EXT) &&
+	    hdr->build_arch)
 		dfi_attr_build_arch_set(df_s390_to_dfi_arch(hdr->build_arch));
-	if (hdr->version >= 5 && hdr->real_cpu_cnt)
+	if ((hdr->version >= 3 || hdr->magic == DF_S390_MAGIC_EXT) &&
+	    hdr->mem_size_real)
+		dfi_attr_mem_size_real_set(hdr->mem_size_real);
+	if ((hdr->version >= 5 || hdr->magic == DF_S390_MAGIC_EXT) &&
+	    hdr->real_cpu_cnt)
 		dfi_attr_real_cpu_cnt_set(hdr->real_cpu_cnt);
 }
 
@@ -124,8 +127,38 @@ int df_s390_em_verify(struct df_s390_em *em, struct df_s390_hdr *hdr)
 void df_s390_dumper_read(struct zg_fh *fh, int blk_size,
 			 struct df_s390_dumper *dumper)
 {
-	int offset = DF_S390_MAGIC_BLK_ECKD * blk_size;
+	int bytes_to_read, offset = DF_S390_MAGIC_BLK_ECKD * blk_size;
 
+	/*
+	 * First read 3 fields at the start of the dumper. The magic number,
+	 * version and one extra field for the old dumper case (no magic
+	 * number, checking for specific assembler instructions).
+	 */
+	bytes_to_read = offsetof(struct df_s390_dumper, force);
 	zg_seek(fh, offset, ZG_CHECK);
-	zg_read(fh, dumper, sizeof(*dumper), ZG_CHECK);
+	zg_read(fh, dumper, bytes_to_read, ZG_CHECK);
+	if (memcmp(dumper->magic, OLD_DUMPER_HEX_INSTR1, 4) == 0 &&
+	    memcmp(&dumper->size, OLD_DUMPER_HEX_INSTR2, 2) == 0)
+		/* We found basr r13,0 (old dumper) */
+		dumper->version = 0;
+	switch (dumper->version) {
+	case 1:
+		if (strncmp(dumper->magic, DF_S390_DUMPER_MAGIC_EXT, 7) == 0 ||
+		    strncmp(dumper->magic, DF_S390_DUMPER_MAGIC_MV_EXT, 7) == 0)
+			dumper->size = DF_S390_DUMPER_SIZE_V3;
+		else
+			dumper->size = DF_S390_DUMPER_SIZE_V1;
+		break;
+	case 2:
+		dumper->size = DF_S390_DUMPER_SIZE_V2;
+		break;
+	case 3:
+	default:
+		dumper->size = DF_S390_DUMPER_SIZE_V3;
+	}
+	/* Read force and mem fields in the end of the dumper */
+	bytes_to_read = sizeof(dumper->force) + sizeof(dumper->mem);
+	offset += dumper->size - bytes_to_read;
+	zg_seek(fh, offset, ZG_CHECK);
+	zg_read(fh, &dumper->force, bytes_to_read, ZG_CHECK);
 }

zdump/df_s390.h

@@ -3,7 +3,7 @@
  *
  * S390 dump format common functions
  *
- * Copyright IBM Corp. 2001, 2017
+ * Copyright IBM Corp. 2001, 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.
@@ -16,6 +16,7 @@
 #include "zg.h"
 
 #define DF_S390_MAGIC		0xa8190173618f23fdULL
+#define DF_S390_MAGIC_EXT	0xa8190173618f23feULL
 #define DF_S390_HDR_SIZE	0x1000
 #define DF_S390_EM_SIZE		16
 #define DF_S390_EM_STR		"DUMP_END"
@@ -68,6 +69,16 @@ struct df_s390_em {
 	u64	tod;
 } __attribute__((packed));
 
+/*
+ * Segment header for s390 extended dump format
+ */
+struct df_s390_dump_segm_hdr {
+	u64	start;
+	u64	len;
+	u64	stop_marker;
+	u8	reserved[0x1000 - 24];
+} __attribute__((packed));
+
 /*
  * Convert DFI arch to s390 arch
  */
@@ -84,96 +95,31 @@ static inline enum dfi_arch df_s390_to_dfi_arch(enum df_s390_arch df_s390_arch)
 	return df_s390_arch == DF_S390_ARCH_64 ? DFI_ARCH_64 : DFI_ARCH_32;
 }
 
-/*
- * Dump tool structure (version 1)
- */
-struct df_s390_dumper_v1 {
-	char	code[0xff7 - 0x8];
-	u8	force;
-	u64	mem;
-} __attribute__ ((packed));
-
-#define DF_S390_DUMPER_SIZE_V1	0x1000
-
-/*
- * Dump tool structure (version 2)
- */
-struct df_s390_dumper_v2 {
-	char	code[0x1ff7 - 0x8];
-	u8	force;
-	u64	mem;
-} __attribute__ ((packed));
-
-#define DF_S390_DUMPER_SIZE_V2	0x2000
-
-/*
- * Dump tool structure (version 3 and 4)
- */
-struct df_s390_dumper_v3 {
-	char	code[0x2ff7 - 0x8];
-	u8	force;
-	u64	mem;
-} __attribute__ ((packed));
-
-#define DF_S390_DUMPER_SIZE_V3	0x3000
+#define DF_S390_DUMPER_SIZE_V1		0x1000
+#define DF_S390_DUMPER_SIZE_V2		0x2000
+#define DF_S390_DUMPER_SIZE_V3		0x3000
+#define DF_S390_DUMPER_MAGIC32		"ZECKD31"
+#define DF_S390_DUMPER_MAGIC64		"ZECKD64"
+#define DF_S390_DUMPER_MAGIC_EXT	"XECKD64"
+#define DF_S390_DUMPER_MAGIC32_FBA	"ZDFBA31"
+#define DF_S390_DUMPER_MAGIC64_FBA	"ZDFBA64"
+#define DF_S390_DUMPER_MAGIC_FBA_EXT	"XDFBA64"
+#define DF_S390_DUMPER_MAGIC_MV		"ZMULT64"
+#define DF_S390_DUMPER_MAGIC_MV_EXT	"XMULT64"
+#define OLD_DUMPER_HEX_INSTR1 "\x0d\x10\x47\xf0" /* BASR + 1st halfword of BC */
+#define OLD_DUMPER_HEX_INSTR2 "\x0d\xd0" /* BASR 13,0 */
 
 /*
  * Dump tool structure
  */
 struct df_s390_dumper {
-	char		magic[7];
-	u8		version;
-	union {
-		struct df_s390_dumper_v1	v1;
-		struct df_s390_dumper_v2	v2;
-		struct df_s390_dumper_v3	v3;
-	} d;
+	char	magic[7];
+	u8	version;
+	u32	size;
+	u8	force;
+	u64	mem;
 } __attribute__ ((packed));
 
-/*
- * Dumper member access helpers
- */
-#define df_s390_dumper_magic(dumper) ((dumper).magic)
-#define df_s390_dumper_version(dumper) ((dumper).version)
-static inline u64 df_s390_dumper_mem(struct df_s390_dumper *dumper)
-{
-	switch (dumper->version) {
-	case 1:
-		return dumper->d.v1.mem;
-	case 2:
-		return dumper->d.v2.mem;
-	case 3:
-	default:
-		return dumper->d.v3.mem;
-	}
-}
-
-static inline u8 df_s390_dumper_force(struct df_s390_dumper *dumper)
-{
-	switch (dumper->version) {
-	case 1:
-		return dumper->d.v1.force;
-	case 2:
-		return dumper->d.v2.force;
-	case 3:
-	default:
-		return dumper->d.v3.force;
-	}
-}
-
-static inline unsigned long df_s390_dumper_size(struct df_s390_dumper *dumper)
-{
-	switch (dumper->version) {
-	case 1:
-		return 0x1000;
-	case 2:
-		return 0x2000;
-	case 3:
-	default:
-		return 0x3000;
-	}
-}
-
 /*
  * s390 dump helpers
  */
@@ -185,10 +131,14 @@ extern void df_s390_dumper_read(struct zg_fh *fh, int32_t blk_size,
 				struct df_s390_dumper *dumper);
 
 /*
- * DASD multi-volume dumper functions
+ * DASD dt and dfi functions
  */
-extern int dt_s390mv_init(void);
-extern void dt_s390mv_exit(void);
+extern int dt_s390sv_init_gen(bool extended);
+extern int dt_s390mv_init_gen(bool extended);
 extern void dt_s390mv_info(void);
 
+extern int dfi_s390_init_gen(bool extended);
+extern int dfi_s390mv_init_gen(bool extended);
+extern void dfi_s390mv_info(void);
+
 #endif /* DF_S390_H */

zdump/dfi.c

@@ -3,7 +3,7 @@
  *
  * Generic input dump format functions (DFI - Dump Format Input)
  *
- * Copyright IBM Corp. 2001, 2017
+ * Copyright IBM Corp. 2001, 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,9 @@
 static struct dfi *dfi_vec[] = {
 	&dfi_s390tape,
 	&dfi_devmem,
+	&dfi_s390mv_ext,
 	&dfi_s390mv,
+	&dfi_s390_ext,
 	&dfi_s390,
 	&dfi_lkcd,
 	&dfi_elf,
@@ -70,6 +72,7 @@ struct attr {
 	u32			*real_cpu_cnt;
 	struct new_utsname	*utsname;
 	char			*dump_method;
+	u64			*file_size;
 };
 
 /*
@@ -149,12 +152,46 @@ static void mem_update(struct mem *mem)
 static void mem_map_print(void)
 {
 	struct dfi_mem_chunk *mem_chunk;
+	u64 print_start = 0, print_end = 0;
+	const char *zero_str;
+	u32 volnr = 0;
 
 	STDERR("\nMemory map:\n");
-	dfi_mem_chunk_iterate(mem_chunk) {
-		STDERR("  %016llx - %016llx (%llu MB)\n", mem_chunk->start,
-		       mem_chunk->end, TO_MIB(mem_chunk->size));
+	/*
+	 * Print each memory chunk if verbose specified
+	 */
+	if (g.opts.verbose_specified) {
+		dfi_mem_chunk_iterate(mem_chunk) {
+			zero_str = "";
+			if (mem_chunk->read_fn == dfi_mem_chunk_read_zero)
+				zero_str = " zeroes";
+			STDERR("  %016llx - %016llx (%llu MB%s)\n",
+			       mem_chunk->start, mem_chunk->end,
+			       TO_MIB(mem_chunk->size), zero_str);
+		}
+		return;
 	}
+	/*
+	 * Merge adjacent memory chunks from the same volume
+	 */
+	dfi_mem_chunk_iterate(mem_chunk) {
+		if (print_end == 0) {
+			print_start = mem_chunk->start;
+			print_end = mem_chunk->end;
+			volnr = mem_chunk->volnr;
+			continue;
+		}
+		if (mem_chunk->start != print_end + 1 ||
+		    mem_chunk->volnr != volnr) {
+			STDERR("  %016llx - %016llx (%llu MB)\n", print_start,
+			       print_end, TO_MIB(print_end - print_start + 1));
+			print_start = mem_chunk->start;
+			volnr = mem_chunk->volnr;
+		}
+		print_end = mem_chunk->end;
+	}
+	STDERR("  %016llx - %016llx (%llu MB)\n", print_start,
+	       print_end, TO_MIB(print_end - print_start + 1));
 }
 
 /*
@@ -226,6 +263,9 @@ void dfi_info_print(void)
 	if (l.attr.mem_size_real)
 		STDERR("  Real memory range..: %lld MB\n",
 		      TO_MIB(*l.attr.mem_size_real));
+	if (l.attr.file_size)
+		STDERR("  Dump file size.....: %lld MB\n",
+		      TO_MIB(*l.attr.file_size));
 	if (dfi_mem_range())
 		mem_map_print();
 	if (l.dfi->info_dump) {
@@ -351,9 +391,27 @@ void dfi_mem_chunk_virt_add(u64 start, u64 size, void *data,
 			    dfi_mem_chunk_read_fn read_fn,
 			    dfi_mem_chunk_free_fn free_fn)
 {
+	if (size == 0)
+		return;
 	mem_chunk_create(&l.mem_virt, start, size, data, read_fn, free_fn);
 }
 
+/*
+ * Add memory chunk with volume index
+ */
+void dfi_mem_chunk_add_vol(u64 start, u64 size, void *data,
+			   dfi_mem_chunk_read_fn read_fn,
+			   dfi_mem_chunk_free_fn free_fn,
+			   u32 volnr)
+{
+	if (size == 0)
+		return;
+	mem_chunk_create(&l.mem_phys, start, size, data, read_fn, free_fn);
+	mem_chunk_create(&l.mem_virt, start, size, data, read_fn, free_fn);
+	l.mem_virt.chunk_cache->volnr = volnr;
+
+}
+
 /*
  * Add memory chunk
  */
@@ -361,8 +419,16 @@ void dfi_mem_chunk_add(u64 start, u64 size, void *data,
 		       dfi_mem_chunk_read_fn read_fn,
 		       dfi_mem_chunk_free_fn free_fn)
 {
-	mem_chunk_create(&l.mem_phys, start, size, data, read_fn, free_fn);
-	mem_chunk_create(&l.mem_virt, start, size, data, read_fn, free_fn);
+	dfi_mem_chunk_add_vol(start, size, data, read_fn, free_fn, 0);
+}
+
+/*
+ * Read zero pages
+ */
+void dfi_mem_chunk_read_zero(struct dfi_mem_chunk *UNUSED(mem_chunk),
+			     u64 UNUSED(off), void *buf, u64 cnt)
+{
+	memset(buf, 0, cnt);
 }
 
 /*
@@ -401,6 +467,16 @@ struct dfi_mem_chunk *dfi_mem_chunk_first(void)
 	return util_list_start(&l.mem_virt.chunk_list);
 }
 
+/*
+ * Return last memory chunk
+ */
+struct dfi_mem_chunk *dfi_mem_chunk_last(void)
+{
+	if (util_list_is_empty(&l.mem_virt.chunk_list))
+		return NULL;
+	return util_list_end(&l.mem_virt.chunk_list);
+}
+
 /*
  * Return next memory chunk
  */
@@ -678,7 +754,7 @@ struct new_utsname *dfi_attr_utsname(void)
 }
 
 /*
- * Attribute: dump method
+ * Attribute: Dump method
  */
 void dfi_attr_dump_method_set(char *dump_method)
 {
@@ -704,6 +780,21 @@ u64 *dfi_attr_mem_size_real(void)
 	return l.attr.mem_size_real;
 }
 
+/*
+ * Attribute: Dump file size
+ */
+void dfi_attr_file_size_set(u64 file_size)
+{
+	l.attr.file_size = zg_alloc(sizeof(*l.attr.file_size));
+	*l.attr.file_size = file_size;
+}
+
+u64 *dfi_attr_file_size(void)
+{
+	return l.attr.file_size;
+}
+
+
 /*
  * Attribute: Build architecture
  */
@@ -795,7 +886,10 @@ static void lc2cpu_64(struct dfi_cpu *cpu, struct dfi_lowcore_64 *lc)
 	/* Add VX registers if available */
 	if (!dfi_cpu_lc_has_vx_sa(lc))
 		return;
-	dfi_mem_read(lc->vector_save_area_addr, &vx_sa, sizeof(vx_sa));
+	if (dfi_mem_read_rc(lc->vector_save_area_addr, &vx_sa, sizeof(vx_sa))) {
+		STDERR("zgetdump: Vector registers save area is beyond dump memory limit for CPU %d\n", cpu->cpu_id);
+		return;
+	}
 	memcpy(cpu->vxrs_high, &vx_sa[16 * 16], sizeof(cpu->vxrs_high));
 	for (i = 0; i < 16; i++)
 		memcpy(&cpu->vxrs_low[i], &vx_sa[16 * i + 8], sizeof(u64));
@@ -827,6 +921,7 @@ void dfi_cpu_add_from_lc(u32 lc_addr)
 {
 	struct dfi_cpu *cpu = dfi_cpu_alloc();
 
+	cpu->cpu_id = l.cpus.cnt;
 	switch (l.cpus.content) {
 	case DFI_CPU_CONTENT_LC:
 		cpu->prefix = lc_addr;

zdump/dfi.h

@@ -3,7 +3,7 @@
  *
  * Generic input dump format functions (DFI - Dump Format Input)
  *
- * Copyright IBM Corp. 2001, 2017
+ * Copyright IBM Corp. 2001, 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.
@@ -97,6 +97,7 @@ struct dfi_cpu {
 	u32		todpreg;
 	u64		vxrs_low[16];
 	struct dfi_vxrs	vxrs_high[16];
+	u16		cpu_id;
 };
 
 struct dfi_cpu_32 {
@@ -125,7 +126,7 @@ enum dfi_cpu_content {
 };
 
 #define DFI_CPU_CONTENT_FAC_VX	0x00000001
-extern int dfi_cpu_content_fac_check(int falgs);
+extern int dfi_cpu_content_fac_check(int flags);
 extern void dfi_cpu_content_fac_add(int flags);
 
 #define dfi_cpu_iterate(cpu) \
@@ -158,13 +159,18 @@ struct dfi_mem_chunk {
 	u64			start;		/* Start address in memory */
 	u64			end;		/* End address in memory */
 	u64			size;		/* Size of chunk in dump file */
-	u64			out_start;	/* Start offset in dump file */
-	u64			out_end;	/* End offset in dump file */
 	dfi_mem_chunk_read_fn	read_fn;	/* Chunk read callback */
 	dfi_mem_chunk_free_fn	free_fn;	/* Free data callback */
 	void			*data;		/* Data for callback */
+	u32			volnr;		/* Volume id where chunk resides */
 };
 
+extern void dfi_mem_chunk_read_zero(struct dfi_mem_chunk *UNUSED(mem_chunk),
+				    u64 UNUSED(off), void *buf, u64 cnt);
+extern void dfi_mem_chunk_add_vol(u64 start, u64 size, void *data,
+				  dfi_mem_chunk_read_fn read_fn,
+				  dfi_mem_chunk_free_fn free_fn,
+				  u32 volnr);
 extern void dfi_mem_chunk_add(u64 start, u64 size, void *data,
 			      dfi_mem_chunk_read_fn read_fn,
 			      dfi_mem_chunk_free_fn free_fn);
@@ -175,6 +181,7 @@ extern u64 dfi_mem_range(void);
 extern int dfi_mem_range_valid(u64 addr, u64 len);
 extern unsigned int dfi_mem_chunk_cnt(void);
 extern struct dfi_mem_chunk *dfi_mem_chunk_first(void);
+extern struct dfi_mem_chunk *dfi_mem_chunk_last(void);
 extern struct dfi_mem_chunk *dfi_mem_chunk_next(struct dfi_mem_chunk *chunk);
 extern struct dfi_mem_chunk *dfi_mem_chunk_prev(struct dfi_mem_chunk *chunk);
 extern struct dfi_mem_chunk *dfi_mem_chunk_find(u64 addr);
@@ -202,7 +209,10 @@ extern void dfi_attr_dump_method_set(char *dump_method);
 extern char *dfi_attr_dump_method(void);
 
 extern void dfi_attr_mem_size_real_set(u64 mem_size_real);
-extern u64 *dfi_attr_mem_size_real();
+extern u64 *dfi_attr_mem_size_real(void);
+
+extern void dfi_attr_file_size_set(u64 dump_size);
+extern u64 *dfi_attr_file_size(void);
 
 extern void dfi_attr_vol_nr_set(unsigned int vol_nr);
 extern unsigned int *dfi_attr_vol_nr(void);

zdump/dfi_elf.c

@@ -3,7 +3,7 @@
  *
  * ELF core dump input format
  *
- * Copyright IBM Corp. 2001, 2017
+ * Copyright IBM Corp. 2001, 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.
@@ -42,12 +42,16 @@ static int pt_load_add(Elf64_Phdr *phdr)
 		STDERR("Dump file \"%s\" is a user space core dump\n",
 		      g.opts.device);
 	}
-	if (phdr->p_filesz == 0) /* Skip null pt loads */
-		return 0;
-	off_ptr = zg_alloc(sizeof(*off_ptr));
-	*off_ptr = phdr->p_offset;
-	dfi_mem_chunk_add(phdr->p_paddr, phdr->p_filesz, off_ptr,
-			  dfi_elf_mem_chunk_read_fn, zg_free);
+	if (phdr->p_filesz == 0) {
+		/* Add zero memory chunk */
+		dfi_mem_chunk_add(phdr->p_paddr, phdr->p_memsz, NULL,
+				  dfi_mem_chunk_read_zero, NULL);
+	} else {
+		off_ptr = zg_alloc(sizeof(*off_ptr));
+		*off_ptr = phdr->p_offset;
+		dfi_mem_chunk_add(phdr->p_paddr, phdr->p_memsz, off_ptr,
+				  dfi_elf_mem_chunk_read_fn, zg_free);
+	}
 	if (phdr->p_offset + phdr->p_filesz > zg_size(g.fh))
 		return -EINVAL;
 	return 0;

zdump/dfi_s390.c

@@ -26,10 +26,11 @@
 static struct {
 	struct df_s390_hdr	hdr;	/* s390 dump header */
 	struct df_s390_em	em;	/* s390 end marker */
+	bool extended;			/* Extended input dump format */
 } l;
 
 /*
- * S390 mem chunk read callback
+ * s390 mem chunk read callback
  */
 static void dfi_s390_mem_chunk_read(struct dfi_mem_chunk *mem_chunk, u64 off,
 				    void *buf, u64 cnt)
@@ -40,16 +41,32 @@ static void dfi_s390_mem_chunk_read(struct dfi_mem_chunk *mem_chunk, u64 off,
 	zg_read(g.fh, buf, cnt, ZG_CHECK);
 }
 
+/*
+ * s390_ext mem chunk read callback
+ */
+static void dfi_s390_ext_mem_chunk_read(struct dfi_mem_chunk *mem_chunk,
+					u64 off, void *buf, u64 cnt)
+{
+	u64 *mem_chunk_off = mem_chunk->data;
+
+	zg_seek(g.fh, *mem_chunk_off + off, ZG_CHECK);
+	zg_read(g.fh, buf, cnt, ZG_CHECK);
+}
+
+
 /*
  * Read s390 dump header
  */
 static int read_s390_hdr(void)
 {
+	u64 magic_number;
+
+	magic_number = l.extended ? DF_S390_MAGIC_EXT : DF_S390_MAGIC;
 	if ((zg_type(g.fh) == ZG_TYPE_FILE) && (zg_size(g.fh) < sizeof(l.hdr)))
 		return -ENODEV;
 	if (zg_read(g.fh, &l.hdr, sizeof(l.hdr), ZG_CHECK_ERR) != sizeof(l.hdr))
 		return -ENODEV;
-	if (l.hdr.magic != DF_S390_MAGIC)
+	if (l.hdr.magic != magic_number)
 		return -ENODEV;
 	df_s390_hdr_add(&l.hdr);
 	return 0;
@@ -62,9 +79,6 @@ static int read_s390_em(void)
 {
 	u64 rc;
 
-	rc = zg_seek(g.fh, l.hdr.mem_size + DF_S390_HDR_SIZE, ZG_CHECK_NONE);
-	if (rc != l.hdr.mem_size + DF_S390_HDR_SIZE)
-		return -EINVAL;
 	rc = zg_read(g.fh, &l.em, sizeof(l.em), ZG_CHECK_ERR);
 	if (rc != sizeof(l.em))
 		return -EINVAL;
@@ -75,23 +89,97 @@ static int read_s390_em(void)
 }
 
 /*
- * Initialize s390 DFI
+ * Register memory chunks and verify the end marker
  */
-static int dfi_s390_init(void)
+static int mem_chunks_add(void)
 {
+	u64 rc;
+
+	/* Single memory chunk for non-extended dump format */
+	dfi_mem_chunk_add(0, l.hdr.mem_size, NULL,
+			  dfi_s390_mem_chunk_read,
+			  NULL);
+	rc = zg_seek(g.fh, DF_S390_HDR_SIZE + l.hdr.mem_size,
+		     ZG_CHECK_NONE);
+	if (rc != DF_S390_HDR_SIZE + l.hdr.mem_size)
+		return -EINVAL;
+	/* Read and verify the end marker */
+	return read_s390_em();
+}
+
+/*
+ * Register memory chunks (extended dump format) and verify the end marker
+ */
+static int mem_chunks_add_ext(void)
+{
+	struct df_s390_dump_segm_hdr dump_segm;
+	u64 rc, *off_ptr, old = 0, dump_size = 0;
+
+	off_ptr = zg_alloc(sizeof(*off_ptr));
+	*off_ptr = zg_seek(g.fh, DF_S390_HDR_SIZE, ZG_CHECK_NONE);
+	if (*off_ptr != DF_S390_HDR_SIZE)
+		return -EINVAL;
+	while (*off_ptr < DF_S390_HDR_SIZE + l.hdr.mem_size - PAGE_SIZE) {
+		rc = zg_read(g.fh, &dump_segm, PAGE_SIZE, ZG_CHECK_ERR);
+		if (rc != PAGE_SIZE)
+			return -EINVAL;
+		*off_ptr += PAGE_SIZE;
+		/* Add zero memory chunk */
+		dfi_mem_chunk_add(old, dump_segm.start - old, NULL,
+				  dfi_mem_chunk_read_zero, NULL);
+		/* Add memory chunk for a dump segment */
+		dfi_mem_chunk_add(dump_segm.start, dump_segm.len, off_ptr,
+				  dfi_s390_ext_mem_chunk_read, zg_free);
+		old = dump_segm.start + dump_segm.len;
+		dump_size += dump_segm.len;
+		off_ptr = zg_alloc(sizeof(*off_ptr));
+		*off_ptr = zg_seek_cur(g.fh, dump_segm.len, ZG_CHECK_NONE);
+		if (dump_segm.stop_marker)
+			break;
+	}
+	/* Add zero memory chunk at the end */
+	dfi_mem_chunk_add(old, l.hdr.mem_size - old, NULL,
+			  dfi_mem_chunk_read_zero, NULL);
+	/* Set the actual size of the dump file */
+	dfi_attr_file_size_set(dump_size);
+	/* Check if the last dump segment found */
+	if (!dump_segm.stop_marker)
+		return -EINVAL;
+	/* Read and verify the end marker */
+	return read_s390_em();
+}
+
+/*
+ * Initialize s390 single-volume DFI general function
+ */
+int dfi_s390_init_gen(bool extended)
+{
+	int rc;
+
+	l.extended = extended;
 	if (read_s390_hdr() != 0)
 		return -ENODEV;
-	dfi_mem_chunk_add(0, l.hdr.mem_size, NULL, dfi_s390_mem_chunk_read,
-			  NULL);
-	if (read_s390_em() != 0)
-		return -EINVAL;
+	if (!extended)
+		rc = mem_chunks_add();
+	else
+		rc = mem_chunks_add_ext();
+	if (rc)
+		return rc;
 	df_s390_cpu_info_add(&l.hdr, l.hdr.mem_size);
 	zg_seek(g.fh, sizeof(l.hdr), ZG_CHECK);
 	return 0;
 }
 
 /*
- * S390 DFI operations
+ * Initialize s390 single-volume DFI (non-extended)
+ */
+static int dfi_s390_init(void)
+{
+	return dfi_s390_init_gen(DUMP_NON_EXTENDED);
+}
+
+/*
+ * s390 single-volume DFI (non-extended) operations
  */
 struct dfi dfi_s390 = {
 	.name		= "s390",

zdump/dfi_s390_ext.c

@@ -0,0 +1,29 @@
+/*
+ * zgetdump - Tool for copying and converting System z dumps
+ *
+ * S390 extended dump input format
+ *
+ * Copyright IBM Corp. 2001, 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 "zgetdump.h"
+
+/*
+ * Initialize s390 input dump format (extended)
+ */
+static int dfi_s390_ext_init(void)
+{
+	return dfi_s390_init_gen(DUMP_EXTENDED);
+}
+
+/*
+ * s390 nput dump format (extedned) operations
+ */
+struct dfi dfi_s390_ext = {
+	.name		= "s390_ext",
+	.init		= dfi_s390_ext_init,
+	.feat_bits	= DFI_FEAT_COPY | DFI_FEAT_SEEK,
+};

zdump/dfi_s390mv.c

@@ -3,7 +3,7 @@
  *
  * S390 multi-volume dump input format
  *
- * Copyright IBM Corp. 2001, 2017
+ * Copyright IBM Corp. 2001, 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,52 +21,7 @@
 #include <unistd.h>
 
 #include "zgetdump.h"
-
-#define SYSFS_BUSDIR	"/sys/bus/ccw/devices"
-#define MAX_VOLUMES	32
-
-/*
- * Parameter for DASD multi-volume dump
- */
-struct vol_parm {
-	u16	devno;
-	u32	start_blk;
-	u32	end_blk;
-	u8	blk_size;
-	u8	end_sec;
-	u8	num_heads;
-} __attribute__ ((packed));
-
-struct vol_parm_table {
-	u64		timestamp;
-	u16		vol_cnt;
-	struct vol_parm	vol_parm[MAX_VOLUMES];
-	u8		ssid[MAX_VOLUMES];
-} __attribute__ ((packed));
-
-/*
- * Device signature
- */
-enum dev_sign {
-	SIGN_INVALID	= 0,	/* No dumper installed */
-	SIGN_VALID	= 1,	/* dumper installed, but volume not used */
-	SIGN_ACTIVE	= 2,	/* dumper installed and volume userd */
-};
-
-static char *dev_sign_str[] = {"invalid", "valid", "active"};
-#define dev_sign_str(x) (dev_sign_str[x])
-
-/*
- * Device status
- */
-enum dev_status {
-	DEV_ONLINE	= 0,
-	DEV_OFFLINE	= 1,
-	DEV_UNDEFINED	= 2,
-};
-
-static char *dev_status_str[] = {"online", "offline", "undefined"};
-#define dev_status_str(x) (dev_status_str[x])
+#include "dfi_s390mv.h"
 
 /*
  * Volume information
@@ -88,6 +43,14 @@ struct vol {
 	struct df_s390_hdr	hdr;
 };
 
+/*
+ * Mem chunk helper structure for extended dump format
+ */
+struct vol_mem_chunk {
+	struct vol	*vol;
+	u64		off; /* Offset to the memory chunk from the start of the volume */
+};
+
 /*
  * File local static data
  */
@@ -99,6 +62,9 @@ static struct {
 	int			blk_size;
 	struct df_s390_dumper	dumper;
 	int			dump_incomplete;
+	bool extended;
+	u64 magic_number;	/* Reference value to compare with */
+	char dumper_magic[7];	/* Reference value to compare with */
 } l;
 
 /*
@@ -109,8 +75,7 @@ static void table_read(struct zg_fh *fh, u16 blk_size,
 {
 	int off;
 
-	off = DF_S390_MAGIC_BLK_ECKD * blk_size +
-		df_s390_dumper_size(&l.dumper);
+	off = DF_S390_MAGIC_BLK_ECKD * blk_size + l.dumper.size;
 	zg_seek(fh, off, ZG_CHECK);
 	zg_read(fh, table, sizeof(*table), ZG_CHECK);
 }
@@ -130,6 +95,7 @@ static void em_init(struct vol *vol)
 		l.dump_incomplete = 1;
 }
 
+
 /*
  * Check sysfs, whether a device specified by its bus ID is defined and online.
  * Find out the corresponding dev_t
@@ -221,9 +187,9 @@ static void vol_read(struct vol *vol)
 }
 
 /*
- * Read memory
+ * Read memory chunk
  */
-static void df_s390mv_mem_read(struct dfi_mem_chunk *mem_chunk, u64 off,
+static void dfi_s390mv_mem_read(struct dfi_mem_chunk *mem_chunk, u64 off,
 			       void *buf, u64 cnt)
 {
 	struct vol *vol = mem_chunk->data;
@@ -232,6 +198,19 @@ static void df_s390mv_mem_read(struct dfi_mem_chunk *mem_chunk, u64 off,
 	zg_read(vol->fh, buf, cnt, ZG_CHECK);
 }
 
+/*
+ * Read memory chunk (extended)
+ */
+static void dfi_s390mv_ext_mem_read(struct dfi_mem_chunk *mem_chunk, u64 off,
+				    void *buf, u64 cnt)
+{
+	struct vol_mem_chunk *vol_mem_chunk = mem_chunk->data;
+	struct vol *vol = vol_mem_chunk->vol;
+
+	zg_seek(vol->fh, vol_mem_chunk->off + off, ZG_CHECK);
+	zg_read(vol->fh, buf, cnt, ZG_CHECK);
+}
+
 /*
  * Initialize DASD volume
  */
@@ -242,7 +221,7 @@ static void vol_init(struct vol *vol, struct vol_parm *vol_parm, int ssid,
 
 	sprintf(vol->bus_id, "0.%x.%04x", ssid, vol_parm->devno);
 	vol->blk_size = vol_parm->blk_size << 8;
-	vol->part_off = vol_parm->start_blk * vol->blk_size;
+	vol->part_off = (u64)vol_parm->start_blk * vol->blk_size;
 	vol->part_size = blk_cnt * vol->blk_size;
 	vol->status = dev_from_busid(vol->bus_id, &vol->dev);
 	vol->sign = SIGN_VALID;
@@ -258,12 +237,12 @@ static void vol_init(struct vol *vol, struct vol_parm *vol_parm, int ssid,
 	if ((vol->hdr.volnr == vol->nr) && (vol->hdr.mem_size != 0))
 		vol->sign = SIGN_ACTIVE;
 
-	if (vol->hdr.mvdump_sign != DF_S390_MAGIC) {
+	if (vol->hdr.mvdump_sign != l.magic_number) {
 		vol->sign = SIGN_INVALID;
 		l.dump_incomplete = 1;
 	}
 
-	if (strncmp(df_s390_dumper_magic(vol->dumper), "ZMULT64", 7) != 0) {
+	if (strncmp(vol->dumper.magic, l.dumper_magic, 7) != 0) {
 		vol->sign = SIGN_INVALID;
 		l.dump_incomplete = 1;
 	}
@@ -271,6 +250,9 @@ static void vol_init(struct vol *vol, struct vol_parm *vol_parm, int ssid,
 	if (vol->nr == 0)
 		l.hdr = vol->hdr;
 
+	if (l.extended)
+		return;
+
 	if (*mem_off == l.hdr.mem_size) {
 		/* Unused volume */
 		vol->mem_start = 0;
@@ -318,16 +300,86 @@ static void vol_print_all(void)
  */
 static void mem_chunks_add(void)
 {
+	struct vol *vol;
+	unsigned int i;
+
+	for (i = 0; i < l.table.vol_cnt; i++) {
+		vol = &l.vol_vec[i];
+		if (vol->sign != SIGN_ACTIVE)
+			continue;
+		dfi_mem_chunk_add_vol(vol->mem_start,
+				      vol->mem_end - vol->mem_start + 1,
+				      vol, dfi_s390mv_mem_read, NULL, vol->nr);
+	}
+}
+
+/*
+ * Add memory chunks (extended dump format) and verify the end marker
+ */
+static int mem_chunks_add_ext(void)
+{
+	u64 off, rc, part_end, old = 0, dump_size = 0;
+	struct df_s390_dump_segm_hdr dump_segm;
+	struct vol_mem_chunk *vol_mem_chunk;
 	unsigned int i;
 
 	for (i = 0; i < l.table.vol_cnt; i++) {
 		struct vol *vol = &l.vol_vec[i];
 		if (vol->sign != SIGN_ACTIVE)
 			continue;
-		dfi_mem_chunk_add(vol->mem_start,
-				  vol->mem_end - vol->mem_start + 1,
-				  vol, df_s390mv_mem_read, NULL);
+		off = vol->part_off + DF_S390_HDR_SIZE;
+		part_end = vol->part_off + vol->part_size;
+		rc = zg_seek(vol->fh, off, ZG_CHECK_NONE);
+		if (rc != off)
+			return -EINVAL;
+		/*
+		 * Reading dump segments from the start of partition (skipping
+		 * the dump header) till the end of partition (considering that
+		 * minimum dump segment size is one megabyte + one page and one
+		 * more page is reserved for the end marker)
+		 */
+		while (off < part_end - MIB - PAGE_SIZE) {
+			rc = zg_read(vol->fh, &dump_segm, sizeof(dump_segm),
+				     ZG_CHECK_ERR);
+			if (rc != PAGE_SIZE)
+				return -EINVAL;
+			off += PAGE_SIZE;
+			vol_mem_chunk = zg_alloc(sizeof(*vol_mem_chunk));
+			vol_mem_chunk->vol = vol;
+			vol_mem_chunk->off = off;
+			/* Add zero memory chunk */
+			dfi_mem_chunk_add_vol(old, dump_segm.start - old, NULL,
+					      dfi_mem_chunk_read_zero, NULL,
+					      vol->nr);
+			/* Add memory chunk for a dump segment */
+			dfi_mem_chunk_add_vol(dump_segm.start, dump_segm.len,
+					      vol_mem_chunk,
+					      dfi_s390mv_ext_mem_read, NULL,
+					      vol->nr);
+			old = dump_segm.start + dump_segm.len;
+			dump_size += dump_segm.len;
+			off = zg_seek_cur(vol->fh, dump_segm.len,
+					  ZG_CHECK_NONE);
+			if (dump_segm.stop_marker)
+				break;
+		}
+		if (dump_segm.stop_marker) {
+			/* Add zero memory chunk at the end*/
+			dfi_mem_chunk_add_vol(old, l.hdr.mem_size - old, NULL,
+					      dfi_mem_chunk_read_zero, NULL,
+					      vol->nr);
+			/* Set the actual size of the dump file */
+			dfi_attr_file_size_set(dump_size);
+			/* Read and verify the end marker */
+			rc = zg_read(vol->fh, &l.em, sizeof(l.em), ZG_CHECK);
+			if (rc != sizeof(l.em) ||
+			    df_s390_em_verify(&l.em, &l.hdr) != 0)
+				return -EINVAL;
+			return 0;
+		}
 	}
+	/* No dump segment with the stop marker found */
+	return -EINVAL;
 }
 
 /*
@@ -405,9 +457,9 @@ static int mvdump_hdr_check(const char *file)
 	fh = zg_open(file, O_RDONLY, ZG_CHECK);
 	if (zg_read(fh, &hdr, sizeof(hdr), ZG_CHECK_ERR) != sizeof(hdr))
 		goto fail;
-	if (hdr.magic != DF_S390_MAGIC)
+	if (hdr.magic != l.magic_number)
 		goto fail;
-	if (hdr.mvdump_sign != DF_S390_MAGIC)
+	if (hdr.mvdump_sign != l.magic_number)
 		goto fail;
 	rc = 0;
 fail:
@@ -428,14 +480,6 @@ static void check_sysfs(void)
 	closedir(fh_dir);
 }
 
-/*
- * Print dump information (dfi operation)
- */
-static void dfi_s390mvfo_dump(void)
-{
-	vol_print_all();
-}
-
 /*
  * Read dump tool from DASD and check if we have a multi-volume dump tool
  */
@@ -445,7 +489,7 @@ static int mv_dumper_read(void)
 		     ZG_CHECK_NONE) == -1)
 		return -ENODEV;
 	df_s390_dumper_read(g.fh, l.blk_size, &l.dumper);
-	if (memcmp(df_s390_dumper_magic(l.dumper), "ZMULT64", 7) != 0)
+	if (strncmp(l.dumper.magic, l.dumper_magic, 7) != 0)
 		return -ENODEV;
 	table_read(g.fh, l.blk_size, &l.table);
 	return 0;
@@ -466,6 +510,8 @@ static void volumes_init(void)
 		vol_init(&l.vol_vec[i], &l.table.vol_parm[i], l.table.ssid[i],
 			 &mem_off);
 	}
+	if (l.extended)
+		return;
 	if (mem_off != l.hdr.mem_size)
 		l.dump_incomplete = 1;
 }
@@ -476,7 +522,7 @@ static void volumes_init(void)
 static int open_dump(void)
 {
 	const struct stat *stat = zg_stat(g.fh);
-	unsigned dev_minor;
+	unsigned int dev_minor;
 	enum zg_type type;
 	char *path;
 
@@ -500,10 +546,26 @@ static int open_dump(void)
 }
 
 /*
- * Initialize s390 multi-volume input dump format
+ * Specify reference values for dumper magic and dump magic numbers
  */
-static int dfi_s390mv_init(void)
+static void set_magic_numbers(void)
 {
+	if (l.extended) {
+		l.magic_number = DF_S390_MAGIC_EXT;
+		strncpy(l.dumper_magic, DF_S390_DUMPER_MAGIC_MV_EXT, 7);
+	} else {
+		l.magic_number = DF_S390_MAGIC;
+		strncpy(l.dumper_magic, DF_S390_DUMPER_MAGIC_MV, 7);
+	}
+}
+
+/*
+ * Initialize s390 multi-volume input dump format generic function
+ */
+int dfi_s390mv_init_gen(bool extended)
+{
+	l.extended = extended;
+	set_magic_numbers();
 	if (open_dump() != 0)
 		return -ENODEV;
 	volumes_init();
@@ -512,7 +574,10 @@ static int dfi_s390mv_init(void)
 	if (l.hdr.mem_size == 0)
 		return -ENODEV;
 	df_s390_hdr_add(&l.hdr);
-	mem_chunks_add();
+	if (!extended)
+		mem_chunks_add();
+	else if (mem_chunks_add_ext() != 0)
+		return -EINVAL;
 	if (l.dump_incomplete)
 		return -EINVAL;
 	df_s390_cpu_info_add(&l.hdr, l.hdr.mem_end);
@@ -521,17 +586,35 @@ static int dfi_s390mv_init(void)
 }
 
 /*
- * Initialize s390 multi-volume dump tool (for -d option)
+ * Initializt s390 multi-volume input dump
  */
-int dt_s390mv_init(void)
+static int dfi_s390mv_init(void)
 {
+	return dfi_s390mv_init_gen(DUMP_NON_EXTENDED);
+}
+
+/*
+ * Print dump information (dfi operation)
+ */
+void dfi_s390mv_info(void)
+{
+	vol_print_all();
+}
+
+/*
+ * Initialize s390 multi-volume dump tool generic function
+ */
+int dt_s390mv_init_gen(bool extended)
+{
+	l.extended = extended;
+	set_magic_numbers();
 	if (open_dump() != 0)
 		return -ENODEV;
 	volumes_init();
 	dt_arch_set(DFI_ARCH_64);
-	dt_version_set(df_s390_dumper_version(l.dumper));
-	dt_attr_mem_limit_set(df_s390_dumper_mem(&l.dumper));
-	dt_attr_force_set(df_s390_dumper_force(&l.dumper));
+	dt_version_set(l.dumper.version);
+	dt_attr_mem_limit_set(l.dumper.mem);
+	dt_attr_force_set(l.dumper.force);
 	return 0;
 }
 
@@ -549,6 +632,6 @@ void dt_s390mv_info(void)
 struct dfi dfi_s390mv = {
 	.name		= "s390mv",
 	.init		= dfi_s390mv_init,
-	.info_dump	= dfi_s390mvfo_dump,
+	.info_dump	= dfi_s390mv_info,
 	.feat_bits	= DFI_FEAT_COPY | DFI_FEAT_SEEK,
 };

zdump/dfi_s390mv.h

@@ -0,0 +1,62 @@
+/*
+ * zgetdump - Tool for copying and converting System z dumps
+ *
+ * S390 multi-volume dump input format common structures
+ *
+ * Copyright IBM Corp. 2001, 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 DFI_S390MV_H
+#define DFI_S390MV_H
+
+#include "lib/zt_common.h"
+
+#define SYSFS_BUSDIR	"/sys/bus/ccw/devices"
+#define MAX_VOLUMES	32
+
+/*
+ * Parameter for DASD multi-volume dump
+ */
+struct vol_parm {
+	u16	devno;
+	u32	start_blk;
+	u32	end_blk;
+	u8	blk_size;
+	u8	end_sec;
+	u8	num_heads;
+} __attribute__ ((packed));
+
+struct vol_parm_table {
+	u64		timestamp;
+	u16		vol_cnt;
+	struct vol_parm	vol_parm[MAX_VOLUMES];
+	u8		ssid[MAX_VOLUMES];
+} __attribute__ ((packed));
+
+/*
+ * Device signature
+ */
+enum dev_sign {
+	SIGN_INVALID	= 0,	/* No dumper installed */
+	SIGN_VALID	= 1,	/* dumper installed, but volume not used */
+	SIGN_ACTIVE	= 2,	/* dumper installed and volume userd */
+};
+
+static char *dev_sign_str[] = {"invalid", "valid", "active"};
+#define dev_sign_str(x) (dev_sign_str[x])
+
+/*
+ * Device status
+ */
+enum dev_status {
+	DEV_ONLINE	= 0,
+	DEV_OFFLINE	= 1,
+	DEV_UNDEFINED	= 2,
+};
+
+static char *dev_status_str[] = {"online", "offline", "undefined"};
+#define dev_status_str(x) (dev_status_str[x])
+
+#endif /* DFI_S390MV_H */

zdump/dfi_s390mv_ext.c

@@ -0,0 +1,30 @@
+/*
+ * zgetdump - Tool for copying and converting System z dumps
+ *
+ * S390x multi-volume dump input format
+ *
+ * Copyright IBM Corp. 2001, 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 "zgetdump.h"
+
+/*
+ * Initialize s390 multi-volume input dump format (extedend)
+ */
+static int dfi_s390mv_ext_init(void)
+{
+	return dfi_s390mv_init_gen(DUMP_EXTENDED);
+}
+
+/*
+ * s390 multi-volume DFI (extedned) operations
+ */
+struct dfi dfi_s390mv_ext = {
+	.name		= "s390mv_ext",
+	.init		= dfi_s390mv_ext_init,
+	.info_dump	= dfi_s390mv_info,
+	.feat_bits	= DFI_FEAT_COPY | DFI_FEAT_SEEK,
+};

zdump/dfo.c

@@ -52,7 +52,6 @@ void dfo_chunk_add(u64 start, u64 size, void *data, dfo_chunk_read_fn read_fn)
 	dfo_chunk = zg_alloc(sizeof(*dfo_chunk));
 	dfo_chunk->start = start;
 	dfo_chunk->end = start + size - 1;
-	dfo_chunk->size = size;
 	dfo_chunk->data = data;
 	dfo_chunk->read_fn = read_fn;
 	util_list_add_head(&l.dump.chunk_list, dfo_chunk);

zdump/dfo.h

@@ -24,7 +24,6 @@ struct dfo_chunk {
 	struct util_list_node	list;
 	u64			start;
 	u64			end;
-	u64			size;
 	dfo_chunk_read_fn	read_fn;
 	void			*data;
 };

zdump/dfo_elf.c

@@ -3,7 +3,7 @@
  *
  * ELF core dump output format
  *
- * Copyright IBM Corp. 2001, 2017
+ * Copyright IBM Corp. 2001, 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.
@@ -71,8 +71,12 @@ static u64 loads_init(Elf64_Phdr *phdr, u64 loads_offset)
 		phdr->p_offset = loads_offset;
 		phdr->p_vaddr = mem_chunk->start;
 		phdr->p_paddr = mem_chunk->start;
-		phdr->p_filesz = mem_chunk->end - mem_chunk->start + 1;
-		phdr->p_memsz = phdr->p_filesz;
+		phdr->p_memsz = mem_chunk->end - mem_chunk->start + 1;
+		if (mem_chunk->read_fn == dfi_mem_chunk_read_zero)
+			/* Zero memory chunk */
+			phdr->p_filesz = 0;
+		else
+			phdr->p_filesz = phdr->p_memsz;
 		phdr->p_flags = PF_R | PF_W | PF_X;
 		phdr->p_align = PAGE_SIZE;
 		loads_offset += phdr->p_filesz;
@@ -277,6 +281,9 @@ static void dump_chunks_init(void)
 	dfo_chunk_add(0, l.hdr_size, l.hdr, dfo_chunk_buf_fn);
 	off = l.hdr_size;
 	dfi_mem_chunk_iterate(mem_chunk) {
+		if (mem_chunk->read_fn == dfi_mem_chunk_read_zero)
+			/* Zero memory chunk */
+			continue;
 		dfo_chunk_add(off, mem_chunk->size, mem_chunk,
 				   dfo_chunk_mem_fn);
 		off += mem_chunk->size;

zdump/dt.c

@@ -3,7 +3,7 @@
  *
  * Dump tool info generic functions
  *
- * Copyright IBM Corp. 2001, 2017
+ * Copyright IBM Corp. 2001, 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.
@@ -15,7 +15,9 @@
  * Supported dump tools
  */
 static struct dt *dt_vec[] = {
+	&dt_s390mv_ext,
 	&dt_s390mv,
+	&dt_s390sv_ext,
 	&dt_s390sv,
 	&dt_scsi,
 	NULL,

zdump/dt.h

@@ -13,6 +13,10 @@
 #define DT_H
 
 #include "dfi.h"
+#include <stdbool.h>
+
+#define DUMP_EXTENDED		true
+#define DUMP_NON_EXTENDED	false
 
 struct dt {
 	const char	*desc;

zdump/dt_s390mv.c

@@ -12,7 +12,15 @@
 #include "zgetdump.h"
 
 /*
- * DT operations
+ * Initialize s390 multi-volume dump tool (for -d option)
+ */
+static int dt_s390mv_init(void)
+{
+	return dt_s390mv_init_gen(DUMP_NON_EXTENDED);
+}
+
+/*
+ * Dump Tool operations
  */
 struct dt dt_s390mv = {
 	.desc	= "Multi-volume DASD dump tool",

zdump/dt_s390mv_ext.c

@@ -0,0 +1,29 @@
+/*
+ * zgetdump - Tool for copying and converting System z dumps
+ *
+ * S390x multi-volume DASD dump tool
+ *
+ * Copyright IBM Corp. 2001, 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 "zgetdump.h"
+
+/*
+ * Initialize s390 multi-volume dump tool (extedend) for -d option
+ */
+static int dt_s390mv_ext_init(void)
+{
+	return dt_s390mv_init_gen(DUMP_EXTENDED);
+}
+
+/*
+ * Dump Tool (extedned) operations
+ */
+struct dt dt_s390mv_ext = {
+	.desc	= "Multi-volume DASD dump tool (extended)",
+	.init	= dt_s390mv_ext_init,
+	.info	= dt_s390mv_info,
+};

zdump/dt_s390sv.c

@@ -3,7 +3,7 @@
  *
  * S390 single-volume DASD dump tool
  *
- * Copyright IBM Corp. 2001, 2017
+ * Copyright IBM Corp. 2001, 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.
@@ -12,14 +12,13 @@
 #include <linux/fs.h>
 #include "zgetdump.h"
 
-#define HEXINSTR "\x0d\x10\x47\xf0" /* BASR + 1st halfword of BC */
-
 /*
  * File local static data
  */
 static struct {
 	struct df_s390_dumper	dumper;
 	enum dfi_arch		dumper_arch;
+	bool extended;		/* Extended dump-tool */
 } l;
 
 /*
@@ -29,15 +28,19 @@ static int dumper_read_eckd(int blk_size)
 {
 	df_s390_dumper_read(g.fh, blk_size, &l.dumper);
 
-	if (strncmp(l.dumper.magic, "ZECKD31", 7) == 0) {
-		l.dumper_arch = DFI_ARCH_32;
-	} else if (strncmp(l.dumper.magic, "ZECKD64", 7) == 0) {
+	if (l.extended) {
+		if (strncmp(l.dumper.magic, DF_S390_DUMPER_MAGIC_EXT, 7) != 0)
+			return -ENODEV;
 		l.dumper_arch = DFI_ARCH_64;
-	} else if ((memcmp(l.dumper.magic, HEXINSTR, 4) == 0) &&
-		   (l.dumper.d.v1.code[0] == '\x0d') &&
-		   (l.dumper.d.v1.code[1] == '\xd0')) {
-		/* We found basr r13,0 (old dumper) */
-		l.dumper.version = 0;
+		return 0;
+	}
+	if (strncmp(l.dumper.magic, DF_S390_DUMPER_MAGIC64, 7) == 0) {
+		l.dumper_arch = DFI_ARCH_64;
+	} else if (strncmp(l.dumper.magic, DF_S390_DUMPER_MAGIC32, 7) == 0) {
+		l.dumper_arch = DFI_ARCH_32;
+	} else if (memcmp(l.dumper.magic, OLD_DUMPER_HEX_INSTR1, 4) == 0 &&
+		   l.dumper.version == 0) {
+		/* We found the old dumper */
 		l.dumper_arch = DFI_ARCH_UNKNOWN;
 	} else {
 		return -ENODEV;
@@ -46,28 +49,25 @@ static int dumper_read_eckd(int blk_size)
 }
 
 /*
- * Read dump tool from FBA DASD device
+ * Check FBA dump tool magic number and set architecture attribute
  */
-static void dumper_read_fba_gen(int size, void *buffer)
+static int dumper_check_fba(struct df_s390_dumper *dumper)
 {
-	zg_seek_end(g.fh, -size, ZG_CHECK);
-	zg_read(g.fh, buffer, size, ZG_CHECK);
-}
-
-/*
- * Read dump tool on FBA disk and check its magic number
- */
-static int dumper_check_fba(void)
-{
-	if (strncmp(l.dumper.magic, "ZDFBA31", 7) == 0) {
-		l.dumper_arch = DFI_ARCH_32;
-	} else if (strncmp(l.dumper.magic, "ZDFBA64", 7) == 0) {
+	if (l.extended) {
+		if (strncmp(dumper->magic, DF_S390_DUMPER_MAGIC_FBA_EXT, 7)
+		    != 0)
+			return -ENODEV;
 		l.dumper_arch = DFI_ARCH_64;
-	} else if ((memcmp(l.dumper.magic, HEXINSTR, 4) == 0) &&
-		   (l.dumper.d.v1.code[0] == '\x0d') &&
-		   (l.dumper.d.v1.code[1] == '\xd0')) {
+		return 0;
+	}
+	if (strncmp(dumper->magic, DF_S390_DUMPER_MAGIC64_FBA, 7) == 0) {
+		l.dumper_arch = DFI_ARCH_64;
+	} else if (strncmp(dumper->magic, DF_S390_DUMPER_MAGIC32_FBA, 7) == 0) {
+		l.dumper_arch = DFI_ARCH_32;
+	} else if (memcmp(dumper->magic, OLD_DUMPER_HEX_INSTR1, 4) == 0 &&
+		   memcmp(&dumper->size, OLD_DUMPER_HEX_INSTR2, 2) == 0) {
 		/* We found basr r13,0 (old dumper) */
-		l.dumper.version = 0;
+		dumper->version = 0;
 		l.dumper_arch = DFI_ARCH_UNKNOWN;
 	} else {
 		return -ENODEV;
@@ -75,19 +75,40 @@ static int dumper_check_fba(void)
 	return 0;
 }
 
+/*
+ * Read dump tool from FBA device
+ */
+static int dumper_read_validate_fba(int size, struct df_s390_dumper *dumper)
+{
+	int bytes_to_read;
+
+	/*
+	 * On FBA device the dumper is written at the end of the volume because
+	 * there is not enough space to place it at the beginning due to the
+	 * linux disk layout
+	 */
+	zg_seek_end(g.fh, -size, ZG_CHECK);
+	bytes_to_read = offsetof(struct df_s390_dumper, force);
+	zg_read(g.fh, dumper, bytes_to_read, ZG_CHECK);
+	if (dumper_check_fba(dumper) != 0)
+		return -ENODEV;
+	dumper->size = size;
+	bytes_to_read = sizeof(dumper->force) + sizeof(dumper->mem);
+	zg_seek_end(g.fh, -bytes_to_read, ZG_CHECK);
+	zg_read(g.fh, &dumper->force, bytes_to_read, ZG_CHECK);
+	return 0;
+}
+
 /*
  * Read dump tool on FBA disk and check its magic number
  */
 static int dumper_read_fba(void)
 {
-	dumper_read_fba_gen(DF_S390_DUMPER_SIZE_V1, &l.dumper);
-	if (dumper_check_fba() == 0)
+	if (dumper_read_validate_fba(DF_S390_DUMPER_SIZE_V3, &l.dumper) == 0)
 		return 0;
-	dumper_read_fba_gen(DF_S390_DUMPER_SIZE_V2, &l.dumper);
-	if (dumper_check_fba() == 0)
+	if (dumper_read_validate_fba(DF_S390_DUMPER_SIZE_V2, &l.dumper) == 0)
 		return 0;
-	dumper_read_fba_gen(DF_S390_DUMPER_SIZE_V3, &l.dumper);
-	if (dumper_check_fba() == 0)
+	if (dumper_read_validate_fba(DF_S390_DUMPER_SIZE_V1, &l.dumper) == 0)
 		return 0;
 	return -ENODEV;
 }
@@ -116,18 +137,23 @@ static int sv_dumper_read(void)
 /*
  * Initialize s390 single-volume dump tool (for -d option)
  */
-static int dt_s390sv_init(void)
+int dt_s390sv_init_gen(bool extended)
 {
+	l.extended = extended;
 	if (sv_dumper_read() != 0)
 		return -ENODEV;
 	dt_arch_set(l.dumper_arch);
-	dt_version_set(df_s390_dumper_version(l.dumper));
-	dt_attr_mem_limit_set(df_s390_dumper_mem(&l.dumper));
+	dt_version_set(l.dumper.version);
+	dt_attr_mem_limit_set(l.dumper.mem);
 	return 0;
 }
 
+static int dt_s390sv_init(void)
+{
+	return dt_s390sv_init_gen(DUMP_NON_EXTENDED);
+}
 /*
- * s390 single-volume DT operations
+ * s390 single-volume DT (non-extended) operations
  */
 struct dt dt_s390sv = {
 	.desc	= "Single-volume DASD dump tool",

zdump/dt_s390sv_ext.c

@@ -0,0 +1,29 @@
+/*
+ * zgetdump - Tool for copying and converting System z dumps
+ *
+ * S390 single-volume DASD dump tool (extended)
+ *
+ * Copyright IBM Corp. 2001, 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 <linux/fs.h>
+#include "zgetdump.h"
+
+/*
+ * Initialize s390 single-volume extended dump tool (for -d option)
+ */
+static int dt_s390sv_ext_init(void)
+{
+	return dt_s390sv_init_gen(DUMP_EXTENDED);
+}
+
+/*
+ * s390 single-volume DT (extended) operations
+ */
+struct dt dt_s390sv_ext = {
+	.desc	= "Single-volume DASD dump tool (extended)",
+	.init	= dt_s390sv_ext_init,
+};

zdump/opts.c

@@ -3,7 +3,7 @@
  *
  * Option parsing
  *
- * Copyright IBM Corp. 2001, 2017
+ * Copyright IBM Corp. 2001, 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.
@@ -46,9 +46,10 @@ static char help_text[] =
 "-s, --select   Select system data SYS (\"kdump\", \"prod\", or \"all\")\n"
 "-d, --device   Print DUMPDEV (dump device) information\n"
 "-v, --version  Print version information, then exit\n"
+"-V, --verbose  Show detailed layout of memory map on printing DUMP information\n"
 "-h, --help     Print this help, then exit\n";
 
-static const char copyright_str[] = "Copyright IBM Corp. 2001, 2017";
+static const char copyright_str[] = "Copyright IBM Corp. 2001, 2018";
 
 /*
  * Select option strings
@@ -251,9 +252,10 @@ void opts_parse(int argc, char *argv[])
 		{"fmt",     required_argument, NULL, 'f'},
 		{"select",  required_argument, NULL, 's'},
 		{"debug",   no_argument,       NULL, 'X'},
+		{"verbose", no_argument,       NULL, 'V'},
 		{NULL,      0,                 NULL,  0 }
 	};
-	static const char optstr[] = "hvidmus:f:X";
+	static const char optstr[] = "hvVidmus:f:X";
 
 	init_defaults();
 	while ((opt = getopt_long(argc, argv, optstr, long_opts, &idx)) != -1) {
@@ -262,6 +264,9 @@ void opts_parse(int argc, char *argv[])
 			print_help_exit();
 		case 'v':
 			print_version_exit();
+		case 'V':
+			g.opts.verbose_specified = 1;
+			break;
 		case 'i':
 			action_set(ZG_ACTION_DUMP_INFO);
 			break;

zdump/zgetdump.8

@@ -1,4 +1,4 @@
-.\" Copyright 2017 IBM Corp.
+.\" 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.
 .\"
@@ -59,6 +59,12 @@ more information.
 Print the dump header information reading from the DUMP and check if
 the dump is valid. See chapters DUMP and DUMP INFORMATION below for more
 information.
+
+.TP
+.BR "\-V" " or " "\-\-verbose"
+Show the detailed memory map layout when printing the dump header
+information (relevant for s390_ext and ELF dump formats).
+
 .TP
 .BR "\-f <FMT>" " or " "\-\-fmt <FMT>"
 Use the specified target dump format FMT when writing or mounting the dump.
@@ -170,6 +176,9 @@ This dump format is System z specific and is used for DASD and tape dumps.
 .TP
 The following dump formats are supported for the source dump only:
 .TP
+.BR "s390_ext"
+This dump format is System z specific and is used for DASD dumps only.
+.TP
 .BR "lkcd"
 This dump format is used by the Linux Kernel Crash Dumps (LKCD) project
 and also on System z for the "vmconvert" dump tool.
@@ -245,6 +254,10 @@ The "real memory range" can differ from the "dump memory range" when
 the SIZE parameter was used when preparing the dump device with the zipl
 tool (see man zipl).
 .TP
+.BR "Dump file size"
+Actual size of dump file on disk in megabytes. "Dump file size" may differ from
+the "dump memory range" because of zero memory chunks.
+.TP
 .BR "Memory map"
 Available memory chunks in the dump. Some dump tools create multiple memory
 chunks when creating a dump on a system with memory gaps

zdump/zgetdump.h

@@ -3,7 +3,7 @@
  *
  * Main include file - Should be included by all source files
  *
- * Copyright IBM Corp. 2001, 2017
+ * Copyright IBM Corp. 2001, 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.
@@ -35,6 +35,7 @@ struct options {
 	int		argc_fuse;
 	const char	*select;
 	int		select_specified;
+	int		verbose_specified;
 };
 
 extern const char *OPTS_SELECT_KDUMP;
@@ -75,7 +76,9 @@ void zfuse_umount(void);
  */
 extern struct dfi dfi_s390tape;
 extern struct dfi dfi_s390mv;
+extern struct dfi dfi_s390mv_ext;
 extern struct dfi dfi_s390;
+extern struct dfi dfi_s390_ext;
 extern struct dfi dfi_lkcd;
 extern struct dfi dfi_elf;
 extern struct dfi dfi_kdump;
@@ -92,7 +95,9 @@ extern struct dfo dfo_elf;
  * Supported s390 dumpers
  */
 extern struct dt dt_s390mv;
+extern struct dt dt_s390mv_ext;
 extern struct dt dt_s390sv;
+extern struct dt dt_s390sv_ext;
 extern struct dt dt_scsi;
 
 #endif /* ZGETDUMP_H */

zfcpdump/zfcpdump_initramfs.txt

@@ -6,6 +6,7 @@
 dir /dev 755 0 0
 nod /dev/console 644 0 0 c 5 1
 nod /dev/null 644 0 0 c 1 3
+nod /dev/sda 644 0 0 b 8 0
 nod /dev/sda1 644 0 0 b 8 1
 nod /dev/sda2 644 0 0 b 8 2
 nod /dev/sda3 644 0 0 b 8 3
@@ -27,5 +28,4 @@ dir /mnt 755 0 0
 dir /sbin 755 0 0
 dir /etc 755 0 0
 file /init arch/s390/boot/zfcpdump 755 0 0
-file /sbin/e2fsck arch/s390/boot/e2fsck 755 0 0
 slink /etc/mtab /proc/mounts 755 0 0

zipl/boot/Makefile

@@ -1,7 +1,7 @@
 # Common definitions
 include ../../common.mak
 
-CFLAGS_BOOT = -Os -g -I../include -D__ASSEMBLY__ \
+CFLAGS_BOOT = $(NO_PIE_CFLAGS) -Os -g -I../include -D__ASSEMBLY__ \
 	  -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
 	  -fno-builtin -ffreestanding -fno-asynchronous-unwind-tables \
 	  -fno-delete-null-pointer-checks \
@@ -54,11 +54,11 @@ stage3.exec: head.o stage3.o kdump3.o libc.o sclp.o sclp_stage3.o \
 			}' \
 	); \
 	case $$STAGE in \
-		0) SFLAGS="-nostdlib -Wl,-Ttext,0";; \
-		1) SFLAGS="-nostdlib -Wl,-Ttext,0x18";; \
-		1b) SFLAGS="-nostdlib -Wl,-Ttext,0xE000";; \
-		2) SFLAGS="-nostdlib -Wl,-T,stage2.lds";; \
-		3) SFLAGS="-nostdlib -Wl,-T,stage3.lds";; \
+		0) SFLAGS="$(NO_PIE_LINKFLAGS) -nostdlib -Wl,-Ttext,0";; \
+		1) SFLAGS="$(NO_PIE_LINKFLAGS) -nostdlib -Wl,-Ttext,0x18";; \
+		1b) SFLAGS="$(NO_PIE_LINKFLAGS) -nostdlib -Wl,-Ttext,0xE000";; \
+		2) SFLAGS="$(NO_PIE_LINKFLAGS) -nostdlib -Wl,-T,stage2.lds";; \
+		3) SFLAGS="$(NO_PIE_LINKFLAGS) -nostdlib -Wl,-T,stage3.lds";; \
 	esac; \
 	$(LINK) $$SFLAGS -m64 $^ -o $@
 
@@ -74,10 +74,11 @@ stage3.exec: head.o stage3.o kdump3.o libc.o sclp.o sclp_stage3.o \
 		--only-section=.rodata \
 		--only-section=.stage2dump.tail \
 		--only-section=.eckd2dump_mv.tail \
+		--only-section=.fixup \
 		$< $@
 
 data.o: $(FILES)
-	$(LD) -r -b binary -o data.o $(FILES)
+	$(LD) $(NO_PIE_LDFLAGS) -r -b binary -o data.o $(FILES)
 
 data.h: data.o
 	rm -f data.h

zipl/boot/eckd2dump.c

@@ -3,7 +3,7 @@
  *
  * Common ECKD dump I/O functions
  *
- * Copyright IBM Corp. 2013, 2017
+ * Copyright IBM Corp. 2013, 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.
@@ -444,6 +444,34 @@ void readblock(unsigned long blk, unsigned long addr, unsigned long blk_count)
 	io_block(cmd, blk, addr, blk_count, 0, 1);
 }
 
+/*
+ * Write dump segment with the header to DASD and return the next free
+ * block number
+ */
+unsigned long write_dump_segment(unsigned long blk,
+				 struct df_s390_dump_segm_hdr *segm,
+				 unsigned long zero_page)
+{
+	unsigned long addr, start_blk, blk_count;
+
+	/* Write the dump segment header itself (1 page) */
+	writeblock(blk, (unsigned long)segm, m2b(PAGE_SIZE), zero_page);
+	blk += m2b(PAGE_SIZE);
+	/* Write the dump segment */
+	addr = segm->start;
+	start_blk = blk;
+	while (addr < segm->start + segm->len) {
+		/* Remaining blocks to write */
+		blk_count = m2b(segm->len) - (blk - start_blk);
+		blk_count = MIN(blk_count, eckd_blk_max);
+		writeblock(blk, addr, blk_count, zero_page);
+		progress_print(addr);
+		blk += blk_count;
+		addr += b2m(blk_count);
+	}
+	return blk;
+}
+
 /*
  * Init ECKD common
  */

zipl/boot/eckd2dump.h

@@ -3,7 +3,7 @@
  *
  * Common ECKD dump I/O functions
  *
- * Copyright IBM Corp. 2013, 2017
+ * Copyright IBM Corp. 2013, 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.
@@ -12,6 +12,7 @@
 #define ECKD2DUMP_H
 
 #include "cio.h"
+#include "stage2dump.h"
 
 struct eckd_device {
 	uint32_t blk_start;
@@ -46,5 +47,8 @@ void stage2dump_eckd_init();
 void writeblock(unsigned long blk, unsigned long addr, unsigned long blk_count,
 		unsigned long zero_page);
 void readblock(unsigned long blk, unsigned long addr, unsigned long blk_count);
+unsigned long write_dump_segment(unsigned long blk,
+				 struct df_s390_dump_segm_hdr *segm,
+				 unsigned long zero_page);
 
 #endif /* ECKD2DUMP_H */

zipl/boot/eckd2dump_mv.c

@@ -3,7 +3,7 @@
  *
  * Multi-volume ECKD DASD dump tool
  *
- * Copyright IBM Corp. 2013, 2017
+ * Copyright IBM Corp. 2013, 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.
@@ -13,14 +13,14 @@
 #include "error.h"
 #include "stage2dump.h"
 
-#define MVDUMP_SIZE		0x3000	/* Size of dump record */
+#define MVDUMP_TOOL_SIZE	0x3000	/* Size of dump record */
 #define MAX_DUMP_VOLUMES	32	/* Up to 32 dump volumes possible */
 
 /*
  * Magic number at start of dump record
  */
 uint64_t magic __attribute__((section(".stage2.head")))
-	= 0x5a4d554c54363405ULL; /* ZMULT64, version 5 */
+	= 0x584d554c54363401ULL; /* XMULT64, version 1 */
 
 /*
  * Parameter format for ECKD MV dumper (13 bytes):
@@ -188,73 +188,117 @@ void dt_device_enable(void)
 	stage2dump_eckd_init();
 }
 
+/*
+ * Check for the volume timestamp and validate the dump signature
+ * before writing a dump.
+ */
+static void check_volume(unsigned long page)
+{
+	struct mvdump_parm_table *mvdump_table_new;
+	struct df_s390_hdr *hdr_new;
+
+	/*
+	 * Check whether parameter table on dump device has a valid
+	 * time stamp. The parameter table is located right behind
+	 * the dump tool, the corresponding block number is:
+	 *   MAGIC_BLK_ECKD + (MVDUMP_TOOL_SIZE / blocksize)
+	 */
+	mvdump_table_new = (void *) page;
+	readblock(DF_S390_MAGIC_BLK_ECKD + m2b(MVDUMP_TOOL_SIZE),
+		  __pa(mvdump_table_new), 1);
+	/*
+	 * Check if time stamps match
+	 */
+	if (mvdump_table.tod != mvdump_table_new->tod)
+		panic(ENOTIME, "Inconsistent time stamps");
+	/*
+	 * Check if dump partition has a valid dump signature.
+	 * Bypass signature check if "--force" had been specified during
+	 * zipl -M.
+	 */
+	hdr_new = (void *) page;
+	if (!parm_tail.mvdump_force) {
+		readblock(device.blk_start, __pa(hdr_new), 1);
+		if (dump_hdr->magic != hdr_new->mvdump_sign)
+			panic(ENOSIGN, "Wrong signature");
+	}
+}
+
+/*
+ * Write the dump header and memory to the current volume and return the next
+ * address to write for the next volume or memory size if the dump ended
+ * on this volume
+ */
+static unsigned long write_volume(unsigned long addr, unsigned long page,
+				  struct df_s390_dump_segm_hdr *dump_segm)
+{
+	unsigned long free_space, blk;
+
+	/*
+	 * Write dump header
+	 */
+	blk = device.blk_start;
+	writeblock(blk, __pa(dump_hdr), m2b(DF_S390_HDR_SIZE), 0);
+	blk += m2b(DF_S390_HDR_SIZE);
+	/*
+	 * The free space left on the volume minus 2 blocks (for the segment
+	 * header and the end marker)
+	 */
+	free_space = b2m(device.blk_end - blk + 1) - b2m(2);
+	memset((void *) page, 0, PAGE_SIZE);
+	/*
+	 * Write dump data
+	 */
+	while (addr < dump_hdr->mem_size) {
+		/*
+		 * Find the next non-zero dump segment with the limit
+		 * of segment length set to the amount of free space left
+		 */
+		addr = find_dump_segment(addr, dump_hdr->mem_size,
+					 ROUND_DOWN(free_space, MIB),
+					 dump_segm);
+		blk = write_dump_segment(blk, dump_segm, page);
+		/* Update free space left on vol */
+		free_space -= dump_segm->len;
+		/* Reserve one block for the next segment header */
+		if (free_space)
+			free_space -= b2m(1);
+		total_dump_size += dump_segm->len;
+		/* Check if no more dump segments follow */
+		if (dump_segm->stop_marker) {
+			/* Write end marker */
+			df_s390_em_page_init(page);
+			writeblock(blk, page, 1, 0);
+			return dump_hdr->mem_size;
+		}
+		/*
+		 * Go to the new volume if not enough space
+		 */
+		if (free_space < MIB)
+			break;
+	}
+	return addr;
+}
+
 /*
  * Dump all memory to multiple DASD partitions
  */
 void dt_dump_mem(void)
 {
-	unsigned long blk, addr, addr_end, blk_num, dev_mem_size, page;
-	struct mvdump_parm_table *mvdump_table_new;
-	struct df_s390_hdr *hdr_new;
+	struct df_s390_dump_segm_hdr *dump_segm;
+	unsigned long addr, page;
 
-	dump_hdr->mvdump_sign = DF_S390_MAGIC;
+	dump_hdr->mvdump_sign = DF_S390_MAGIC_EXT;
 	dump_hdr->mvdump = 1;
 	addr = 0;
-
+	total_dump_size = 0;
 	page = get_zeroed_page();
-	do {
+	dump_segm = (void *)get_zeroed_page();
+
+	while (1) {
 		printf("Dumping to: 0.%x.%04x", device.sid.ssid, device.devno);
-
-		/*
-		 * Check whether parameter table on dump device has a valid
-		 * time stamp. The parameter table is located right behind
-		 * the dump tool, the corresponding block number is:
-		 *   MAGIC_BLOCK_OFFSET + (MVDUMP_TOOL_SIZE / blocksize)
-		 *   So dump tool starts on track 0, block 3
-		 */
-		mvdump_table_new = (void *) page;
-		readblock(3 + MVDUMP_SIZE / 0x1000,
-			  __pa(mvdump_table_new), m2b(0x1000));
-		/*
-		 * Check if time stamps match
-		 */
-		if (mvdump_table.tod != mvdump_table_new->tod)
-			panic(ENOTIME, "Inconsistent time stamps");
-
-		/*
-		 * Check if dump partition has a valid dump signature.
-		 * Bypass signature check if "--force" had been specified during
-		 * zipl -M.
-		 */
-		hdr_new = (void *) page;
-		if (!parm_tail.mvdump_force) {
-			readblock(device.blk_start, __pa(hdr_new), 1);
-			if (dump_hdr->magic != hdr_new->mvdump_sign)
-				panic(ENOSIGN, "Wrong signature");
-		}
-
-		/*
-		 * Write dump header
-		 */
-		blk = device.blk_start;
-		writeblock(blk, __pa(dump_hdr), m2b(DF_S390_HDR_SIZE), 0);
-		blk += m2b(DF_S390_HDR_SIZE);
-
-		dev_mem_size = b2m(device.blk_end - blk + 1);
-		addr_end = MIN(dump_hdr->mem_size, addr + dev_mem_size);
-
-		/*
-		 * Write memory
-		 */
-		memset((void *) page, 0, PAGE_SIZE);
-		while (addr < addr_end) {
-			blk_num = MIN(eckd_blk_max, device.blk_end - blk + 1);
-			blk_num = MIN(m2b(addr_end - addr), blk_num);
-			writeblock(blk, addr, blk_num, page);
-			progress_print(addr);
-			blk += blk_num;
-			addr += b2m(blk_num);
-		}
+		check_volume(page);
+		addr = write_volume(addr, page, dump_segm);
 		if (addr == dump_hdr->mem_size)
 			break;
 		/*
@@ -267,12 +311,8 @@ void dt_dump_mem(void)
 		dt_device_parm_setup();
 		set_device(device.sid, DISABLED);
 		dt_device_enable();
-	} while (1);
+	}
 	progress_print(addr);
-	/*
-	 * Write end marker
-	 */
-	df_s390_em_page_init(page);
-	writeblock(blk, page, 1, 0);
 	free_page(page);
+	free_page(__pa(dump_segm));
 }

zipl/boot/eckd2dump_sv.c

@@ -3,7 +3,7 @@
  *
  * Single-volume ECKD DASD dump tool
  *
- * Copyright IBM Corp. 2013, 2017
+ * Copyright IBM Corp. 2013, 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.
@@ -17,7 +17,7 @@
  * Magic number at start of dump record
  */
 uint64_t magic __attribute__((section(".stage2.head"))) =
-	0x5a45434b44363404ULL; /* "ZECKD64", version 4 */
+	0x5845434b44363401ULL; /* "XECKD64", version 1 */
 
 /*
  * ECKD parameter block passed by zipl
@@ -61,20 +61,29 @@ void dt_device_enable(void)
  */
 void dt_dump_mem(void)
 {
-	unsigned long blk, addr, page;
+	unsigned long blk, addr, end, page;
+	struct df_s390_dump_segm_hdr *dump_segm;
 
 	blk = device.blk_start;
 	page = get_zeroed_page();
+	dump_segm = (void *)get_zeroed_page();
 
 	/* Write dump header */
 	writeblock(blk, __pa(dump_hdr), m2b(DF_S390_HDR_SIZE), 0);
 	blk += m2b(DF_S390_HDR_SIZE);
 
 	/* Write memory */
-	for (addr = 0; addr < dump_hdr->mem_size; addr += b2m(eckd_blk_max)) {
-		writeblock(blk, addr, eckd_blk_max, page);
-		progress_print(addr);
-		blk += eckd_blk_max;
+	addr = 0;
+	total_dump_size = 0;
+	end = dump_hdr->mem_size;
+	while (addr < end) {
+		addr = find_dump_segment(addr, end, 0, dump_segm);
+		blk = write_dump_segment(blk, dump_segm, page);
+		total_dump_size += dump_segm->len;
+		if (dump_segm->stop_marker) {
+			addr = end;
+			break;
+		}
 	}
 	progress_print(addr);
 
@@ -82,4 +91,5 @@ void dt_dump_mem(void)
 	df_s390_em_page_init(page);
 	writeblock(blk, page, 1, 0);
 	free_page(page);
+	free_page(__pa(dump_segm));
 }

zipl/boot/fba2dump.c

@@ -3,7 +3,7 @@
  *
  * Single-volume FBA DASD dump tool
  *
- * Copyright IBM Corp. 2013, 2017
+ * Copyright IBM Corp. 2013, 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.
@@ -13,14 +13,15 @@
 #include "fba.h"
 #include "stage2dump.h"
 
-#define BLK_PWRT	64	/* Blocks per write */
-#define BLK_SIZE	0x200	/* FBA block size */
+#define BLK_PWRT	64			/* Blocks per write */
+#define BLK_SIZE	0x200			/* FBA block size */
+#define BLK_PER_PAGE	(PAGE_SIZE / BLK_SIZE)	/* FBA blocks per page */
 
 /*
  * Magic number at start of dump record
  */
 uint64_t magic __attribute__((section(".stage2.head")))
-	= 0x5a44464241363404ULL; /* ZDFBA64, version 4 */
+	= 0x5844464241363401ULL; /* XDFBA64, version 1 */
 
 /*
  * FBA dump device partition specification
@@ -120,8 +121,8 @@ void dt_device_enable(void)
 /*
  * Write memory with number of blocks to start block
  */
-static void writeblock(unsigned long blk, unsigned long addr, unsigned long blk_count,
-		       unsigned long zero_page)
+static void writeblock_fba(unsigned long blk, unsigned long addr,
+			   unsigned long blk_count, unsigned long zero_page)
 {
 	unsigned long blk_end;
 
@@ -135,6 +136,35 @@ static void writeblock(unsigned long blk, unsigned long addr, unsigned long blk_
 	start_io(IPL_SC, &irb, &orb, 1);
 }
 
+/*
+ * Write dump segment with the header to FBA and return the next free
+ * block number
+ */
+unsigned long write_dump_segment_fba(unsigned long blk,
+				     struct df_s390_dump_segm_hdr *dump_segm,
+				     unsigned long zero_page)
+{
+	unsigned long addr, start_blk, blk_count;
+
+	/* Write the dump segment header itself (1 page) */
+	writeblock_fba(blk, __pa(dump_segm), BLK_PER_PAGE, zero_page);
+	blk += BLK_PER_PAGE;
+	/* Write the dump segment */
+	addr = dump_segm->start;
+	start_blk = blk;
+	while (addr < dump_segm->start + dump_segm->len) {
+		/* Remaining blocks to write */
+		blk_count = m2b(dump_segm->len) - (blk - start_blk);
+		blk_count = MIN(blk_count, BLK_PWRT);
+		writeblock_fba(blk, addr, blk_count, zero_page);
+		progress_print(addr);
+		blk += blk_count;
+		addr += b2m(blk_count);
+	}
+	return blk;
+}
+
+
 /*
  * Initialize the CCW program
  */
@@ -163,26 +193,36 @@ static void ccw_program_init(void)
  */
 void dt_dump_mem(void)
 {
-	unsigned long blk, addr, page;
+	struct df_s390_dump_segm_hdr *dump_segm;
+	unsigned long blk, addr, end, page;
 
 	ccw_program_init();
 	blk = device.blk_start;
 	page = get_zeroed_page();
+	dump_segm = (void *)get_zeroed_page();
 
 	/* Write dump header */
-	writeblock(blk, __pa(dump_hdr), m2b(DF_S390_HDR_SIZE), 0);
-	blk += DF_S390_HDR_SIZE / BLK_SIZE;
+	writeblock_fba(blk, __pa(dump_hdr), m2b(DF_S390_HDR_SIZE), 0);
+	blk += m2b(DF_S390_HDR_SIZE);
 
 	/* Write memory */
-	for (addr = 0; addr < dump_hdr->mem_size; addr += b2m(BLK_PWRT)) {
-		writeblock(blk, addr, BLK_PWRT, page);
-		progress_print(addr);
-		blk += BLK_PWRT;
+	addr = 0;
+	total_dump_size = 0;
+	end = dump_hdr->mem_size;
+	while (addr < end) {
+		addr = find_dump_segment(addr, end, 0, dump_segm);
+		blk = write_dump_segment_fba(blk, dump_segm, page);
+		total_dump_size += dump_segm->len;
+		if (dump_segm->stop_marker) {
+			addr = end;
+			break;
+		}
 	}
 	progress_print(addr);
 
 	/* Write end marker */
 	df_s390_em_page_init(page);
-	writeblock(blk, page, 1, 0);
+	writeblock_fba(blk, page, 1, 0);
 	free_page(page);
+	free_page(__pa(dump_segm));
 }

zipl/boot/libc.c

@@ -23,8 +23,8 @@ extern char __ex_table_start[];
 extern char __ex_table_stop[];
 
 struct ex_table_entry {
-	int fault;
-	int target;
+	unsigned int fault;
+	unsigned int target;
 };
 
 #define MEM_ALLOC_START	((unsigned long) __heap_start)
@@ -310,16 +310,13 @@ void pgm_check_handler_fn(void)
 	struct ex_table_entry *ex_table = (void *) __ex_table_start;
 	struct psw_t *psw_old = &S390_lowcore.program_old_psw;
 	int i, ex_table_cnt;
-	unsigned long fault, target;
 
 	ex_table_cnt = (__ex_table_stop - __ex_table_start)
 		/ sizeof(struct ex_table_entry);
 
 	for (i = 0; i < ex_table_cnt; i++) {
-		fault = __pa(&ex_table[i]) + ex_table[i].fault;
-		if (fault == psw_old->addr) {
-			target = __pa(&ex_table[i]) + ex_table[i].target;
-			psw_old->addr = target;
+		if (ex_table[i].fault == psw_old->addr) {
+			psw_old->addr = ex_table[i].target;
 			return;
 		}
 	}

zipl/boot/s390.h

@@ -18,6 +18,7 @@
 #define __pa(x) ((unsigned long)(x))
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
 #define barrier() __asm__ __volatile__("": : :"memory")
+#define inline		inline __attribute__((always_inline))
 
 /*
  * Helper macro for exception table entries
@@ -25,8 +26,8 @@
 #define EX_TABLE(_fault, _target)	\
 	".section .ex_table,\"a\"\n"	\
 	".align	4\n"			\
-	".long	(" #_fault ") - .\n"	\
-	".long	(" #_target ") - .\n"	\
+	".long	(" #_fault ")\n"	\
+	".long	(" #_target ")\n"	\
 	".previous\n"
 
 struct psw_t {
@@ -207,29 +208,24 @@ do { \
 	libc_stop(reason); \
 } while (0)
 
-#define CHUNK_READ_WRITE	0
-#define CHUNK_READ_ONLY		1
-
-static inline int tprot(unsigned long addr)
-{
-	int rc = -EFAULT;
-
-	asm volatile(
-		"       tprot   0(%1),0\n"
-		"0:     ipm     %0\n"
-		"       srl     %0,28\n"
-		"1:\n"
-		EX_TABLE(0b, 1b)
-		: "+d" (rc) : "a" (addr) : "cc");
-	return rc;
-}
-
 static inline int page_is_valid(unsigned long addr)
 {
+	unsigned long tmp;
 	int rc;
 
-	rc = tprot(addr);
-	return (rc == CHUNK_READ_WRITE) || (rc == CHUNK_READ_ONLY);
+	asm volatile(
+		"0:     ic      %1,%2\n"
+		"1:     lhi     %0,1\n"
+		"2:\n"
+		".pushsection .fixup, \"ax\"\n"
+		"3:     xr      %0,%0\n"
+		"       jg      2b\n"
+		".popsection\n"
+		EX_TABLE(0b, 3b) EX_TABLE(1b, 3b)
+		: "=d" (rc), "=d" (tmp)
+		: "Q" (*(unsigned long *) addr)
+		: "cc");
+	return rc;
 }
 
 static inline uint32_t csum_partial(const void *buf, int len, uint32_t sum)

zipl/boot/stage2dump.c

@@ -3,7 +3,7 @@
  *
  * Common functions for stand-alone dump tools
  *
- * Copyright IBM Corp. 2013, 2017
+ * Copyright IBM Corp. 2013, 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.
@@ -22,8 +22,6 @@
  * Static globals
  */
 static uint8_t machine_has_vx;
-static unsigned long progress_next_addr;
-static unsigned long progress_inc = 0x20000000; /* Issue message each 512M */
 
 /*
  * IPL info in lowcore
@@ -45,6 +43,7 @@ struct stage2dump_parm_tail parm_tail
  * Globals
  */
 struct df_s390_hdr *dump_hdr;
+unsigned long total_dump_size;
 
 /*
  * Init dumper: Allocate standard pages, set timers
@@ -61,29 +60,132 @@ static void init_early(void)
 		machine_has_vx = 1;
 }
 
-/*
-
- * Init dump progress messages to sclp console
- *
- * 8 messages if the memory is 4G or less, otherwise one message for each
- * 512M chunk of dumped memory
- */
-static void progress_init(void)
-{
-	if (dump_hdr->mem_size <= (4 * 1024 * 1024 * 1024ULL))
-		progress_inc = dump_hdr->mem_size >> 3;
-	progress_next_addr = progress_inc;
-}
-
 /*
  * Print progress message
  */
 void progress_print(unsigned long addr)
 {
-	if (addr < progress_next_addr && addr != dump_hdr->mem_size)
+	/* Print a message approximately every 5 sec */
+	static unsigned long delta = 5 * (1UL << 32);
+	static unsigned long next;
+	unsigned long time = get_tod_clock();
+
+	if (next == 0) {
+		next = time + delta;
 		return;
-	printf("%08lu / %08lu MB", addr >> 20, dump_hdr->mem_size >> 20);
-	progress_next_addr += progress_inc;
+	}
+	if (time < next && addr != dump_hdr->mem_size)
+		return;
+
+	printf("%08lu / %08lu MB (Dump file size %08lu MB)", addr >> 20,
+	       dump_hdr->mem_size >> 20, total_dump_size >> 20);
+	next = time + delta;
+}
+
+/*
+ * Check if one MB memory after addr is zero
+ */
+static int __is_zero_mb(unsigned long addr)
+{
+	register unsigned long _addr1 asm("2") = (unsigned long) addr;
+	register unsigned long _len1  asm("3") = (unsigned long) MIB;
+	register unsigned long _addr2 asm("4") = (unsigned long) addr;
+	register unsigned long _len2  asm("5") = (unsigned long) 0;
+	unsigned int ipm;
+
+	asm volatile(
+		"0:     clcle   %1,%3,0(0)\n"
+		"       jo      0b\n"
+		"       ipm     %0\n"
+		"       srl     %0,28\n"
+		: "=d" (ipm), "+d" (_addr1), "+d" (_len1), "+d" (_addr2), "+d" (_len2)
+		:
+		: "cc");
+	return !ipm;
+}
+
+/*
+ * Check if the megabyte contains all zeroes.
+ */
+int is_zero_mb(unsigned long addr)
+{
+	if (!page_is_valid(addr))
+		return 1;
+	if (__is_zero_mb(addr))
+		return 1;
+	return 0;
+}
+
+/*
+ * Find next non-zero megabyte in the address range
+ */
+static unsigned long find_next_non_zero(unsigned long start, unsigned long end)
+{
+	while (start < end) {
+		if (!is_zero_mb(start))
+			break;
+		start += MIB;
+	}
+	if (start > end)
+		start = end;
+	return start;
+}
+
+/*
+ * Find next zero megabyte in the address range
+ */
+static unsigned long find_next_zero(unsigned long start, unsigned long end)
+{
+	while (start < end) {
+		if (is_zero_mb(start))
+			break;
+		start += MIB;
+	}
+	if (start > end)
+		start = end;
+	return start;
+}
+
+/*
+ * Find first continuous set of non-zero megabytes in the specified
+ * address range and update *dump_segm structure accordingly. The segment's
+ * length is truncated to max_len if required. Afterwards, look for the next
+ * non-zero megabyte. Return the address of the next non-zero megabyte or zero
+ * if no more follow.
+ */
+unsigned long find_dump_segment(unsigned long start, unsigned long end,
+				unsigned long max_len,
+				struct df_s390_dump_segm_hdr *dump_segm)
+{
+	unsigned long addr, limit;
+
+	memset(dump_segm, 0, sizeof(*dump_segm));
+	/* Check the input values for MB alingment */
+	if (!IS_ALIGNED(start, MIB) || !IS_ALIGNED(max_len, MIB))
+		panic(EINTERNAL, "start or max_len not MB aligned");
+	/* Search for dump segment start */
+	addr = find_next_non_zero(start, end);
+	if (addr == end)
+		goto out;
+	dump_segm->start = addr;
+	/* Search for dump segment end */
+	limit = end;
+	if (max_len)
+		limit = MIN(addr + max_len, end);
+	addr = find_next_zero(dump_segm->start, limit);
+	dump_segm->len = addr - dump_segm->start;
+	/* Search for next dump segment start */
+	addr = find_next_non_zero(addr, end);
+	/* Return the start address of the next segment */
+	if (addr < end)
+		return addr;
+out:
+	/*
+	 * Set the stop-marker indicating no more non-zero
+	 * segments in the address range
+	 */
+	dump_segm->stop_marker = -1UL;
+	return 0;
 }
 
 /*
@@ -113,11 +215,11 @@ static void df_s390_dump_init(void)
 {
 	struct df_s390_hdr *dh = dump_hdr;
 
-	dh->magic = DF_S390_MAGIC;
+	dh->magic = DF_S390_MAGIC_EXT;
 	dh->hdr_size = DF_S390_HDR_SIZE;
 	dh->page_size = PAGE_SIZE;
 	dh->dump_level = 4;
-	dh->version = 5;
+	dh->version = 1;
 	dh->mem_start = 0;
 	dh->arch = DF_S390_ARCH_64;
 	dh->build_arch = DF_S390_ARCH_64;
@@ -327,7 +429,6 @@ void start(void)
 	printf("Dumping 64 bit OS");
 	mem_and_cpu_init();
 	store_status();
-	progress_init();
 	dt_dump_mem();
 	printf("Dump successful");
 	dump_exit(0);

zipl/boot/stage2dump.h

@@ -3,7 +3,7 @@
  *
  * Common dump functions
  *
- * Copyright IBM Corp. 2013, 2017
+ * Copyright IBM Corp. 2013, 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.
@@ -16,6 +16,8 @@
 #include "s390.h"
 
 #define IPL_SC	*((struct subchannel_id *) &S390_lowcore.subchannel_id)
+#define ROUND_DOWN(x, a)		((x) & ~((typeof(x))(a) - 1))
+#define IS_ALIGNED(x, a)		~((x) & ((typeof(x))(a) - 1))
 
 /*
  * zipl parameters passed at tail of dump tools
@@ -29,23 +31,11 @@ struct stage2dump_parm_tail {
 extern struct stage2dump_parm_tail parm_tail
 	__attribute__ ((section(".stage2dump.tail")));
 
-/*
- * Load 4 bytes from addr
- */
-static inline unsigned int load(unsigned long addr)
-{
-	unsigned int val;
-
-	asm volatile(
-		"	l	%0,0(%1)\n"
-		: "=d" (val) : "d" (addr) : "cc");
-	return val;
-}
-
 /*
  * S390 dump format defines
  */
 #define DF_S390_MAGIC		0xa8190173618f23fdULL
+#define DF_S390_MAGIC_EXT	0xa8190173618f23feULL
 #define DF_S390_HDR_SIZE	0x1000
 #define DF_S390_EM_SIZE		16
 #define DF_S390_EM_MAGIC	0x44554d505f454e44ULL
@@ -98,6 +88,15 @@ struct df_s390_em {
 	uint64_t	tod;
 } __packed __aligned(16);
 
+/*
+ * Dump segment header
+ */
+struct df_s390_dump_segm_hdr {
+	uint64_t start;
+	uint64_t len;
+	uint64_t stop_marker;
+};
+
 /*
  * Linker script defined symbols
  */
@@ -108,6 +107,7 @@ extern char __stage2_desc[];
  * Dump common globals
  */
 extern struct df_s390_hdr *dump_hdr;
+extern unsigned long total_dump_size;
 
 /*
  * Common functions
@@ -118,6 +118,10 @@ void init_progress_print(void);
 void progress_print(unsigned long addr);
 void df_s390_em_page_init(unsigned long page);
 void pgm_check_handler(void);
+int is_zero_mb(unsigned long addr);
+unsigned long find_dump_segment(unsigned long start, unsigned long end,
+				unsigned long max_len,
+				struct df_s390_dump_segm_hdr *dump_segm);
 
 /*
  * Dump tool backend functions

zipl/src/Makefile

@@ -7,8 +7,8 @@ ALL_CPPFLAGS += -I../include -I../boot \
 	    -DZFCPDUMP_FS_RD=$(ZFCPDUMP_FS_RD) \
 	    -DZFCPDUMP_PART_IMAGE=$(ZFCPDUMP_PART_IMAGE) \
 	    -DZFCPDUMP_PART_RD=$(ZFCPDUMP_PART_RD) \
-	    -D_FILE_OFFSET_BITS=64
-ALL_LDFLAGS += -Wl,-z,noexecstack
+	    -D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
+ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
 
 libs =	$(rootdir)/libutil/libutil.a \
 	$(rootdir)/libu2s/libu2s.a
@@ -16,15 +16,19 @@ libs =	$(rootdir)/libutil/libutil.a \
 objects = misc.o error.o scan.o job.o boot.o bootmap.o disk.o \
 	  install.o zipl.o $(rootdir)/zipl/boot/data.o
 
-zipl_helpers = $(wildcard zipl_helper.*)
+zipl_helpers = $(basename $(wildcard zipl_helper.*.c))
 chreipl_helpers = $(subst zipl_,chreipl_, $(zipl_helpers))
 
 all: zipl $(chreipl_helpers)
 
 zipl: $(objects) $(libs)
 
+zipl_helper.device-mapper: $(rootdir)/libdasd/libdasd.a \
+	$(rootdir)/libvtoc/libvtoc.a \
+	$(libs) zipl_helper.device-mapper.o
+
 chreipl_helper.%: zipl_helper.%
-	ln -s $< $@
+	ln -f -s $< $@
 
 install: all
 	$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)
@@ -34,7 +38,7 @@ install: all
 	$(CP) --no-dereference $(chreipl_helpers) $(DESTDIR)$(TOOLS_LIBDIR)
 
 clean:
-	rm -f *.o $(chreipl_helpers) zipl
+	rm -f *.o $(zipl_helpers) $(chreipl_helpers) zipl
 
 .PHONY: all install clean
 

zipl/src/install.c

@@ -3,7 +3,7 @@
  *
  * Functions handling the installation of the boot loader code onto disk
  *
- * Copyright IBM Corp. 2001, 2017
+ * Copyright IBM Corp. 2001, 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.
@@ -636,7 +636,7 @@ overwrite_partition_start(int fd, struct disk_info* info, int mv_dump_magic)
 	unsigned int bytes = 65536;
 	char* buffer;
 	const char dump_magic[] = {0xa8, 0x19, 0x01, 0x73,
-		0x61, 0x8f, 0x23, 0xfd};
+		0x61, 0x8f, 0x23, 0xfe};
 
 	if (misc_seek(fd, info->geo.start * info->phy_block_size))
 		return -1;

zipl/src/zipl_helper.device-mapper

@@ -1,862 +0,0 @@
-#!/usr/bin/perl -w
-#
-# zipl_helper.device-mapper: print zipl parameters for a device-mapper device
-#
-# Copyright IBM Corp. 2009, 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.
-#
-# Depending on the name by which the script is called, it serves one of two
-# purposes:
-#
-# 1. Usage: zipl_helper.device-mapper <target directory> or
-#                                     <major:minor of target device>
-#
-# This tool attempts to obtain zipl parameters for a target directory or
-# partition located on a device-mapper device. It assumes that the
-# device-mapper table for this device conforms to the following rules:
-# - directory is located on a device consisting of a single device-mapper
-#   target
-# - only linear, mirror and multipath targets are supported
-# - supported physical device types are DASD and SCSI devices
-# - all of the device which contains the directory must be located on a single
-#   physical device (which may be mirrored or accessed through a multipath
-#   target)
-# - any mirror in the device-mapper setup must include block 0 of the
-#   physical device
-#
-# 2. Usage: chreipl_helper.device-mapper <major:minor of target device>
-#
-# This tool identifies the physical device which contains the specified
-# device-mapper target devices. If the physical device was found, its
-# major:minor parameters are printed. Otherwise, the script exits with an
-# error message and a non-zero return code.
-#
-
-use strict;
-use File::Basename;
-use POSIX qw/locale_h/;
-
-# Required tools
-our $dmsetup = "dmsetup";
-our $mknod = "mknod";
-our $dasdview = "dasdview";
-our $blockdev = "blockdev";
-
-# Constants
-our $SECTOR_SIZE = 512;
-our $DASD_PARTN_MASK = 0x03;
-our $SCSI_PARTN_MASK = 0x0f;
-
-# Internal constants
-our $DEV_TYPE_CDL = 0;
-our $DEV_TYPE_LDL = 1;
-our $DEV_TYPE_FBA = 2;
-our $DEV_TYPE_SCSI = 3;
-
-our $TARGET_START = 0;
-our $TARGET_LENGTH = 1;
-our $TARGET_TYPE = 2;
-our $TARGET_DATA = 3;
-
-our $TARGET_TYPE_LINEAR = 0;
-our $TARGET_TYPE_MIRROR = 1;
-our $TARGET_TYPE_MULTIPATH = 2;
-
-our $LINEAR_MAJOR = 0;
-our $LINEAR_MINOR = 1;
-our $LINEAR_START_SECTOR = 2;
-
-our $MIRROR_MAJOR = 0;
-our $MIRROR_MINOR = 1;
-our $MIRROR_START_SECTOR = 2;
-
-our $MULTIPATH_MAJOR = 0;
-our $MULTIPATH_MINOR = 1;
-
-sub get_physical_device_dir($);
-sub get_physical_device($$);
-sub get_major_minor($);
-sub get_table($$);
-sub get_linear_data($$);
-sub get_mirror_data($$);
-sub get_multipath_status($);
-sub get_multipath_data($$);
-sub filter_table($$$);
-sub get_target_start($);
-sub get_target_major_minor($);
-sub create_temp_device_node($$$);
-sub get_blocksize($);
-sub get_dasd_info($);
-sub get_partition_start($$);
-sub is_dasd($);
-sub get_partition_base($$$);
-sub get_device_characteristics($$);
-sub get_type_name($);
-sub check_for_mirror($@);
-sub get_target_base($$$$@);
-sub get_device_name($$);
-sub check_tools();
-
-my $phy_geometry;	# Disk geometry of physical device
-my $phy_blocksize;	# Blocksize of physical device
-my $phy_offset;		# Offset in 512-byte sectors between start of physical
-			# device and start of filesystem
-my $phy_type;		# Type of physical device
-my $phy_bootsectors;	# Size of boot record in 512-byte sectors
-my $phy_partstart;	# Partition offset of physical device
-my $phy_major;		# Major device number of physical device
-my $phy_minor;		# Minor device number of physical device
-my @target_list;	# List of dm-targets between filesystem and physical
-			# device.
-my $base_major;		# Major device number of base device.
-my $base_minor;		# Minor device number of base device
-my $directory;		# Command line parameter
-my $toolname;		# Name of tool
-
-# Start
-$toolname = basename($0);
-
-# Setup and use a standard locale to
-# avoid localized scripting output
-$ENV{LC_ALL} = "C"; # for child processes
-setlocale(LC_ALL, "C"); # for current process
-
-# Use alternate code path if called as chreipl helper
-if ($toolname eq "chreipl_helper.device-mapper") {
-	if (!defined($ARGV[0]) || !($ARGV[0] =~ /^\s*(\d+)\s*:\s*(\d+)\s*$/)) {
-		die("Usage: $toolname <major:minor of target devies>\n");
-	}
-	($phy_major, $phy_minor, $phy_offset, @target_list) =
-		get_physical_device($1, $2);
-	print("$phy_major:$phy_minor\n");
-	exit(0);
-}
-
-$directory = $ARGV[0];
-if (!defined($directory)) {
-	die("Usage: $toolname <target directory> or <major:minor of target devies>\n");
-}
-
-# check if needed tools are available
-check_tools();
-
-if (($ARGV[0] =~ /^\s*(\d+)\s*:\s*(\d+)\s*$/)) {
-    	# Determine physical (non-dm) device on which partition is located
-	($phy_major, $phy_minor, $phy_offset, @target_list) =
-		get_physical_device($1,$2);
-}
-else
-{
-	# Determine physical (non-dm) device on which directory is located
-	($phy_major, $phy_minor, $phy_offset, @target_list) =
-		get_physical_device_dir($directory);
-}
-
-# Determine type and characteristics of physical device
-($phy_type, $phy_blocksize, $phy_geometry, $phy_bootsectors, $phy_partstart) =
-	get_device_characteristics($phy_major, $phy_minor);
-
-# Handle partitions
-if ($phy_partstart > 0) {
-	# Only the partition of the physical device is mapped so only the
-	# physical device can provide access to the boot record.
-	($base_major, $base_minor) =
-		get_partition_base($phy_type, $phy_major, $phy_minor);
-	# Check for mirror
-	check_for_mirror(scalar(@target_list) - 1, @target_list);
-	# Adjust filesystem offset
-	$phy_offset += $phy_partstart * ($phy_blocksize / $SECTOR_SIZE);
-	$phy_partstart = 0;
-	# Update device geometry
-	(undef, undef, $phy_geometry, undef, undef) =
-		get_device_characteristics($base_major, $base_minor);
-} else {
-	# All of the device is mapped, so the base device is the top most
-	# dm device which provides access to boot sectors
-	($base_major, $base_minor) =
-		get_target_base($phy_major, $phy_minor, 0, $phy_bootsectors,
-				@target_list);
-}
-
-# Check for valid offset of file system
-if (($phy_offset % ($phy_blocksize / $SECTOR_SIZE)) != 0) {
-	die("Error: File system not aligned on physical block size\n");
-}
-
-# Print resulting information
-print("targetbase=$base_major:$base_minor\n");
-print("targettype=".get_type_name($phy_type)."\n");
-if (defined($phy_geometry)) {
-	print("targetgeometry=$phy_geometry\n");
-}
-print("targetblocksize=$phy_blocksize\n");
-print("targetoffset=".($phy_offset / ($phy_blocksize / $SECTOR_SIZE))."\n");
-
-exit(0);
-
-# get_physical_device_from_dir(dir)
-# Returns (phy_major, phy_minor, phy_offset, @target_list).
-# target_list: [target_data1, target_data2, ..., target_datan]
-# target_data: [major, minor, target]
-sub get_physical_device_dir($)
-{
-	my ($directory) = @_;
-	my ($major, $minor) = get_major_minor($directory);
-
-	return get_physical_device($major, $minor);
-}
-
-# get_physical_device(major, minor)
-# Returns (phy_major, phy_minor, phy_offset, @target_list).
-# target_list: [target_data1, target_data2, ..., target_datan]
-# target_data: [major, minor, target]
-sub get_physical_device($$)
-{
-	my ($major, $minor) = @_;
-	my $table;
-	my $target;
-	my $start;
-	my $length;
-	my @target_list;
-
-	$table = get_table($major, $minor);
-	if (scalar(@$table) == 0) {
-		die("Error: Could not retrieve device-mapper information for ".
-		    "device '".get_device_name($major, $minor)."'\n");
-	}
-	# Filesystem must be on a single dm target
-	if (scalar(@$table) != 1) {
-		die("Error: Unsupported setup: Directory '$directory' is ".
-		    "located on a multi-target device-mapper device\n");
-	}
-
-	$target = $table->[0];
-	push(@target_list, [$major, $minor, $target]);
-	$start = $target->[$TARGET_START];
-	$length = $target->[$TARGET_LENGTH];
-	while (1) {
-		# Convert fs_start to offset on parent dm device
-		$start += get_target_start($target);
-		($major, $minor) = get_target_major_minor($target);
-		$table = get_table($major, $minor);
-		if (scalar(@$table) == 0) {
-			# Found non-dm device
-			return ($major, $minor, $start, @target_list);
-		}
-		# Get target in parent table which contains filesystem
-		$table = filter_table($table, $start, $length);
-		if (scalar(@$table) != 1) {
-			die("Error: Unsupported setup: Could not map ".
-			    "directory '$directory' to a single physical ".
-			    "device\n");
-		}
-		$target = $table->[0];
-		push(@target_list, [$major, $minor, $target]);
-		# Convert fs_start to offset on parent target
-		$start -= $target->[$TARGET_START];
-	}
-}
-
-# get_major_minor(filename)
-# Returns: (device major, device minor) of the device containing the
-# specified file.
-sub get_major_minor($)
-{
-	my ($filename) = @_;
-	my @stat;
-	my $dev;
-	my $major;
-	my $minor;
-
-	@stat = stat($filename);
-	if (!@stat) {
-		die("Error: Could not stat '$filename'\n");
-	}
-	$dev = $stat[0];
-	$major = ($dev & 0xfff00) >> 8;
-	$minor = ($dev & 0xff) | (($dev >> 12) & 0xfff00);
-
-	return ($major, $minor);
-}
-
-# get_table(major, minor)
-# Returns: [target1, target2, ..., targetn]
-# target: [start, length, type, data]
-# data: linear_data|mirror_data|multipath_data
-sub get_table($$)
-{
-	my ($major, $minor) = @_;
-	my @table;
-	my $dev_name = get_device_name($major, $minor);
-	local *HANDLE;
-
-	open(HANDLE, "$dmsetup table -j $major -m $minor 2>/dev/null|") or
-		return undef;
-	while (<HANDLE>) {
-		if (!(/^(\d+)\s+(\d+)\s+(\S+)\s+(\S.*)$/)) {
-			die("Error: Unrecognized device-mapper table format ".
-			    "for device '$dev_name'\n");
-		}
-		my ($start, $length, $target_type, $args) = ($1, $2, $3, $4);
-		my $data;
-		my $type;
-
-		if ($target_type eq "linear") {
-			$type = $TARGET_TYPE_LINEAR;
-			$data = get_linear_data($dev_name, $args);
-		} elsif ($target_type eq "mirror") {
-			$type = $TARGET_TYPE_MIRROR;
-			$data = get_mirror_data($dev_name, $args);
-		} elsif ($target_type eq "multipath") {
-			$type = $TARGET_TYPE_MULTIPATH;
-			$data = get_multipath_data($dev_name, $args);
-		} else {
-			die("Error: Unsupported setup: Unsupported ".
-			    "device-mapper target type '$target_type' for ".
-			    "device '$dev_name'\n");
-		}
-		push(@table, [$start, $length, $type, $data]);
-	}
-	close(HANDLE);
-	return \@table;
-}
-
-# get_linear_data(dev_name, args)
-# Returns: [major, minor, start_sector]
-sub get_linear_data($$)
-{
-	my ($dev_name, $args) = @_;
-
-	if (!($args =~ /^(\d+):(\d+)\s+(\d+)$/)) {
-		die("Error: Unrecognized device-mapper table format for ".
-		    "device '$dev_name'\n");
-	}
-	return [$1, $2, $3];
-}
-
-# get_mirror_data(dev_name, args)
-# Returns [[major1, minor1, start_sector1], [major2, minor2, start_sector2], ..]
-sub get_mirror_data($$)
-{
-	my ($dev_name, $args) = @_;
-	my @argv = split(/\s+/, $args);
-	my @data;
-	my $offset;
-	my $num;
-
-	# Remove log_type + #logargs + logargs
-	splice(@argv, 0, $argv[1] + 2);
-	if (!@argv) {
-		goto out_error;
-	}
-	$num = shift(@argv);
-	while ($num-- > 0) {
-		if (!($argv[0] =~ /^(\d+):(\d+)$/)) {
-			goto out_error;
-		}
-		push(@data, [$1, $2, $argv[1]]);
-		if (!defined($offset)) {
-			$offset = $argv[1];
-		} elsif ($argv[1] != $offset) {
-			die("Error: Unsupported setup: Mirror target on ".
-			    "device '$dev_name' contains entries with varying ".
-			    "sector offsets\n");
-		}
-		splice(@argv, 0, 2);
-	}
-	if (!scalar(@data)) {
-		goto out_error;
-	}
-	return \@data;
-
-out_error:
-	die("Error: Unrecognized device-mapper table format for device ".
-	    "'$dev_name'\n");
-}
-
-# get_multipath_status(device)
-# Return map of nodes to F/A flags (i.e. $map{$node} is either "A" or "F").
-# See linux/drivers/md/dm-mpath.c:multipath_status for details.
-sub get_multipath_status($)
-{
-	my $dev = shift();
-	my %map;
-	my $str;
-	my $failed = 0;
-
-	open(my $fh, "$dmsetup status /dev/$dev 2>/dev/null|") or return undef;
-	while ($str = <$fh>) {
-		# sample output (single line):
-		# 0 67108864 multipath \
-		# 	2 0 0 \
-		#	0 \
-		#	2 2 \
-		#		E 0 \
-		#		2 2 \
-		#			8:16 F 1 \
-		#				0 1 \
-		#			8:0 F 1 \
-		#				0 1 \
-		#		A 0 \
-		#		2 2 \
-		#			8:32 A 0 \
-		#				0 1 \
-		#			8:48 A 0 \
-		#				0 1
-		my @line = split(/\s+/, $str);
-		next if !@line;
-
-		my ($start, $length, $type) = splice(@line, 0, 3);
-		next if $type ne "multipath";
-
-		my $cnt = shift(@line); # Remove #multipath_feature_args +
-		splice(@line, 0, $cnt) if $cnt > 0; # multipath_feature_args
-
-		$cnt = shift(@line); # Remove #handler_status_args +
-		splice(@line, 0, $cnt) if $cnt > 0; # handler_status_args
-
-		# num_groups init_group_number ...
-		my ($ngr, $ign) = splice(@line, 0, 2);
-		for (my $g = 0; $g < $ngr; $g++) {
-			# Remove group_state + #ps_status_args
-			# group_state: D(isabled), A(ctive), or E(nabled)
-			my ($state, $cnt) = splice(@line, 0, 2);
-			# Remove ps_status_args*
-			splice(@line, 0, $cnt) if $cnt > 0;
-			# Remove #paths + #selector_args
-			my ($paths, $nsa) = splice(@line, 0, 2);
-			for (my $p = 0; $p < $paths; $p++) {
-				# Fetch single path description
-				my ($node, $active, $fail_cnt)
-					= splice(@line, 0, 3);
-				# active: A(ctive) or F(ailed)
-				$map{$node} = $active;
-				$failed++ if $active ne "A";
-				# Remove selector_args*
-				splice(@line, 0, $nsa) if $nsa > 0;
-			}
-		}
-	}
-	close($fh);
-
-	die ("Error: No paths found for '$dev'\n") if scalar(keys %map) == 0;
-	if ($failed) {
-		die ("Error: All paths for '$dev' failed\n")
-			if $failed == scalar(keys %map);
-
-		print(STDERR "Warning: There are one or more failed paths for"
-			." device '$dev'\n");
-	}
-	return \%map;
-}
-
-# get_multipath_data(dev_name, args)
-# Returns [[major1, minor1], [major2, minor2], ..]
-sub get_multipath_data($$)
-{
-	my ($dev_name, $args) = @_;
-	my $status = get_multipath_status($dev_name);
-	my @argv = split(/\s+/, $args);
-	my @data;
-
-	# Remove #features + features
-	splice(@argv, 0, $argv[0] + 1);
-	if (!@argv) {
-		goto out_error;
-	}
-	# Remove #handlerargs + handlerargs
-	splice(@argv, 0, $argv[0] + 1);
-	if (!@argv) {
-		goto out_error;
-	}
-	# Remove #pathgroups + pathgroup
-	splice(@argv, 0, 2);
-	while (@argv) {
-		# Remove pathselector + #selectorargs + selectorargs
-		splice(@argv, 0, 2 + $argv[1]);
-		if (!@argv) {
-			goto out_error;
-		}
-		my $num_paths = $argv[0];
-		my $num_path_args = $argv[1];
-		# Remove #paths + #pathargs
-		splice(@argv, 0, 2);
-		while ($num_paths-- > 0) {
-			if (!@argv) {
-				goto out_error;
-			}
-			if (!($argv[0] =~ /(\d+):(\d+)/)) {
-				goto out_error;
-			}
-			push(@data, [$1, $2]) if $status->{$argv[0]} eq "A";
-			# Remove device + deviceargs
-			splice(@argv, 0, 1 + $num_path_args);
-		}
-	}
-	if (!@data) {
-		goto out_error;
-	}
-	return \@data;
-
-out_error:
-	die("Error: Unrecognized device-mapper table format for device ".
-	    "'$dev_name'\n");
-}
-
-# filter_table(table, start, length)
-# Returns table containing only targets between start and start + length - 1.
-sub filter_table($$$)
-{
-	my ($table, $start, $length) = @_;
-	my $end = $start + $length - 1;
-	my @result;
-	my $target;
-
-	foreach $target (@$table) {
-		my $target_start = $target->[$TARGET_START];
-		my $target_end = $target_start + $target->[$TARGET_LENGTH] - 1;
-
-		if (!(($target_end < $start) || ($target_start > $end))) {
-			push(@result, $target);
-		}
-	}
-	return \@result;
-}
-
-# get_target_start(target)
-# Returns the start sector of target.
-sub get_target_start($)
-{
-	my ($target) = @_;
-	my $type = $target->[$TARGET_TYPE];
-	my $data = $target->[$TARGET_DATA];
-
-	if ($type == $TARGET_TYPE_LINEAR) {
-		return $data->[$LINEAR_START_SECTOR];
-	} elsif ($type == $TARGET_TYPE_MIRROR) {
-		my $mirror_data = $data->[0];
-		return $mirror_data->[$MIRROR_START_SECTOR];
-	} else {
-		return 0;
-	}
-}
-
-# get_target_major_minor(target)
-# Returns (major, minor) of target of target.
-sub get_target_major_minor($)
-{
-	my ($target) = @_;
-	my $type = $target->[$TARGET_TYPE];
-	my $data = $target->[$TARGET_DATA];
-	my $major;
-	my $minor;
-
-	if ($type == $TARGET_TYPE_LINEAR) {
-		$major = $data->[$LINEAR_MAJOR];
-		$minor = $data->[$LINEAR_MINOR];
-	} elsif ($type == $TARGET_TYPE_MIRROR) {
-		# Use data of first device in list
-		my $mirror_data = $data->[0];
-		$major = $mirror_data->[$MIRROR_MAJOR];
-		$minor = $mirror_data->[$MIRROR_MINOR];
-	} elsif ($type == $TARGET_TYPE_MULTIPATH) {
-		# Use data of first device in list
-		my $multipath_data = $data->[0];
-		$major = $multipath_data->[$MULTIPATH_MAJOR];
-		$minor = $multipath_data->[$MULTIPATH_MINOR];
-	}
-	return ($major, $minor);
-}
-
-# create_temp_device_node(type, major, minor)
-# Returns the name of a temporary device node.
-sub create_temp_device_node($$$)
-{
-	my ($type, $major, $minor) = @_;
-	my $path = "/dev";
-	my $name;
-	my $num;
-
-	for ($num = 0; $num < 100; $num++) {
-		$name = sprintf("$path/zipl-dm-temp-%02d", $num);
-		if (-e $name) {
-			next;
-		}
-		if (system("$mknod $name $type $major $minor --mode 0600 ".
-			   "2>/dev/null")) {
-			next;
-		}
-		return $name;
-	}
-	die("Error: Could not create temporary device node in '$path'\n");
-}
-
-# get_blocksize(device)
-# # Return blocksize in bytes for device.
-sub get_blocksize($)
-{
-	my ($dev) = @_;
-	my $blocksize;
-	local *HANDLE;
-
-	open(HANDLE, "$blockdev --getss $dev 2>/dev/null|") or
-		return undef;
-	$blocksize = <HANDLE>;
-	chomp($blocksize);
-	close(HANDLE);
-
-	return $blocksize;
-}
-
-# get_dasd_info(device)
-# Returns (type, cylinders, heads, sectors)
-sub get_dasd_info($)
-{
-	my ($dev) = @_;
-	my $disk_type;
-	my $format;
-	my $cyl;
-	my $heads;
-	my $sectors;
-	my $type;
-	local *HANDLE;
-
-	open(HANDLE, "$dasdview -x $dev 2>/dev/null|") or
-		# dasdview returned with an error
-		return undef;
-	while (<HANDLE>) {
-		if (/^number of cylinders.*\s(\d+)\s*$/) {
-			$cyl = $1;
-		} elsif (/^tracks per cylinder.*\s(\d+)\s*$/) {
-			$heads = $1;
-		} elsif (/^blocks per track.*\s(\d+)\s*$/) {
-			$sectors = $1;
-		} elsif (/^type\s+:\s+(\S+)\s*$/) {
-			$disk_type = $1;
-		} elsif (/^format.*\s+dec\s(\d+)\s/) {
-			$format = $1;
-		}
-	}
-	close(HANDLE);
-	if (!defined($cyl) || !defined($heads) || !defined($sectors) ||
-	    !defined($disk_type) || !defined($format)) {
-		# Unrecognized dadsview output format
-		return undef;
-	}
-	if ($disk_type eq "FBA") {
-		$type = $DEV_TYPE_FBA;
-	} elsif ($disk_type eq "ECKD") {
-		if ($format == 1) {
-			$type = $DEV_TYPE_LDL;
-		} elsif ($format == 2) {
-			$type = $DEV_TYPE_CDL;
-		}
-	}
-
-	return ($type, $cyl, $heads, $sectors);
-}
-
-# get_partition_start(major, minor)
-# Return the partition offset of device.
-sub get_partition_start($$)
-{
-	my ($major, $minor) = @_;
-	my $dir = "/sys/dev/block/$major:$minor";
-	my $offset;
-	local *HANDLE;
-
-	return undef if (!-d $dir);
-
-	open(HANDLE, "<", "$dir/start") or return 0;
-	$offset = <HANDLE>;
-	close(HANDLE);
-
-	chomp($offset);
-
-	return $offset;
-}
-
-# is_dasd(type)
-# Return whether disk with type is a DASD.
-sub is_dasd($)
-{
-	my ($type) = @_;
-
-	return ($type == $DEV_TYPE_CDL) || ($type == $DEV_TYPE_LDL) ||
-	       ($type == $DEV_TYPE_FBA);
-}
-
-# get_partition_base(type, major, minor)
-# Return (major, minor) of the base device on which the partition is located.
-sub get_partition_base($$$)
-{
-	my ($type, $major, $minor) = @_;
-
-	if (is_dasd($type)) {
-		return ($major, $minor & ~$DASD_PARTN_MASK);
-	} else {
-		return ($major, $minor & ~$SCSI_PARTN_MASK);
-	}
-}
-
-# get_device_characteristics(major, minor)
-# Returns (type, blocksize, geometry, bootsectors, partstart) for device.
-sub get_device_characteristics($$)
-{
-	my ($major, $minor) = @_;
-	my $dev;
-	my $blocksize;
-	my $type;
-	my $cyl;
-	my $heads;
-	my $sectors;
-	my $geometry;
-	my $bootsectors;
-	my $partstart;
-
-	$dev = create_temp_device_node("b", $major, $minor);
-	$blocksize = get_blocksize($dev);
-	if (!defined($blocksize)) {
-		unlink($dev);
-		die("Error: Could not get block size for ".
-		    get_device_name($major, $minor)."\n");
-	}
-	($type, $cyl, $heads, $sectors) = get_dasd_info($dev);
-	if (defined($type)) {
-		$geometry = "$cyl,$heads,$sectors";
-		if ($type == $DEV_TYPE_CDL) {
-			# First track contains IPL records
-			$bootsectors = $blocksize * $sectors / $SECTOR_SIZE;
-		} elsif ($type == $DEV_TYPE_LDL) {
-			# First two blocks contain IPL records
-			$bootsectors = $blocksize * 2 / $SECTOR_SIZE;
-		} elsif ($type == $DEV_TYPE_FBA) {
-			# First block contains IPL records
-			$bootsectors = $blocksize / $SECTOR_SIZE;
-		}
-	} else {
-		# Assume SCSI if get_dasd_info failed
-		$type = $DEV_TYPE_SCSI;
-		# First block contains IPL records
-		$bootsectors = $blocksize / $SECTOR_SIZE;
-	}
-	$partstart = get_partition_start($major, $minor);
-	unlink($dev);
-	if (!defined($partstart)) {
-		die("Error: Could not determine partition start for ".
-		    get_device_name($major, $minor)."\n");
-	}
-	# Convert partition start in sectors to blocks
-	$partstart = $partstart / ($blocksize / $SECTOR_SIZE);
-	return ($type, $blocksize, $geometry, $bootsectors, $partstart);
-}
-
-# get_type_name(type)
-# Return textual representation of device type.
-sub get_type_name($)
-{
-	my ($type) = @_;
-
-	if ($type == $DEV_TYPE_CDL) {
-		return "CDL";
-	} elsif ($type == $DEV_TYPE_LDL) {
-		return "LDL";
-	} elsif ($type == $DEV_TYPE_FBA) {
-		return "FBA";
-	} elsif ($type == $DEV_TYPE_SCSI) {
-		return "SCSI";
-	}
-	return undef;
-}
-
-
-# check_for_mirror(index, target_list)
-# Die if there is a mirror target between index and 0.
-sub check_for_mirror($@)
-{
-	my ($i, @target_list) = @_;
-
-	for (;$i >= 0; $i--) {
-		my $entry = $target_list[$i];
-		my ($major, $minor, $target) = @$entry;
-
-		if ($target->[$TARGET_TYPE] == $TARGET_TYPE_MIRROR) {
-			# IPL records are not mirrored.
-			die("Error: Unsupported setup: Block 0 is not ".
-			    "mirrored in device '".
-			    get_device_name($major, $minor)."'\n");
-		}
-	}
-}
-
-# get_target_base(bottom_major, bottom_minor, start, length, target_list)
-# Return (major, minor) for the top most target in the target list that maps
-# the region on (bottom_major, bottom_minor) defined by start and length at
-# offset 0.
-sub get_target_base($$$$@)
-{
-	my ($bot_major, $bot_minor, $start, $length, @target_list) = @_;
-	my $entry;
-	my $top_major;
-	my $top_minor;
-	my $i;
-
-	# Pre-initialize with bottom major-minor
-	$top_major = $bot_major;
-	$top_minor = $bot_minor;
-	# Process all entries starting with the last one
-	for ($i = scalar(@target_list) - 1; $i >= 0; $i--) {
-		my $entry = $target_list[$i];
-		my ($major, $minor, $target) = @$entry;
-
-		if (($target->[$TARGET_START] != 0) ||
-		    (get_target_start($target) != 0) ||
-		    ($target->[$TARGET_LENGTH] < $length)) {
-			last;
-		}
-		$top_major = $major;
-		$top_minor = $minor;
-	}
-	# Check for mirrorring between base device and fs device.
-	check_for_mirror($i, @target_list);
-	return ($top_major, $top_minor);
-}
-
-# get_device_name(major, minor)
-# Return the name of the device specified by major and minor.
-sub get_device_name($$)
-{
-	my ($major, $minor) = @_;
-	my $name;
-	local *HANDLE;
-
-	$name = "$major:$minor";
-	open(HANDLE, "</proc/partitions") or goto out;
-	while (<HANDLE>) {
-		if (/^\s*(\d+)\s+(\d+)\s+\d+\s+(\S+)\s*$/) {
-			if (($major == $1) && ($minor == $2)) {
-				$name = $3;
-				last;
-			}
-		}
-	}
-	close(HANDLE);
-out:
-	return $name;
-}
-
-sub check_tools()
-{
-system("$dmsetup --version &> /dev/null") >> 8 != 127
-    or die("Error: dmsetup not found\n");
-system("$mknod --version &> /dev/null") >> 8 != 127
-    or die("Error: mknod not found\n");
-system("$dasdview --version &> /dev/null") >> 8 != 127
-    or die("Error: dasdview not found\n");
-system("$blockdev --version &> /dev/null") >> 8 != 127
-    or die("Error: blockdev not found\n");
-
-return 0;
-}

zkey/Makefile

@@ -1,21 +1,45 @@
 include ../common.mak
 
-CPPFLAGS += -I../include
-LDLIBS += -ldl
+ifeq (${HAVE_OPENSSL},0)
 
-all: zkey
+all:
+	$(SKIP) HAVE_OPENSSL=0
+
+install:
+	$(SKIP) HAVE_OPENSSL=0
+
+else
+
+check_dep:
+	$(call check_dep, \
+		"zkey", \
+		"openssl/evp.h", \
+		"openssl-devel", \
+		"HAVE_OPENSSL=0")
+
+CPPFLAGS += -I../include
+LDLIBS += -ldl -lcrypto
+
+all: check_dep zkey
 
 libs = $(rootdir)/libutil/libutil.a
 
 zkey.o: zkey.c pkey.h misc.h
+pkey.o: pkey.c pkey.h
+properties.o: properties.c properties.h
+keystore.o: keystore.c keystore.h properties.h
 
-zkey: zkey.o $(libs)
+zkey: zkey.o pkey.o properties.o keystore.o $(libs)
 
 install: all
 	$(INSTALL) -d -m 755 $(DESTDIR)$(USRBINDIR)
 	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 zkey $(DESTDIR)$(USRBINDIR)
 	$(INSTALL) -d -m 755 $(DESTDIR)$(MANDIR)/man1
 	$(INSTALL) -m 644 -c zkey.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL) -d -m 770 $(DESTDIR)$(SYSCONFDIR)/zkey
+	$(INSTALL) -d -m 770 $(DESTDIR)$(SYSCONFDIR)/zkey/repository
+
+endif
 
 clean:
 	rm -f *.o zkey