| Message ID | 20191104090151.129140-1-hare@suse.de (mailing list archive) |
|---|---|
| Headers | show |
| Series | Revamp SCSI result values | expand |
On 11/4/19 10:00 AM, Hannes Reinecke wrote: > Hi all, > > the 'result' field in the SCSI command is defined as having > 4 fields. The top byte is declared as a 'driver_byte', where the > driver can signal some internal status back to the midlayer. > However, there is quite a bit of overlap between the driver_byte > and the host_byte, resulting in the driver_byte being used in > very few places, and mostly in legacy drivers. > Additionally, we have _two_ sets of definitions for the > last byte (status byte), which can specified either in SAM terms > or in the linux-specific terms, which are shifted right by one > from the SAM ones. > Needless to say, the linux-specific ones are declared obsolete > for years now. > And to make the confusion complete, both the status byte and > the driver byte have a byte for a valid sense code, resulting > in quite some confusion which of those bits to check. > > This patchset does several things: > - remove the linux-specific status byte definitions, and use > the SAM values throughout > - replace the driver-byte values with either SAM ones (for sense > code checking) or host-byte definitions > - remove the driver-byte definitions > > As usual, comments and reviews are welcome. > > Please note, commit 66cf50e65b18 ("scsi: qla2xxx: fixup incorrect > usage of host_byte") from 5.4/scsi-fixes is a prerequisite for > this patch series. > Martin, ping? I've got another patchset queued for splitting off the 'result' field, which kinda depends on this one... Cheers, Hannes
Hi Hannes, > Martin, ping? > > I've got another patchset queued for splitting off the 'result' field, > which kinda depends on this one... It's a pretty big and intrusive change. And even though we (somewhat unexpectedly) got another week, I still think it's too risky for 5.5. I plan on merging it first thing when the queue for 5.6 opens.
On 11/19/19 4:35 AM, Martin K. Petersen wrote: > > Hi Hannes, > >> Martin, ping? >> >> I've got another patchset queued for splitting off the 'result' field, >> which kinda depends on this one... > > It's a pretty big and intrusive change. And even though we (somewhat > unexpectedly) got another week, I still think it's too risky for 5.5. > > I plan on merging it first thing when the queue for 5.6 opens. > Sure. Just wanted to know if it's worth playing around with the next round of patches (splitting off 'result', thus ending a history of shifting status bytes into wrong places :-) Thanks for the heads-up. Should I do a respin for 5.5? Cheers, Hannes
Hannes,
> Should I do a respin for 5.5?
I suggest you rebase on top of -rc1 once it's out. If you want a bit
more eyes on the series before then, just post on top of current
scsi-queue.
Hi all, the 'result' field in the SCSI command is defined as having 4 fields. The top byte is declared as a 'driver_byte', where the driver can signal some internal status back to the midlayer. However, there is quite a bit of overlap between the driver_byte and the host_byte, resulting in the driver_byte being used in very few places, and mostly in legacy drivers. Additionally, we have _two_ sets of definitions for the last byte (status byte), which can specified either in SAM terms or in the linux-specific terms, which are shifted right by one from the SAM ones. Needless to say, the linux-specific ones are declared obsolete for years now. And to make the confusion complete, both the status byte and the driver byte have a byte for a valid sense code, resulting in quite some confusion which of those bits to check. This patchset does several things: - remove the linux-specific status byte definitions, and use the SAM values throughout - replace the driver-byte values with either SAM ones (for sense code checking) or host-byte definitions - remove the driver-byte definitions As usual, comments and reviews are welcome. Please note, commit 66cf50e65b18 ("scsi: qla2xxx: fixup incorrect usage of host_byte") from 5.4/scsi-fixes is a prerequisite for this patch series. Changes to v1: - Include reviews from Finn Thain et al - Make sysbot happy Changes to v2: - Split patches as suggested by Bart - more sysbot fixes Hannes Reinecke (52): aic7xxx,aic79xxx: remove driver-defined SAM status definitions bfa: drop driver-defined SCSI status codes wd33c93: use SCSI status acornscsi: use standard defines libata-scsi: use standard SAM status codes ib_srp: use standard SAM status codes 3w-xxxx: use standard SAM status codes arcmsr: use standard SAM status codes dc395x: use standard SAM status codes megaraid: use standard SAM status codes megaraid_mboxi: use standard SAM status codes gdth: use standard SAM status codes dpt_i2o: use standard SAM status codes nsp_cs: use standard SAM status codes nsp32: fixup status handling dc395: drop private SAM status code definitions qla4xxx: use standard SAM status definitions scsi: change status_byte() to return the standard SCSI status target_core: Fixup target_complete_cmd() usage sg: use SAM status definitions and avoid using masked_status initio: use standard SAM status definitions scsi: Kill obsolete linux-specific status codes scsi: introduce set_status_byte() advansys: kill driver_defined status byte accessors scsi: introduce scsi_build_sense() libata-scsi: use scsi_build_sense() zfcp: use scsi_build_sense() 3w-xxxx: use scsi_build_sense() libiscsi: use scsi_build_sense() lpfc: use scsi_build_sense() mpt3sas: use scsi_build_sense() mvumi: use scsi_build_sense() myrb: use scsi_build_sense() myrs: use scsi_build_sense() ps3rom: use scsi_build_sense() qla2xxx: use scsi_build_sense() scsi_debug: use scsi_build_sense() smartpqi: use scsi_build_sense() stex: use scsi_build_sense() scsi: Kill DRIVER_SENSE scsi: Kill DRIVER_HARD scsi_error: use DID_TIME_OUT instead of DRIVER_TIMEOUT scsi: Kill DRIVER_TIMEOUT scsi: do not use DRIVER_INVALID st: return error code in st_scsi_execute() scsi_ioctl: return error code when blk_rq_map_kern() fails scsi_dh_alua: do not interpret DRIVER_ERROR 3w-9xxx: Kill unreachable code in twa_interrupt() xen-scsiback: stop using DRIVER_ERROR scsi: stop using DRIVER_ERROR scsi: Kill DRIVER_MEDIA, DRIVER_SOFT, and DRIVER_BUSY scsi: Drop the now obsolete driver_byte definitions Documentation/scsi/scsi_mid_low_api.txt | 3 +- block/bsg-lib.c | 2 +- block/bsg.c | 2 +- block/scsi_ioctl.c | 9 ++-- drivers/ata/libata-scsi.c | 22 +++----- drivers/infiniband/ulp/srp/ib_srp.c | 2 +- drivers/message/fusion/mptscsih.c | 2 +- drivers/s390/scsi/zfcp_scsi.c | 5 +- drivers/scsi/3w-9xxx.c | 6 --- drivers/scsi/3w-xxxx.c | 7 ++- drivers/scsi/53c700.c | 6 +-- drivers/scsi/NCR5380.c | 4 +- drivers/scsi/advansys.c | 78 ++++++++--------------------- drivers/scsi/aic7xxx/aic79xx_core.c | 8 +-- drivers/scsi/aic7xxx/aic79xx_osm.c | 35 ++++++------- drivers/scsi/aic7xxx/aic7xxx_core.c | 6 +-- drivers/scsi/aic7xxx/aic7xxx_osm.c | 13 +++-- drivers/scsi/aic7xxx/aiclib.h | 15 ------ drivers/scsi/arcmsr/arcmsr_hba.c | 5 +- drivers/scsi/arm/acornscsi.c | 24 +++------ drivers/scsi/arm/fas216.c | 10 ++-- drivers/scsi/bfa/bfa_fc.h | 15 ------ drivers/scsi/bfa/bfa_fcpim.c | 2 +- drivers/scsi/bfa/bfad_im.c | 2 +- drivers/scsi/ch.c | 5 +- drivers/scsi/constants.c | 15 ------ drivers/scsi/cxlflash/superpipe.c | 45 ++++++++--------- drivers/scsi/dc395x.c | 26 +++------- drivers/scsi/dc395x.h | 16 ------ drivers/scsi/device_handler/scsi_dh_alua.c | 4 -- drivers/scsi/dpt_i2o.c | 2 +- drivers/scsi/esp_scsi.c | 3 +- drivers/scsi/gdth.c | 12 ++--- drivers/scsi/hptiop.c | 2 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- drivers/scsi/initio.c | 2 +- drivers/scsi/initio.h | 5 -- drivers/scsi/libiscsi.c | 5 +- drivers/scsi/lpfc/lpfc_scsi.c | 36 +++++-------- drivers/scsi/megaraid.c | 22 ++++---- drivers/scsi/megaraid/megaraid_mbox.c | 22 ++++---- drivers/scsi/megaraid/megaraid_sas_base.c | 2 - drivers/scsi/megaraid/megaraid_sas_fusion.c | 1 - drivers/scsi/mpt3sas/mpt3sas_scsih.c | 9 ++-- drivers/scsi/mvumi.c | 10 ++-- drivers/scsi/myrb.c | 61 ++++++---------------- drivers/scsi/myrs.c | 9 +--- drivers/scsi/nsp32.c | 2 +- drivers/scsi/pcmcia/nsp_cs.c | 2 +- drivers/scsi/ps3rom.c | 3 +- drivers/scsi/qla2xxx/qla_isr.c | 15 ++---- drivers/scsi/qla4xxx/ql4_fw.h | 1 - drivers/scsi/qla4xxx/ql4_isr.c | 2 +- drivers/scsi/scsi.c | 11 ++-- drivers/scsi/scsi_debug.c | 15 +++--- drivers/scsi/scsi_error.c | 52 +++++++++---------- drivers/scsi/scsi_ioctl.c | 2 +- drivers/scsi/scsi_lib.c | 44 +++++++++++----- drivers/scsi/scsi_logging.c | 10 +--- drivers/scsi/scsi_scan.c | 2 +- drivers/scsi/scsi_transport_spi.c | 2 +- drivers/scsi/sd.c | 42 ++++++++-------- drivers/scsi/sd_zbc.c | 4 +- drivers/scsi/sg.c | 28 +++++------ drivers/scsi/smartpqi/smartpqi_init.c | 3 +- drivers/scsi/sr.c | 2 +- drivers/scsi/sr_ioctl.c | 2 +- drivers/scsi/st.c | 8 +-- drivers/scsi/stex.c | 9 ++-- drivers/scsi/sym53c8xx_2/sym_glue.c | 6 +-- drivers/scsi/ufs/ufshcd.c | 6 +-- drivers/scsi/virtio_scsi.c | 3 +- drivers/scsi/vmw_pvscsi.c | 6 --- drivers/scsi/wd33c93.c | 6 +-- 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_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 | 14 +++--- include/scsi/scsi.h | 19 +------ include/scsi/scsi_cmnd.h | 12 +++-- include/scsi/scsi_proto.h | 19 ------- include/scsi/sg.h | 5 +- include/trace/events/scsi.h | 15 +----- 88 files changed, 363 insertions(+), 655 deletions(-)