Skip to content

Remove the SCSI pointer from struct scsi_cmnd

Bart Van Assche linux-scsi linux-usb 5 versions – Applied

Status from this message: Applied to 5.18/scsi-staging, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest49 patches 2 repliesApplied
  2. v450 patches 5 repliesSuperseded
  3. v348 patches 24 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v244 patches123 repliesSuperseded
v144 patches49 repliesSuperseded

Changes in v5 from the cover letter

- Replaced two NCR5380 patches by a patch from Finn Thain.
- Added more Reviewed-by tags.

Patches in v5 Applied

#Subject and filesSizeRepliesApplied
1/49scsi: ips: Remove an unreachable statementdrivers/scsi/ips.c+0 -10 replies
2/49scsi: ips: Change the return type of ips_release() into 'void'drivers/scsi/ips.c+2 -50 replies
3/49scsi: ips: Use true and false instead of TRUE and FALSEdrivers/scsi/ips.c+17 -190 replies
4/49scsi: nsp_cs: Change the return type of two functions into 'void'drivers/scsi/pcmcia/nsp_cs.c drivers/scsi/pcmcia/nsp_cs.h+7 -140 replies
5/49scsi: nsp_cs: Use true and false instead of TRUE and FALSEdrivers/scsi/pcmcia/nsp_cs.c drivers/scsi/pcmcia/nsp_cs.h+14 -140 replies
6/49scsi: Remove drivers/scsi/scsi.hdrivers/scsi/a2091.c drivers/scsi/a3000.c drivers/scsi/aha152x.c +22 more+119 -820 replies
7/49scsi: NCR5380: Remove the NCR5380_CMD_SIZE macrodrivers/scsi/NCR5380.h drivers/scsi/arm/cumana_1.c drivers/scsi/arm/oak.c +5 more+7 -90 replies
8/49scsi: NCR5380: Add SCp members to struct NCR5380_cmddrivers/scsi/NCR5380.c drivers/scsi/NCR5380.h drivers/scsi/atari_scsi.c +3 more+66 -560 replies
9/49scsi: arm: Rename arm/scsi.h into arm/arm_scsi.hdrivers/scsi/arm/acornscsi.c drivers/scsi/arm/arm_scsi.h drivers/scsi/arm/cumana_2.c +3 more+6 -80 replies
10/49scsi: arm: Move the SCSI pointer to private command datadrivers/scsi/arm/acornscsi.c drivers/scsi/arm/arm_scsi.h drivers/scsi/arm/fas216.c +1 more+56 -290 replies
11/49scsi: 53c700: Stop clearing SCSI pointer fieldsdrivers/scsi/53c700.c+0 -20 replies
12/49scsi: aacraid: Move the SCSI pointer to private command datadrivers/scsi/aacraid/aachba.c drivers/scsi/aacraid/aacraid.h drivers/scsi/aacraid/comminit.c +1 more+54 -360 replies
13/49scsi: advansys: Move the SCSI pointer to private command datadrivers/scsi/advansys.c+16 -60 replies
14/49scsi: aha1542: Remove a set-but-not-used arraydrivers/scsi/aha1542.c+1 -20 replies
15/49scsi: aha152x: Move the SCSI pointer to private command datadrivers/scsi/aha152x.c+155 -1040 replies
16/49scsi: bfa: Stop using the SCSI pointerdrivers/scsi/bfa/bfad_im.c drivers/scsi/bfa/bfad_im.h+30 -130 replies
17/49scsi: csio: Stop using the SCSI pointerdrivers/scsi/csiostor/csio_scsi.c drivers/scsi/csiostor/csio_scsi.h+21 -90 replies
18/49scsi: dc395x: Stop using the SCSI pointerdrivers/scsi/dc395x.c+0 -30 replies
19/49scsi: esp_scsi: Stop using the SCSI pointerdrivers/scsi/esp_scsi.c drivers/scsi/esp_scsi.h+3 -40 replies
20/49scsi: fdomain: Move the SCSI pointer to private command datadrivers/scsi/fdomain.c+36 -280 replies
21/49scsi: fnic: Fix a tracing statementdrivers/scsi/fnic/fnic_scsi.c+1 -10 replies
22/49scsi: fnic: Stop using the SCSI pointerdrivers/scsi/fnic/fnic.h drivers/scsi/fnic/fnic_main.c drivers/scsi/fnic/fnic_scsi.c+163 -1540 replies
23/49scsi: hptiop: Stop using the SCSI pointerdrivers/scsi/hptiop.c drivers/scsi/hptiop.h+3 -20 replies
24/49scsi: imm: Move the SCSI pointer to private command datadrivers/scsi/imm.c drivers/scsi/imm.h+50 -430 replies
25/49scsi: iscsi: Stop using the SCSI pointerdrivers/infiniband/ulp/iser/iscsi_iser.c drivers/scsi/be2iscsi/be_main.c drivers/scsi/bnx2i/bnx2i_iscsi.c +9 more+52 -220 replies
26/49scsi: initio: Stop using the SCSI pointerdrivers/scsi/initio.c drivers/scsi/initio.h+17 -60 replies
27/49scsi: libfc: Stop using the SCSI pointerdrivers/scsi/fcoe/fcoe.c drivers/scsi/libfc/fc_fcp.c include/scsi/libfc.h+21 -150 replies
28/49scsi: bnx2fc: Stop using the SCSI pointerdrivers/scsi/bnx2fc/bnx2fc.h drivers/scsi/bnx2fc/bnx2fc_fcoe.c drivers/scsi/bnx2fc/bnx2fc_io.c+19 -140 replies
29/49scsi: qedf: Stop using the SCSI pointerdrivers/scsi/qedf/qedf.h drivers/scsi/qedf/qedf_io.c drivers/scsi/qedf/qedf_main.c+23 -150 replies
30/49scsi: mac53c94: Fix a set-but-not-used compiler warningdrivers/scsi/mac53c94.c+1 -20 replies
31/49scsi: mac53c94: Move the SCSI pointer to private command datadrivers/scsi/mac53c94.c drivers/scsi/mac53c94.h+24 -110 replies
32/49scsi: megaraid: Stop using the SCSI pointerdrivers/scsi/megaraid.c drivers/scsi/megaraid.h+26 -100 replies
33/49scsi: megasas: Stop using the SCSI pointerdrivers/scsi/megaraid/megaraid_sas.h drivers/scsi/megaraid/megaraid_sas_base.c drivers/scsi/megaraid/megaraid_sas_fusion.c+24 -110 replies
34/49scsi: mesh: Move the SCSI pointer to private command datadrivers/scsi/mesh.c drivers/scsi/mesh.h+24 -70 replies
35/49scsi: mvsas: Fix a set-but-not-used warningdrivers/scsi/mvsas/mv_init.c+4 -20 replies
36/49scsi: mvumi: Stop using the SCSI pointerdrivers/scsi/mvumi.c drivers/scsi/mvumi.h+14 -40 replies
37/49scsi: nsp32: Stop using the SCSI pointerdrivers/scsi/nsp32.c drivers/scsi/nsp32.h+16 -130 replies
38/49scsi: nsp_cs: Move the SCSI pointer to private command datadrivers/scsi/pcmcia/nsp_cs.c drivers/scsi/pcmcia/nsp_cs.h drivers/scsi/pcmcia/nsp_debug.c+114 -900 replies
39/49scsi: sym53c500_cs: Move the SCSI pointer to private command datadrivers/scsi/pcmcia/sym53c500_cs.c+29 -180 replies
40/49scsi: ppa: Move the SCSI pointer to private command datadrivers/scsi/ppa.c+43 -320 replies
41/49scsi: qla1280: Move the SCSI pointer to private command datadrivers/scsi/qla1280.c drivers/scsi/qla1280.h+5 -190 replies
42/49scsi: qla2xxx: Stop using the SCSI pointerdrivers/scsi/qla2xxx/qla_def.h drivers/scsi/qla2xxx/qla_os.c+5 -100 replies
43/49scsi: smartpqi: Stop using the SCSI pointerdrivers/scsi/smartpqi/smartpqi_init.c+12 -20 replies
44/49scsi: sym53c8xx_2: Move the SCSI pointer to private command datadrivers/scsi/sym53c8xx_2/sym_glue.c+2 -20 replies
45/49scsi: usb: Stop using the SCSI pointerdrivers/usb/storage/uas.c+20 -230 replies
46/49scsi: wd719x: Stop using the SCSI pointerdrivers/scsi/wd719x.c drivers/scsi/wd719x.h+7 -60 replies
47/49scsi: wd33c93: Move the SCSI pointer to private command datadrivers/scsi/a2091.c drivers/scsi/a3000.c drivers/scsi/gvp11.c +4 more+117 -910 replies
48/49scsi: zalon: Stop using the SCSI pointerdrivers/scsi/ncr53c8xx.c drivers/scsi/ncr53c8xx.h drivers/scsi/zalon.c+19 -100 replies
49/49scsi: core: Remove struct scsi_pointer from struct scsi_cmndinclude/scsi/scsi_cmnd.h+7 -70 replies

