Merge ~rafaeldtinoco/ubuntu/+source/sg3-utils:lp1833618-bionic into ubuntu/+source/sg3-utils:ubuntu/bionic-devel

[Rafael David Tinoco]

Bug: https://bugs.launchpad.net/ubuntu/+source/sg3-utils/+bug/1833618
PPA: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1833618

[Rafael David Tinoco (rafaeldtinoco)]

I'll wait for feedback in bug:

https://bugs.launchpad.net/ubuntu/+source/sg3-utils/+bug/1833618

Before asking for this to be sponsored (fyio).

d8fe484... by Rafael David Tinoco on 2019-10-09

55-scsi-sg3_id.rules: ID_SERIAL fix for USB SPC-only devices

This upstream commit changes the udev rules logic for USB block devices
that only supports SCSI PRIMARY COMMANDS, not supporting SCSI INQ 0x80
nor 0x83.

Despite a possible delay, still existing in this version, whenever a
SPC-only block device (pendrive ?) is attached, this version fixes the
main issue for (LP: 1833618), wrong ID_SERIAL for those devices.

507c4d7... by Rafael David Tinoco on 2019-10-09

Fix for FTBFS in Ubuntu Disco due to header changes.

- new location for major() and minor()

0161dca... by Rafael David Tinoco on 2019-10-09

changelog

[Rafael David Tinoco (rafaeldtinoco)]

Re-pushed based on comments made by paelzer's review in:

https://code.launchpad.net/~rafaeldtinoco/ubuntu/+source/sg3-utils/+git/sg3-utils/+merge/373439

[Ryan Harper (raharper)]

One comment for clarification. I believe this is OK as-is due to sg3-utils not being installed in the bionic server image by default.

[Rafael David Tinoco (rafaeldtinoco)]

you mean leaving Bionic as won't fix for this ?

I'm okay with that, public bug is already documenting the issue and has a patch if anyone wants (which is just changing udev rules).

[Rafael David Tinoco (rafaeldtinoco)]

sorry, ignore previous comment, checking inline comments..

[Ryan Harper (raharper)]

Thanks for the clarification.

review: Approve

[Rafael David Tinoco (rafaeldtinoco)]

Thx, I'll move on with this fix then (also based on Christian's review of the Disco version):

https://code.launchpad.net/~rafaeldtinoco/ubuntu/+source/sg3-utils/+git/sg3-utils/+merge/373439

review: Approve

[Steve Langasek (vorlon)]

review: Approve

Unmerged commits

0161dca... by Rafael David Tinoco on 2019-10-09

changelog

507c4d7... by Rafael David Tinoco on 2019-10-09

Fix for FTBFS in Ubuntu Disco due to header changes.

- new location for major() and minor()

d8fe484... by Rafael David Tinoco on 2019-10-09

55-scsi-sg3_id.rules: ID_SERIAL fix for USB SPC-only devices

This upstream commit changes the udev rules logic for USB block devices
that only supports SCSI PRIMARY COMMANDS, not supporting SCSI INQ 0x80
nor 0x83.

Despite a possible delay, still existing in this version, whenever a
SPC-only block device (pendrive ?) is attached, this version fixes the
main issue for (LP: 1833618), wrong ID_SERIAL for those devices.

a938448... by Mathieu Trudel-Lapierre on 2016-07-06

Import patches-unapplied version 1.42-2ubuntu1 to ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: ab52525db3b33aa54a26e51fe755d5fd26e80cb2

New changelog entries:
  * debian/control, debian/rules: build a sg3-udeb installer package again.
  * debian/sg3-udeb.install: install the right binaries for sg3-udeb.

ab52525... by Ritesh Raj Sarraf on 2016-03-22

Import patches-unapplied version 1.42-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: db7e88927ff9f83e1d21b4b09e926b9c7eb6f755

