Skip to content

SCSI result cleanup, part 2

Hannes Reinecke linux-scsi 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest40 patches 4 repliesIn review
  2. v2 RFC39 patches 53 repliesSuperseded
  3. v1 RFC42 patches 37 repliesSuperseded

Changes to v2 from the cover letter

- Include reviews from Finn Thain and Christoph
- Add a new patch to modify response handling in
scsi_mode_sense() as suggested by Christoph

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/40st: return error code in st_scsi_execute()drivers/scsi/st.c+2 -21 reply
2/40scsi_ioctl: return error code when blk_rq_map_kern() failsblock/scsi_ioctl.c+4 -30 replies
3/40scsi: Fixup calling convention for scsi_mode_sense()drivers/scsi/scsi_lib.c drivers/scsi/scsi_transport_sas.c drivers/scsi/sd.c +1 more+17 -160 replies
4/40scsi: reshuffle response handling in scsi_mode_sense()drivers/scsi/scsi_lib.c+37 -380 replies
5/40scsi_dh_alua: check for negative result valuedrivers/scsi/device_handler/scsi_dh_alua.c+4 -40 replies
6/40scsi: stop using DRIVER_ERRORdrivers/ata/libata-scsi.c drivers/scsi/ch.c drivers/scsi/cxlflash/superpipe.c +11 more+47 -210 replies
7/40scsi: introduce scsi_build_sense()drivers/ata/libata-scsi.c drivers/s390/scsi/zfcp_scsi.c drivers/scsi/3w-xxxx.c +15 more+85 -1640 replies
8/40scsi: introduce scsi_status_is_check_condition()drivers/scsi/ibmvscsi/ibmvscsi.c drivers/scsi/scsi.c drivers/scsi/scsi_error.c +2 more+20 -50 replies
9/40scsi: Kill DRIVER_SENSEblock/bsg.c block/scsi_ioctl.c drivers/ata/libata-scsi.c +32 more+76 -1150 replies
10/40scsi: do not use DRIVER_INVALIDdrivers/scsi/hptiop.c drivers/scsi/mvumi.c drivers/scsi/vmw_pvscsi.c+3 -60 replies
11/40scsi_error: use DID_TIME_OUT instead of DRIVER_TIMEOUTdrivers/scsi/scsi_error.c+2 -20 replies
12/40xen-scsiback: use DID_ERROR instead of DRIVER_ERRORdrivers/xen/xen-scsiback.c+4 -40 replies
13/40xen-scsifront: compability status handlingdrivers/scsi/xen-scsifront.c+7 -10 replies
14/40scsi: Drop the now obsolete driver_byte definitionsDocumentation/scsi/scsi_mid_low_api.rst block/bsg-lib.c block/bsg.c +12 more+19 -730 replies
15/40NCR5380: Fold SCSI message ABORT onto DID_ABORTdrivers/scsi/NCR5380.c+3 -30 replies
16/40scsi: add get_{status,host}_byte() accessor functioninclude/scsi/scsi_cmnd.h+10 -00 replies
17/40scsi: add scsi_msg_to_host_byte()include/scsi/scsi_cmnd.h+26 -00 replies
18/40dc395: use standard macros to set SCSI resultdrivers/scsi/dc395x.c+28 -480 replies
19/40dc395: translate message bytesdrivers/scsi/dc395x.c+1 -40 replies
20/40qlogicfas408: make ql_pcmd() a void functiondrivers/scsi/qlogicfas408.c+49 -260 replies
21/40qlogicfas408: whitespace cleanupdrivers/scsi/qlogicfas408.c+31 -300 replies
22/40qlogicfas408: translate message to host byte statusdrivers/scsi/qlogicfas408.c+2 -10 replies
23/40nsp32: whitespace cleanupdrivers/scsi/nsp32.c+221 -1940 replies
24/40nsp32: do not set message bytedrivers/scsi/nsp32.c+1 -50 replies
25/40wd33c93: translate message byte to host bytedrivers/scsi/wd33c93.c+23 -200 replies
26/40mesh: translate message to host byte statusdrivers/scsi/mesh.c+5 -40 replies
27/40acornscsi: remove acornscsi_reportstatus()drivers/scsi/arm/acornscsi.c+0 -250 replies
28/40acornscsi: translate message byte to host bytedrivers/scsi/arm/acornscsi.c+12 -90 replies
29/40aha152x: modify done() to use separate status bytesdrivers/scsi/aha152x.c+29 -140 replies
30/40aha152x: do not set message byte when calling scsi_done()drivers/scsi/aha152x.c+15 -270 replies
31/40advansys: do not set message byte in SCSI statusdrivers/scsi/advansys.c+0 -20 replies
32/40fas216: translate message to host byte statusdrivers/scsi/arm/fas216.c+5 -40 replies
33/40fas216: Use get_status_byte() to avoid using linux-specific status codesdrivers/scsi/arm/fas216.c+3 -30 replies
34/40FlashPoint: Use standard SCSI definitionsdrivers/scsi/FlashPoint.c+69 -960 replies
35/40fdomain: drop last argument to fdomain_finish_cmd()drivers/scsi/fdomain.c+12 -100 replies
36/40fdomain: translate message to host byte statusdrivers/scsi/fdomain.c+1 -10 replies
37/40scsi: drop message byte helperblock/scsi_ioctl.c drivers/scsi/scsi_error.c drivers/scsi/sg.c +3 more+6 -260 replies
38/40scsi: kill message byteDocumentation/scsi/scsi_mid_low_api.rst drivers/scsi/scsi_lib.c include/trace/events/scsi.h+5 -390 replies
39/40target: use standard SAM status typesdrivers/target/target_core_alua.c drivers/target/target_core_iblock.c drivers/target/target_core_pr.c +4 more+22 -220 replies
40/40scsi: drop obsolete linux-specific SCSI status codesdrivers/ata/libata-scsi.c drivers/infiniband/ulp/srp/ib_srp.c drivers/scsi/3w-9xxx.c +15 more+65 -663 replies