Reviews trailers per patch

48 of 49 patches have a Reviewed-by or Acked-by.

PatchHannes ReineckeHimanshu MadhaniJohannes ThumshirnFinn ThainGreg Kroah-HartmanLee DuncanJohn GarryMasanori GotoDaniel WagnerOliver Neukum
1/49R-b R-b
2/49R-b R-b
3/49R-b R-b
4/49R-b R-b
5/49R-b R-b
6/49R-b R-b R-b A-b
7/49R-b R-b R-b A-b
8/49
9/49R-b R-b R-b
10/49R-b R-b
11/49R-b R-b R-b
12/49R-b R-b
13/49R-b R-b
14/49R-b R-b R-b
15/49R-b R-b R-b
16/49R-b R-b
17/49R-b R-b
18/49R-b R-b R-b
19/49R-b R-b R-b
20/49R-b R-b R-b
21/49R-b R-b
22/49R-b R-b R-b
23/49R-b R-b R-b
24/49R-b R-b
25/49R-b R-b R-b
26/49R-b R-b R-b
27/49R-b R-b
28/49R-b
29/49R-b
30/49R-b R-b R-b
31/49R-b R-b
32/49R-b R-b
33/49R-b R-b R-b
34/49R-b R-b
35/49R-b R-b R-b R-b
36/49R-b R-b R-b
37/49R-b R-b R-b
38/49R-b
39/49R-b R-b
40/49R-b R-b
41/49R-b R-b R-b
42/49R-b R-b R-b
43/49R-b R-b R-b
44/49R-b R-b R-b
45/49R-b R-b R-b A-b A-b
46/49R-b R-b R-b
47/49R-b
48/49R-b R-b R-b
49/49R-b R-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 10 reviewers.