New changelog entries:
  * [a3ba3f8] Don't hardcode architecture in install files
  * Also close below bug. Its udev rule error is fixed in 1.42
    (Closes: #799680)
  * [1602649] Add debian/gbp.conf to explicitly enable pristine-tar
    for this package's packaging
  * [5e8831f] Imported Upstream version 1.42
  * [207bf28] Update symbol list for 1.42
  * [5bb50a3] Bump debhelper to 9
  * [3ef31a6] Fix Vcs URLs
  * [ed19382] Update install list

db7e889... by Ritesh Raj Sarraf on 2015-07-08

Import patches-unapplied version 1.41-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 9878f2db3b3e92091df79e531c85df58f2a89e1c

New changelog entries:
  [ Mauricio Faria de Oliveira ]
  * sg3-utils-udev (new binary package): provide the udev rules for
    SCSI-ID mappings and symlinks at boot time for multipath-tools:
    - debian/control: add sg3-utils-udev
    - debian/rules: build it with override_dh_{install,clean}
    - debian/initramfs/hooks: add_udev_rules() and copy_exec() 'sg_inq'
      to initramfs
    - debian/sg3-utils-udev.post{inst,rm}: call update-initramfs
  [ Ritesh Raj Sarraf ]
  * [7c346df] Add misc:Depends to dependency
  * [b719c1a] Clean up README.source
  * [e799461] Remove stale debian/ folder in upstream branch
  * [92db371] Imported Upstream version 1.41
  * [dadce5a] Recover debian/ files from improper gbp import
    --filter=debian
  * [e7aa4ba] Refresh patch debian/patches/ship-rescan-script.sh
  * [33af743] Update symbols introduced in 1.41

9878f2d... by Ritesh Raj Sarraf on 2014-09-29

Import patches-unapplied version 1.39-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 27cd9b81a06147b914a15cc572ad0965784b1109

New changelog entries:
  * [a3a22b2] Imported Upstream version 1.39
  * [c1a14cb] Update symbols list

27cd9b8... by Ritesh Raj Sarraf on 2014-08-27

Import patches-unapplied version 1.38-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: d19f50707ab87250494a2cb88e069c653afc0bd2

New changelog entries:
  * [c9b57d9] Ship the rescan-scsi-bus.sh script (Closes: #758926)
    Note: The scsitools package also ships a rescan-scsi-bus script.
    To make the files not overwrite, rescan-scsi-bus.sh script is
    shipped into /usr/bin/

d19f507... by Ritesh Raj Sarraf on 2014-04-03

Import patches-unapplied version 1.38-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 0ce210b2dfc9a478788c1541508bc04ab18fe7f4

New changelog entries:
  * [d956539] Use dh-autoreconf for build.
    Thanks to Colin Watson (Closes: #732541)
  * [2fc0300] Imported Upstream version 1.38

0ce210b... by Ritesh Raj Sarraf on 2013-06-23

Import patches-unapplied version 1.36-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 4bc36facc67f10635543f4668023671c8f3c9930

New changelog entries:
  * [69e9dac] Imported Upstream version 1.36
  * [cb75936] Add debian compat, level 7
  * [68fed25] update README.source
  * [3c724fc] Add build-dep autotools-dev
  * [e4b9fdd] add destdir to install path
  * [7cfff11] Simplify build with debhelper
  * [f9a7540] Update symbols for 1.36 release
  * [7b0b48d] Enable hardening build

diff --git a/debian/changelog b/debian/changelog
index 15acda8..be1c47c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sg3-utils (1.42-2ubuntu2~18.04~1) bionic; urgency=medium
+
+  * d/p/55-scsi-sg3_id.rules-ID_SERIAL-fix.patch: ID_SERIAL fix for USB
+    SPC-only devices in 55-scsi-sg3_id.rules (LP: #1833618)
+  * d/p/new-location-for-major-and-minor.patch: Fix FTBS header issue
+
+ -- Rafael David Tinoco <[e-mail]>  Wed, 09 Oct 2019 06:38:32 +0000
+
 sg3-utils (1.42-2ubuntu1) yakkety; urgency=medium
 
   * debian/control, debian/rules: build a sg3-udeb installer package again.
diff --git a/debian/patches/55-scsi-sg3_id.rules-ID_SERIAL-fix.patch b/debian/patches/55-scsi-sg3_id.rules-ID_SERIAL-fix.patch
new file mode 100644
index 0000000..7eddde3
--- /dev/null
+++ b/debian/patches/55-scsi-sg3_id.rules-ID_SERIAL-fix.patch
@@ -0,0 +1,85 @@
+Description: 55-scsi-sg3_id.rules: ID_SERIAL fix for USB SPC-only devices
+
+Upstream commit had changes for:
+
+git-svn-id: svn://localhost/trunk@703 6180dd3e-e324-4e3e-922d-17de1ae2f315
+---
+ ChangeLog                    |  4 +++-
+ scripts/55-scsi-sg3_id.rules | 15 ++++++++----
+ scripts/rescan-scsi-bus.sh   | 46 ++++++++++++++++++++----------------
+ 3 files changed, 38 insertions(+), 27 deletions(-)
+
+But, for this SRU, I'm backporting ONLY the changes in:
+
+ 55-scsi-sg3_id.rules |   15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+Because I'm only interested in the fix for USB SPC-only devices ID_SERIAL.
+
+This upstream commit changes the udev rules logic for USB block devices
+that only supports SCSI PRIMARY COMMANDS, not supporting SCSI INQ 0x80
+nor 0x83.
+
+Despite a possible delay, still existing in this version, whenever a
+SPC-only block device (pendrive ?) is attached, this version fixes the
+main issue for LP: 1833618, wrong ID_SERIAL for those devices.
+
+Udev rules from sg3-utils will, still, execute SCSI INQ 0X80 trying to use VPDs
+from the kernel, and those will fail fast. Unfortunately, the subsequent SCSI
+INQ 0x83 command, also trying to use VPDs from kernel, will take much longer
+time (sometimes up to 1 minute) to fail when it sees there is no existing
+vpd_pg83 file in sysfs and send an INQ to the USB block device, adding a delay
+in the device attachment. This is not being addressed in this fix as this is
+still present in upstream version.
+
+This last issue has to be addressed in a future sg3-utils-merge and
+that is why is being documented here (when this patch will likely be
+dropped).
+
+Signed-off-by: Rafael David Tinoco <[e-mail]>
+
+Author: Douglas Gilbert <[e-mail]>
+Origin: upstream, https://github.com/hreinecke/sg3_utils/commit/988e967513f
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1833618
+Last-Update: 2019-10-09
+---
+ scripts/55-scsi-sg3_id.rules | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/scripts/55-scsi-sg3_id.rules b/scripts/55-scsi-sg3_id.rules
+index e914a5d..8c7356b 100644
+--- a/scripts/55-scsi-sg3_id.rules
++++ b/scripts/55-scsi-sg3_id.rules
+@@ -7,7 +7,12 @@ SUBSYSTEM!="block", GOTO="sg3_utils_id_end"
+ # Import values for partitions
+ ENV{DEVTYPE}=="partition", IMPORT{parent}="SCSI_*", ENV{ID_SCSI}="1"
+ # SCSI INQUIRY values
+-KERNEL=="sd*[!0-9]|sr*", IMPORT{program}="/usr/bin/sg_inq --export $tempnode", ENV{ID_SCSI}="1"
++# If the 'inquiry' sysfs attribute is present the kernel will already
++# have scanned for VPD pages, so if the vpd page attribute is not
++# present it is not supported (or deemed unsafe to access).
++# Hence we can skip the call to sg_inq and avoid I/O altogether.
++KERNEL=="sd*[!0-9]|sr*", IMPORT{program}="/usr/bin/sg_inq --export --inhex=/sys/block/$kernel/device/inquiry --raw", ENV{ID_SCSI}="1", ENV{ID_SCSI_SN}="1", ENV{ID_SCSI_DI}="1"
++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}!="1", IMPORT{program}="/usr/bin/sg_inq --export $tempnode", ENV{ID_SCSI}="1"
+ # scsi_id compat mappings
+ ENV{SCSI_VENDOR}=="?*", ENV{ID_VENDOR}="$env{SCSI_VENDOR}"
+ ENV{SCSI_VENDOR_ENC}=="?*", ENV{ID_VENDOR_ENC}="$env{SCSI_VENDOR_ENC}"
+@@ -16,11 +21,11 @@ ENV{SCSI_MODEL_ENC}=="?*", ENV{ID_MODEL_ENC}="$env{SCSI_MODEL_ENC}"
+ ENV{SCSI_REVISION}=="?*", ENV{ID_REVISION}="$env{SCSI_REVISION}"
+ ENV{SCSI_TYPE}=="?*", ENV{ID_TYPE}="$env{SCSI_TYPE}"
+ # SCSI EVPD page 0x80 values
+-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", IMPORT{program}="/usr/bin/sg_inq --export --inhex=/sys/block/$kernel/device/vpd_pg80 --raw", ENV{ID_SCSI_SN}="1"
+-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", ENV{ID_SCSI_SN}!="1", IMPORT{program}="/usr/bin/sg_inq --export --page=sn $tempnode", ENV{ID_SCSI_SN}="1"
++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", ENV{ID_SCSI_SN}=="1", IMPORT{program}="/usr/bin/sg_inq --export --inhex=/sys/block/$kernel/device/vpd_pg80 --raw"
++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", ENV{ID_SCSI_SN}!="1", IMPORT{program}="/usr/bin/sg_inq --export --page=sn $tempnode"
+ # SCSI EVPD page 0x83 values
+-KERNEL=="sd*[!0-9]", ENV{ID_SCSI}=="1", IMPORT{program}="/usr/bin/sg_inq --export --inhex=/sys/block/$kernel/device/vpd_pg83 --raw", ENV{ID_SCSI_DI}="1"
+-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", ENV{ID_SCSI_DI}!="1", IMPORT{program}="/usr/bin/sg_inq --export --page=di $tempnode", ENV{ID_SCSI_DI}="1"
++KERNEL=="sd*[!0-9]", ENV{ID_SCSI}=="1", ENV{ID_SCSI_DI}=="1", IMPORT{program}="/usr/bin/sg_inq --export --inhex=/sys/block/$kernel/device/vpd_pg83 --raw"
++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", ENV{ID_SCSI_DI}!="1", IMPORT{program}="/usr/bin/sg_inq --export --page=di $tempnode"
+ 
+ # ID_WWN compat mapping
+ ENV{SCSI_IDENT_LUN_NAA_REGEXT}=="?*", ENV{ID_WWN}!="?*", ENV{ID_WWN}="0x$env{SCSI_IDENT_LUN_NAA_REGEXT}"
+-- 
+2.20.1
+
diff --git a/debian/patches/new-location-for-major-and-minor.patch b/debian/patches/new-location-for-major-and-minor.patch
new file mode 100644
index 0000000..4196aa7
--- /dev/null
+++ b/debian/patches/new-location-for-major-and-minor.patch
@@ -0,0 +1,35 @@
+Description: new location for major() and minor()
+
+[Backport]
+    Only backported the header location change.
+
+Signed-off-by: Rafael David Tinoco <[e-mail]>
+
+Author: Rafael David Tinoco <[e-mail]>
+Origin: backport, https://github.com/hreinecke/sg3_utils/commit/3e50c99af4a4
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sg3-utils/+bug/1833618
+Last-Update: 2019-10-01
+---
+ src/sg_map26.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/sg_map26.c b/src/sg_map26.c
+index 1a1301a..92f6de9 100644
+--- a/src/sg_map26.c
++++ b/src/sg_map26.c
+@@ -31,8 +31,11 @@
+ #include <dirent.h>
+ #include <libgen.h>
+ #include <sys/ioctl.h>
+-#include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>      /* new location for major + minor */
++#ifndef major
++#include <sys/types.h>
++#endif
+ #include <linux/major.h>
+ 
+ #ifdef HAVE_CONFIG_H
+-- 
+2.20.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 30d2fb2..fa0b7a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 ship-rescan-script.sh
+55-scsi-sg3_id.rules-ID_SERIAL-fix.patch
+new-location-for-major-and-minor.patch