Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.4:Update
s390-tools.14220
s390-tools-sles15-4-lsluns-fix-to-prevent-error...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File s390-tools-sles15-4-lsluns-fix-to-prevent-error-messages-if-there-are-no.patch of Package s390-tools.14220
Subject: lstape, lsluns: handle non-zfcp; lin_tape multiple paths From: Steffen Maier <maier@linux.ibm.com> Description: lstape, lsluns: handle non-zfcp; lin_tape multiple paths Symptom: lstape shows unexpected additional Device suffix numbers in excess output columns for each additional path of the same tape/changer driven by the IBM lin_tape device driver (independent of actual path failover enablement in lin_tape). It also shows a wrong number of found devices in the header (without --scsi-only). lstape prints error about "Unexpected extra argument:" and the usage for "sg_inq" along with wrong tabular output. lsluns prints ENOENT error text for "cat" on SCSI device sysfs attributes hba_id, wwpn, and fcp_lun. lstape with --verbose option prints ENOENT error text for "cat" on SCSI device sysfs attributes hba_id and wwpn. lstape man page: Description of --type and <devbusid> filter for channel tapes is incomplete. SCSI output description is incomplete. lstape shows "N/A" instead of the HBA device bus-ID with virtio-scsi-ccw. Problem: s390-tools-1.8.0 before the first upstream commit b627b8d8e1ab ("Initial s390-tools-2.0.0 import") introduced SCSI tape/changer output for lstape. It used the SCSI device serial number as lookup key to find a match in IBM lin_tape device driver proc-fs output for a given SCSI device name. Multiple paths to the same tape/changer have the same serial number. Multiple matches cause excess arguments to printf. Explaining the resulting output, the bash man page says: "The format is reused as necessary to consume all of the arguments." This also causes a wrong number of found devices. The default bash settings have nullglob disabled so if $SCSI_DEV/scsi_generic* aka /sys/bus/scsi/devices/*:*:*:*/scsi_generic* does not match anything, it leaves the glob pattern unmodified and SG_DEV=$(basename $SG_DEV/*) results in the literal "*". If $SG_INQ exists, it invoked sg_inq with more than the one allowed positional argument for a SCSI generic device node "sg_inq /dev/*". Causing error messages and the usage of sg_inq to land in $TAPE_SERIAL. lsluns iterates SCSI generic devices and unconditionally reads zfcp-specific SCSI device sysfs attributes hba_id, wwpn, and fcp_lun. lstape --verbose unconditionally reads zfcp-specific SCSI device sysfs attributes hba_id and wwpn. <devbusid> filter missing from synopsis. <device-type> example at wrong place with <devbusid> filter. <devbusid> filter option description is a duplicate of <device-type> filter option description. SCSI output description misses fields. Lstape only used the zfcp-specific sysfs attribute hba_id. Solution: Prefer sysfs to find lin_tape device name for SCSI device. Fallback: The lin_tape proc-fs output format has changed over the years. The HBA device driver string can contain whitespace (e.g. "Virtio SCSI HBA") and breaks the field numbers with tokenized parsing. Grep for the SCSI device name as word (to skip names with same substring, such as 0:0:1:1 also matching 0:0:1:10) and cut the first field 'Number' (lin_tape device name suffix). If there is no SCSI column at all [lin_tape before v2.2.0] (and no SCSI LLDD or other column with a name accidentally matching an existing SCSI device name), we get no match and better bail out with the initialized "N/A" for the lstape column "Device". To not have to rely on the nullglob setting, explicitly check for the existence of $SCSI_DEV/scsi_generic before evaluating SG_DEV=$(basename $SG_DEV/*). Also handle availability of sg_inq but absence of scsi_generic individually to provide the user with a hint if only sg is missing. Simply skip non-zfcp SCSI devices, such as iSCSI or virtio-scsi-ccw, to not erroneously access absent attributes. Assume "N/A" for HBA and WWPN of non-zfcp SCSI devices, such as iSCSI or virtio-scsi-ccw, to not erroneously access absent zfcp-specific sysfs attributes. Add <devbusid> filter to synopsis. Move <device-type> example to <device-type> option. Replace <devbusid> filter option description. Move existing SCSI output description to a new subsection and add description of missing fields. Also search sysfs for an ancestor with subsystem ccw. Reproduction: Attach more than one path to the same SCSI tape or changer and load the IBM lin_tape device driver. Unload sg kernel module. Attach non-zfcp SCSI devices such as iSCSI or virtio-scsi-ccw. Attach non-zfcp SCSI devices such as iSCSI or virtio-scsi-ccw. man lstape Attach SCSI tape or changer with virtio-scsi-ccw to a KVM guest and run "lstape --verbose". Upstream-ID: - Problem-ID: 170633 Signed-off-by: Steffen Maier <maier@linux.ibm.com> --- zconf/lsluns | 14 +++++++++----- zconf/lsluns.8 | 5 ++--- 2 files changed, 11 insertions(+), 8 deletions(-) --- a/zconf/lsluns +++ b/zconf/lsluns @@ -2,7 +2,7 @@ # # lsluns - list LUNs discovered in the FC SAN, or show encryption state of attached LUNs # -# Copyright IBM Corp. 2008, 2017 +# Copyright IBM Corp. 2008, 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. @@ -152,6 +152,11 @@ sub get_lun_hash my %lun_hash; foreach my $device (</$sg_dir/sg*>) { + # skip non-zfcp SCSI devices and avoid file access error messages + next unless -r "$device/device/fcp_lun"; + next unless -r "$device/device/wwpn"; + next unless -r "$device/device/hba_id"; + my $l = `cat $device/device/fcp_lun`; my $p = `cat $device/device/wwpn`; my $a = `cat $device/device/hba_id`; @@ -170,9 +175,8 @@ sub get_lun_hash sub lsluns_usage { print <<EOD; Usage: -This tool is designed for environments where all SCSI devices are attached -through the zfcp device driver. Expect error messages in mixed environments -such as with iSCSI. +This tool is designed for environments with SCSI devices attached +through the zfcp device driver. $PROGRAM_NAME [-c <busid>] ... [-p <wwpn>] ... [-h] [-v] @@ -220,7 +224,7 @@ EOD sub lsluns_version { print "$PROGRAM_NAME: version %S390_TOOLS_VERSION%\n"; - print "Copyright IBM Corp. 2008, 2017\n"; + print "Copyright IBM Corp. 2008, 2018\n"; } sub lsluns_invalid_usage { --- a/zconf/lsluns.8 +++ b/zconf/lsluns.8 @@ -28,9 +28,8 @@ zfcp-attached LUNs .SH DESCRIPTION .PP -This tool is designed for environments where all SCSI devices are attached -through the zfcp device driver. Expect error messages in mixed environments -such as with iSCSI. +This tool is designed for environments with SCSI devices attached +through the zfcp device driver. .B lsluns lists all logical unit numbers (LUNs) discovered in the
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