Reviews trailers per patch

19 of 40 patches have a Reviewed-by or Acked-by.

PatchBart Van AsscheChristoph HellwigKai MäkisaraDouglas Gilbert
1/40R-b R-b A-b
2/40R-b R-b
3/40R-b
4/40
5/40
6/40R-b R-b
7/40R-b R-b
8/40R-b
9/40
10/40R-b R-b
11/40R-b
12/40R-b R-b
13/40
14/40R-b R-b
15/40
16/40R-b R-b
17/40R-b
18/40R-b
19/40R-b
20/40
21/40
22/40
23/40
24/40
25/40
26/40
27/40R-b
28/40
29/40
30/40
31/40
32/40
33/40
34/40
35/40
36/40
37/40R-b
38/40R-b
39/40R-b
40/40R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v3 thread

Cover letter [PATCHv3 00/40] SCSI result cleanup, part 2

Hi all,

here is now my alternative approach on how the SCSI result could be cleaned up. It's based on the observation that two fields (namely driver_byte and message_byte) are essentially unused.
The driver byte really is an unloved thing, with very few drivers using it, and not really consistent, either.
It's only DRIVER_SENSE which has a meaning for userspace, and that just indicates if a sense code is present; as such it can easily inferred by looking at the sense code itself.
The message byte is a different story, as it's being used internally by some SCSI parallel drivers. But even here, in the end the message byte is only ever relevant for SCSI EH, and that just checks if any message byte is set apart from COMMAND_COMPLETE.
And we have the SCp.Message field, which can be used to hold the message values for drivers which had been using the message byte in the SCSI result. If we do that the message byte itself becomes irrelevant and can be dropped, too.

So with this approach we can stop using the driver_byte and the message_byte values in the SCSI result, which means we only have two values (host byte and status byte) left to deal with.

My plan here is move every driver to use accessors for the remaining bytes in the SCSI result, and with that move the SCSI result over into two separate values.

A patchset implementing this can be found at:

git://git.kernel.org/pub/scm/linux/kernel/hare/scsi-devel.git
scsi-result-rework