Read the v5 thread

Cover letter [PATCH v5 00/49] Remove the SCSI pointer from struct scsi_cmnd

Hi Martin,

The size of struct scsi_cmnd matters for embedded devices. One of the largest members of that structure is the SCSI pointer. That structure is relevant for SCSI-II drivers but not for modern SCSI drivers. Hence this patch series that removes the SCSI pointer from struct scsi_cmnd and moves it into driver-private command data.

Please consider this patch series for kernel v5.18.

Thanks,

Bart.

Changes compared to v4:
- Replaced two NCR5380 patches by a patch from Finn Thain.
- Added more Reviewed-by tags.

Changes compared to v3:
- Split the libfc patch into three patches (libfc, bnx2fc, qedf). Removed the libfc private command information and also the status information from the bnx2fc and qedf private command data.
- Removed the following statement from libfc_host_alloc():

    WARN_ON_ONCE(sht->cmd_size < sizeof(struct libfc_cmd_priv));

- Added more Reviewed-by tags.

Changes compared to v2:
- Split the ips and nsp_cs patches at the start of this series such that there is only one change in each patch.
- Changed the return type of ips_release() from 'int' into 'void' since the value returned by that function is not used.
- Remove duplicate <scsi/scsi.h> include directives.
- Use struct scsi_pointer directly instead of wrapping it inside another structure for drivers that do not use host_scribble as requested by Hannes.
- Updated the error messages that refer to the SCp.ptr member if that member is removed by this patch series.
- Removed WARN_ON_ONCE(sht->cmd_size < sizeof(struct iscsi_cmd)) from iscsi_host_alloc() and removed struct iscsi_cmd from the qla4xxx private data as requested by Mike.
- Changed 'cmd - 1' into a container_of() expression in megaraid.h (Hannes).
- Removed a cast from the mvsas driver (John).
- Modified the comment in include/scsi/scsi_cmnd.h in the last patch (John).

