Skip to content

scsi: scsi_debug: fix zoned write validation

Niklas Cassel linux-scsi 11 versions – Applied

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

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v11 Latest13 patches 4 repliesApplied
  2. v1012 patches 1 replySuperseded
  3. v911 patches 5 repliesSuperseded
Earlier versions · 8
VersionPostedPatchesRepliesStatus
v811 patches0 repliesSuperseded
v711 patches4 repliesSuperseded
v611 patches1 replySuperseded
v510 patches5 repliesSuperseded
v410 patches14 repliesSuperseded
v36 patches8 repliesSuperseded
v24 patches4 repliesSuperseded
v12 patches17 repliesSuperseded

Changes in v11 from the cover letter

- Patch 3 is new. A negative physblk_exp was accepted, and the driver shifts by it. Sashiko pointed this out.
- Patch 6 caps the offset at the length of the buffer rather than at U32_MAX, which is -1 as an off_t on 32-bit architectures, as Sashiko pointed out.
- Patch 7 only sets the residual when it is non-zero, as Damien suggested. Picked up his Reviewed-by.
- Patch 11 cites SBC-6 4.28.2 in the comment above the new check, as John suggested. Picked up his Reviewed-by.

Patches in v11 Applied

#Subject and filesSizeRepliesApplied
1/13scsi: scsi_debug: Refuse a zoned device with a non-zero lowest aligned LBAdrivers/scsi/scsi_debug.c+5 -00 replies
2/13scsi: scsi_debug: Make atomic writes and ZBC emulation mutually exclusivedrivers/scsi/scsi_debug.c+5 -00 replies
3/13scsi: scsi_debug: Refuse a negative physblk_expdrivers/scsi/scsi_debug.c+2 -21 reply
4/13scsi: scsi_debug: Take the zone metadata lock before the data lockdrivers/scsi/scsi_debug.c+3 -30 replies
5/13scsi: scsi_debug: Evaluate scsi_debug_lbp() only oncedrivers/scsi/scsi_debug.c+10 -110 replies
6/13scsi: scsi_debug: Avoid 32-bit overflow in WRITE SCATTERED offsetsdrivers/scsi/scsi_debug.c+8 -51 reply
7/13scsi: scsi_debug: Report the residual of a writedrivers/scsi/scsi_debug.c+18 -10 replies
8/13scsi: scsi_debug: Enforce physical block alignment of zoned writesdrivers/scsi/scsi_debug.c+10 -00 replies
9/13scsi: scsi_debug: Do not write a partial physical block to a zoned devicedrivers/scsi/scsi_debug.c+21 -00 replies
10/13scsi: scsi_debug: Advance the write pointer over the data writtendrivers/scsi/scsi_debug.c+7 -60 replies
11/13scsi: scsi_debug: Refuse a short WRITE ATOMIC (16) before writing itdrivers/scsi/scsi_debug.c+8 -00 replies
12/13scsi: scsi_debug: Map the region written by WRITE ATOMIC (16)drivers/scsi/scsi_debug.c+14 -00 replies
13/13scsi: scsi_debug: Validate the access parameters of WRITE ATOMIC (16)drivers/scsi/scsi_debug.c+4 -00 replies

Reviews trailers per patch

All 13 patches have a Reviewed-by or Acked-by.

PatchDamien Le MoalJohn Garry
1/13R-b
2/13R-b R-b
3/13R-b
4/13R-b
5/13R-b R-b
6/13R-b
7/13R-b
8/13R-b
9/13R-b
10/13R-b
11/13R-b R-b
12/13R-b R-b
13/13R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v11 thread

Cover letter [PATCH v11 00/13] scsi: scsi_debug: fix zoned write validation

This series fixes scsi_debug with regards to writes to a ZBC drive, and to WRITE ATOMIC (16). Each patch describes the problem that it fixes.

Two configurations are refused rather than emulated, and those two patches come first, as the rest of the series relies on what they
exclude: a zoned device whose lowest aligned LBA is not zero, which no host writing in units of the reported zone write granularity could ever write, and atomic writes on a zoned device, which no drive supports.

Little of this is reachable in a default configuration. Most of it needs physblk_exp, atomic_wr or logical block provisioning to be set, or an initiator that does not provide a data buffer matching the transfer length of the command.

The series is based on 7.4/scsi-staging rather than 7.3/scsi-fixes (as Damien suggested on v1) to avoid a build failure that would have happened if this series was simply merged with linux-next:

error: too many arguments to function 'mk_sense_buffer'

Tested on a zoned scsi_debug device with 512 byte logical blocks and a 4096 byte physical block, and on a device that is not zoned for the WRITE ATOMIC (16) patches. The notes below each patch describe what was observed before and after it.

Changes since v10:
- Patch 3 is new. A negative physblk_exp was accepted, and the driver shifts by it. Sashiko pointed this out.
- Patch 6 caps the offset at the length of the buffer rather than at U32_MAX, which is -1 as an off_t on 32-bit architectures, as Sashiko pointed out.
- Patch 7 only sets the residual when it is non-zero, as Damien suggested. Picked up his Reviewed-by.
- Patch 11 cites SBC-6 4.28.2 in the comment above the new check, as John suggested. Picked up his Reviewed-by.

Niklas Cassel (13):
scsi: scsi_debug: Refuse a zoned device with a non-zero lowest aligned
LBA
scsi: scsi_debug: Make atomic writes and ZBC emulation mutually
exclusive
scsi: scsi_debug: Refuse a negative physblk_exp
scsi: scsi_debug: Take the zone metadata lock before the data lock
scsi: scsi_debug: Evaluate scsi_debug_lbp() only once
scsi: scsi_debug: Avoid 32-bit overflow in WRITE SCATTERED offsets
scsi: scsi_debug: Report the residual of a write
scsi: scsi_debug: Enforce physical block alignment of zoned writes
scsi: scsi_debug: Do not write a partial physical block to a zoned
device
scsi: scsi_debug: Advance the write pointer over the data written
scsi: scsi_debug: Refuse a short WRITE ATOMIC (16) before writing it
scsi: scsi_debug: Map the region written by WRITE ATOMIC (16)
scsi: scsi_debug: Validate the access parameters of WRITE ATOMIC (16)

 drivers/scsi/scsi_debug.c | 143 ++++++++++++++++++++++++++++++--------
 1 file changed, 115 insertions(+), 28 deletions(-)

base-commit: f09d2c7485b32adb82336d0d748935c8237a649e

Signature · 1 line
2.55.0