This patchset is the first part of that; later parts will be posted once this one is accepted.

As it has been noted that there is a confusion between 'status_byte()' (which returns the linux status code) and 'get_status_byte()' (which returns the SAM status code) I've added another patch to rip out the linux-specific SCSI status code; they have been obsoleted years ago and it's time for them to go.

As usual, comments and reviews are welcome.

Changes to v2:
- Include reviews from Finn Thain and Christoph
- Add a new patch to modify response handling in
scsi_mode_sense() as suggested by Christoph

Changes to v1:
- Drop patches not relevant to this series
- Include reviews from Bart and Doug Gilbert
- Add patch to remove status_byte()

Hannes Reinecke (40):
st: return error code in st_scsi_execute()
scsi_ioctl: return error code when blk_rq_map_kern() fails
scsi: Fixup calling convention for scsi_mode_sense()
scsi: reshuffle response handling in scsi_mode_sense()
scsi_dh_alua: check for negative result value
scsi: stop using DRIVER_ERROR
scsi: introduce scsi_build_sense()
scsi: introduce scsi_status_is_check_condition()
scsi: Kill DRIVER_SENSE
scsi: do not use DRIVER_INVALID
scsi_error: use DID_TIME_OUT instead of DRIVER_TIMEOUT
xen-scsiback: use DID_ERROR instead of DRIVER_ERROR
xen-scsifront: compability status handling
scsi: Drop the now obsolete driver_byte definitions
NCR5380: Fold SCSI message ABORT onto DID_ABORT
scsi: add get_{status,host}_byte() accessor function
scsi: add scsi_msg_to_host_byte()
dc395: use standard macros to set SCSI result
dc395: translate message bytes
qlogicfas408: make ql_pcmd() a void function
qlogicfas408: whitespace cleanup
qlogicfas408: translate message to host byte status
nsp32: whitespace cleanup
nsp32: do not set message byte
wd33c93: translate message byte to host byte
mesh: translate message to host byte status
acornscsi: remove acornscsi_reportstatus()
acornscsi: translate message byte to host byte
aha152x: modify done() to use separate status bytes
aha152x: do not set message byte when calling scsi_done()
advansys: do not set message byte in SCSI status
fas216: translate message to host byte status
fas216: Use get_status_byte() to avoid using linux-specific status
codes
FlashPoint: Use standard SCSI definitions
fdomain: drop last argument to fdomain_finish_cmd()
fdomain: translate message to host byte status
scsi: drop message byte helper
scsi: kill message byte
target: use standard SAM status types
scsi: drop obsolete linux-specific SCSI status codes

 Documentation/scsi/scsi_mid_low_api.rst     |   7 +-
 block/bsg-lib.c                             |   2 +-
 block/bsg.c                                 |   4 +-
 block/scsi_ioctl.c                          |  13 +-
 drivers/ata/libata-scsi.c                   |  30 +-
 drivers/infiniband/ulp/srp/ib_srp.c         |   2 +-
 drivers/s390/scsi/zfcp_scsi.c               |   5 +-
 drivers/scsi/3w-9xxx.c                      |   2 +-
 drivers/scsi/3w-xxxx.c                      |   6 +-
 drivers/scsi/53c700.c                       |   6 +-
 drivers/scsi/FlashPoint.c                   | 165 ++++----
 drivers/scsi/NCR5380.c                      |  10 +-
 drivers/scsi/advansys.c                     |   4 -
 drivers/scsi/aha152x.c                      |  33 +-
 drivers/scsi/aic7xxx/aic79xx_osm.c          |  19 +-
 drivers/scsi/aic7xxx/aic7xxx_osm.c          |   1 -
 drivers/scsi/arcmsr/arcmsr_hba.c            |   5 +-
 drivers/scsi/arm/acornscsi.c                |  46 +--
 drivers/scsi/arm/fas216.c                   |  15 +-
 drivers/scsi/ch.c                           |   5 +-
 drivers/scsi/constants.c                    |  15 -
 drivers/scsi/cxlflash/superpipe.c           |   3 +-
 drivers/scsi/dc395x.c                       |  80 ++--
 drivers/scsi/device_handler/scsi_dh_alua.c  |   8 +-
 drivers/scsi/esas2r/esas2r_main.c           |   2 +-
 drivers/scsi/esp_scsi.c                     |   4 +-
 drivers/scsi/fdomain.c                      |  22 +-
 drivers/scsi/hptiop.c                       |   2 +-
 drivers/scsi/ibmvscsi/ibmvscsi.c            |   2 +-
 drivers/scsi/libiscsi.c                     |   5 +-
 drivers/scsi/lpfc/lpfc_scsi.c               |  54 +--
 drivers/scsi/megaraid.c                     |  20 +-
 drivers/scsi/megaraid/megaraid_mbox.c       |  25 +-
 drivers/scsi/megaraid/megaraid_sas_base.c   |   2 -
 drivers/scsi/megaraid/megaraid_sas_fusion.c |   1 -
 drivers/scsi/mesh.c                         |   9 +-
 drivers/scsi/mpt3sas/mpt3sas_scsih.c        |  14 +-
 drivers/scsi/mvumi.c                        |  10 +-
 drivers/scsi/myrb.c                         |  64 +--
 drivers/scsi/myrs.c                         |   9 +-
 drivers/scsi/nsp32.c                        | 419 +++++++++++---------
 drivers/scsi/ps3rom.c                       |   7 +-
 drivers/scsi/qla2xxx/qla_isr.c              |  15 +-
 drivers/scsi/qlogicfas408.c                 | 137 ++++---
 drivers/scsi/scsi.c                         |  11 +-
 drivers/scsi/scsi_debug.c                   |  15 +-
 drivers/scsi/scsi_error.c                   |  70 ++--
 drivers/scsi/scsi_ioctl.c                   |   7 +-
 drivers/scsi/scsi_lib.c                     | 119 +++---
 drivers/scsi/scsi_logging.c                 |  10 +-
 drivers/scsi/scsi_scan.c                    |   6 +-
 drivers/scsi/scsi_transport_sas.c           |   9 +-
 drivers/scsi/scsi_transport_spi.c           |   2 +-
 drivers/scsi/sd.c                           |  63 +--
 drivers/scsi/sd_zbc.c                       |   3 +-
 drivers/scsi/sg.c                           |   9 +-
 drivers/scsi/smartpqi/smartpqi_init.c       |   3 +-
 drivers/scsi/sr.c                           |   4 +-
 drivers/scsi/sr_ioctl.c                     |   6 +-
 drivers/scsi/st.c                           |   8 +-
 drivers/scsi/stex.c                         |   9 +-
 drivers/scsi/sym53c8xx_2/sym_glue.c         |   6 +-
 drivers/scsi/ufs/ufshcd.c                   |   2 +-
 drivers/scsi/virtio_scsi.c                  |   5 +-
 drivers/scsi/vmw_pvscsi.c                   |   6 -
 drivers/scsi/wd33c93.c                      |  43 +-
 drivers/scsi/xen-scsifront.c                |   8 +-
 drivers/target/loopback/tcm_loop.c          |   1 -
 drivers/target/target_core_alua.c           |   6 +-
 drivers/target/target_core_iblock.c         |   2 +-
 drivers/target/target_core_pr.c             |   8 +-
 drivers/target/target_core_pscsi.c          |   2 +-
 drivers/target/target_core_sbc.c            |  10 +-
 drivers/target/target_core_spc.c            |  14 +-
 drivers/target/target_core_xcopy.c          |   2 +-
 drivers/usb/storage/cypress_atacb.c         |   4 +-
 drivers/xen/xen-scsiback.c                  |  17 +-
 include/scsi/scsi.h                         |  38 +-
 include/scsi/scsi_cmnd.h                    |  38 +-
 include/scsi/scsi_proto.h                   |  22 +-
 include/scsi/sg.h                           |  33 ++
 include/trace/events/scsi.h                 |  48 +--
 82 files changed, 908 insertions(+), 1070 deletions(-)
Signature · 1 line
2.29.2