Changes compared to v1:
- Removed BUILD_BUG_ON(sizeof(...) > sizeof(struct scsi_pointer)) statements.
- Added two void casts in front of I/O statements as requested by Johannes.
- Improved source code formatting in the aha152x driver.
- Restored the DID_OK constant in a SCSI result expression.
- Updated Reviewed-by tags.

Bart Van Assche (48):
scsi: ips: Remove an unreachable statement
scsi: ips: Change the return type of ips_release() into 'void'
scsi: ips: Use true and false instead of TRUE and FALSE
scsi: nsp_cs: Change the return type of two functions into 'void'
scsi: nsp_cs: Use true and false instead of TRUE and FALSE
scsi: Remove drivers/scsi/scsi.h
scsi: NCR5380: Remove the NCR5380_CMD_SIZE macro
scsi: arm: Rename arm/scsi.h into arm/arm_scsi.h
scsi: arm: Move the SCSI pointer to private command data
scsi: 53c700: Stop clearing SCSI pointer fields
scsi: aacraid: Move the SCSI pointer to private command data
scsi: advansys: Move the SCSI pointer to private command data
scsi: aha1542: Remove a set-but-not-used array
scsi: aha152x: Move the SCSI pointer to private command data
scsi: bfa: Stop using the SCSI pointer
scsi: csio: Stop using the SCSI pointer
scsi: dc395x: Stop using the SCSI pointer
scsi: esp_scsi: Stop using the SCSI pointer
scsi: fdomain: Move the SCSI pointer to private command data
scsi: fnic: Fix a tracing statement
scsi: fnic: Stop using the SCSI pointer
scsi: hptiop: Stop using the SCSI pointer
scsi: imm: Move the SCSI pointer to private command data
scsi: iscsi: Stop using the SCSI pointer
scsi: initio: Stop using the SCSI pointer
scsi: libfc: Stop using the SCSI pointer
scsi: bnx2fc: Stop using the SCSI pointer
scsi: qedf: Stop using the SCSI pointer
scsi: mac53c94: Fix a set-but-not-used compiler warning
scsi: mac53c94: Move the SCSI pointer to private command data
scsi: megaraid: Stop using the SCSI pointer
scsi: megasas: Stop using the SCSI pointer
scsi: mesh: Move the SCSI pointer to private command data
scsi: mvsas: Fix a set-but-not-used warning
scsi: mvumi: Stop using the SCSI pointer
scsi: nsp32: Stop using the SCSI pointer
scsi: nsp_cs: Move the SCSI pointer to private command data
scsi: sym53c500_cs: Move the SCSI pointer to private command data
scsi: ppa: Move the SCSI pointer to private command data
scsi: qla1280: Move the SCSI pointer to private command data
scsi: qla2xxx: Stop using the SCSI pointer
scsi: smartpqi: Stop using the SCSI pointer
scsi: sym53c8xx_2: Move the SCSI pointer to private command data
scsi: usb: Stop using the SCSI pointer
scsi: wd719x: Stop using the SCSI pointer
scsi: wd33c93: Move the SCSI pointer to private command data
scsi: zalon: Stop using the SCSI pointer
scsi: core: Remove struct scsi_pointer from struct scsi_cmnd

Finn Thain (1):
scsi: NCR5380: Add SCp members to struct NCR5380_cmd

 drivers/infiniband/ulp/iser/iscsi_iser.c    |   1 +
 drivers/scsi/53c700.c                       |   2 -
 drivers/scsi/NCR5380.c                      |  94 ++++---
 drivers/scsi/NCR5380.h                      |  13 +-
 drivers/scsi/a2091.c                        |  25 +-
 drivers/scsi/a3000.c                        |  25 +-
 drivers/scsi/aacraid/aachba.c               |  43 +--
 drivers/scsi/aacraid/aacraid.h              |  24 +-
 drivers/scsi/aacraid/comminit.c             |   2 +-
 drivers/scsi/aacraid/linit.c                |  21 +-
 drivers/scsi/advansys.c                     |  22 +-
 drivers/scsi/aha152x.c                      | 268 ++++++++++--------
 drivers/scsi/aha1542.c                      |   3 +-
 drivers/scsi/aha1740.c                      |   6 +-
 drivers/scsi/arm/acornscsi.c                |  28 +-
 drivers/scsi/arm/{scsi.h => arm_scsi.h}     |  37 ++-
 drivers/scsi/arm/arxescsi.c                 |   6 +-
 drivers/scsi/arm/cumana_1.c                 |   2 +-
 drivers/scsi/arm/cumana_2.c                 |   8 +-
 drivers/scsi/arm/eesox.c                    |   8 +-
 drivers/scsi/arm/fas216.c                   |  36 ++-
 drivers/scsi/arm/fas216.h                   |   4 +
 drivers/scsi/arm/oak.c                      |   2 +-
 drivers/scsi/arm/powertec.c                 |   8 +-
 drivers/scsi/arm/queue.c                    |   6 +-
 drivers/scsi/atari_scsi.c                   |   6 +-
 drivers/scsi/be2iscsi/be_main.c             |   3 +-
 drivers/scsi/bfa/bfad_im.c                  |  27 +-
 drivers/scsi/bfa/bfad_im.h                  |  16 ++
 drivers/scsi/bnx2fc/bnx2fc.h                |   9 +-
 drivers/scsi/bnx2fc/bnx2fc_fcoe.c           |   1 +
 drivers/scsi/bnx2fc/bnx2fc_io.c             |  23 +-
 drivers/scsi/bnx2i/bnx2i_iscsi.c            |   1 +
 drivers/scsi/csiostor/csio_scsi.c           |  20 +-
 drivers/scsi/csiostor/csio_scsi.h           |  10 +
 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c          |   1 +
 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c          |   1 +
 drivers/scsi/dc395x.c                       |   3 -
 drivers/scsi/dmx3191d.c                     |   2 +-
 drivers/scsi/esp_scsi.c                     |   4 +-
 drivers/scsi/esp_scsi.h                     |   3 +-
 drivers/scsi/fcoe/fcoe.c                    |   1 +
 drivers/scsi/fdomain.c                      |  64 +++--
 drivers/scsi/fnic/fnic.h                    |  27 +-
 drivers/scsi/fnic/fnic_main.c               |   1 +
 drivers/scsi/fnic/fnic_scsi.c               | 289 ++++++++++----------
 drivers/scsi/g_NCR5380.c                    |   6 +-
 drivers/scsi/gvp11.c                        |  25 +-
 drivers/scsi/hptiop.c                       |   1 +
 drivers/scsi/hptiop.h                       |   4 +-
 drivers/scsi/imm.c                          |  88 +++---
 drivers/scsi/imm.h                          |   5 +
 drivers/scsi/initio.c                       |  14 +-
 drivers/scsi/initio.h                       |   9 +
 drivers/scsi/ips.c                          |  52 ++--
 drivers/scsi/iscsi_tcp.c                    |   1 +
 drivers/scsi/libfc/fc_fcp.c                 |  26 +-
 drivers/scsi/libiscsi.c                     |  20 +-
 drivers/scsi/mac53c94.c                     |  27 +-
 drivers/scsi/mac53c94.h                     |  11 +
 drivers/scsi/mac_scsi.c                     |   9 +-
 drivers/scsi/megaraid.c                     |  21 +-
 drivers/scsi/megaraid.h                     |  23 +-
 drivers/scsi/megaraid/megaraid_sas.h        |  12 +
 drivers/scsi/megaraid/megaraid_sas_base.c   |   8 +-
 drivers/scsi/megaraid/megaraid_sas_fusion.c |  15 +-
 drivers/scsi/mesh.c                         |  20 +-
 drivers/scsi/mesh.h                         |  11 +
 drivers/scsi/mvme147.c                      |  16 +-
 drivers/scsi/mvsas/mv_init.c                |   6 +-
 drivers/scsi/mvumi.c                        |   9 +-
 drivers/scsi/mvumi.h                        |   9 +
 drivers/scsi/ncr53c8xx.c                    |  22 +-
 drivers/scsi/ncr53c8xx.h                    |   6 +
 drivers/scsi/nsp32.c                        |  20 +-
 drivers/scsi/nsp32.h                        |   9 +
 drivers/scsi/pcmcia/aha152x_stub.c          |   9 +-
 drivers/scsi/pcmcia/nsp_cs.c                | 246 +++++++++--------
 drivers/scsi/pcmcia/nsp_cs.h                |   8 +-
 drivers/scsi/pcmcia/nsp_debug.c             |   2 +-
 drivers/scsi/pcmcia/qlogic_stub.c           |   9 +-
 drivers/scsi/pcmcia/sym53c500_cs.c          |  47 ++--
 drivers/scsi/ppa.c                          |  75 ++---
 drivers/scsi/qedf/qedf.h                    |  10 +-
 drivers/scsi/qedf/qedf_io.c                 |  25 +-
 drivers/scsi/qedf/qedf_main.c               |   3 +-
 drivers/scsi/qedi/qedi_fw.c                 |   4 +-
 drivers/scsi/qedi/qedi_iscsi.c              |   1 +
 drivers/scsi/qla1280.c                      |  21 +-
 drivers/scsi/qla1280.h                      |   3 +-
 drivers/scsi/qla2xxx/qla_def.h              |   2 -
 drivers/scsi/qla2xxx/qla_os.c               |  13 +-
 drivers/scsi/qla4xxx/ql4_def.h              |  16 +-
 drivers/scsi/qla4xxx/ql4_os.c               |  13 +-
 drivers/scsi/qlogicfas.c                    |   6 +-
 drivers/scsi/qlogicfas408.c                 |   6 +-
 drivers/scsi/scsi.h                         |  46 ----
 drivers/scsi/sg.c                           |   8 +-
 drivers/scsi/sgiwd93.c                      |  24 +-
 drivers/scsi/smartpqi/smartpqi_init.c       |  14 +-
 drivers/scsi/sun3_scsi.c                    |   4 +-
 drivers/scsi/sym53c8xx_2/sym_glue.c         |   4 +-
 drivers/scsi/wd33c93.c                      | 119 ++++----
 drivers/scsi/wd33c93.h                      |   4 +
 drivers/scsi/wd719x.c                       |  12 +-
 drivers/scsi/wd719x.h                       |   1 +
 drivers/scsi/zalon.c                        |   1 +
 drivers/usb/image/microtek.c                |   8 +-
 drivers/usb/storage/debug.c                 |   1 -
 drivers/usb/storage/uas.c                   |  43 ++-
 include/scsi/libfc.h                        |   9 +
 include/scsi/libiscsi.h                     |  12 +
 include/scsi/scsi_cmnd.h                    |  14 +-
 113 files changed, 1470 insertions(+), 1084 deletions(-)
 rename drivers/scsi/arm/{scsi.h => arm_scsi.h} (75%)
 delete mode 100644 drivers/scsi/scsi.h