Revert "sd: remove __data_len hack for WRITE SAME"

This patch reverts commit f80de881d8df and avoids that sending a
WRITE SAME command to the iSCSI initiator triggers the following:

BUG: unable to handle kernel NULL pointer dereference at 0000000000000014
TARGET_CORE[iSCSI]: Expected Transfer Length: 260096 does not match SCSI CDB Length: 512 for SAM Opcode: 0x41
IP: iscsi_tcp_segment_done+0x20b/0x310 [libiscsi_tcp]

Oops: 0000 [#1] SMP
Modules linked in: target_core_user uio target_core_iblock target_core_file iscsi_target_mod target_core_mod netconsole configfs crct10dif_pclmul crc32_pclmul ghash_clmulni_intel aesni_intel aes_x86_64 crypto_simd cryptd glue_helper virtio_console virtio_rng virtio_balloon serio_raw i2c_piix4 acpi_cpufreq button iscsi_tcp libiscsi_tcp libiscsi scsi_transport_iscsi ext4 jbd2 mbcache virtio_blk virtio_net psmouse floppy drm_kms_helper syscopyarea
sysfillrect sysimgblt fb_sys_fops ttm drm virtio_pci
CPU: 2 PID: 5 Comm: kworker/u8:0 Not tainted 4.10.0-rc5-debug+ #3
Workqueue: iscsi_q_0 iscsi_xmitworker [libiscsi]
RIP: 0010:iscsi_tcp_segment_done+0x20b/0x310 [libiscsi_tcp]
Call Trace:
iscsi_sw_tcp_xmit_segment+0x84/0x120 [iscsi_tcp]
iscsi_sw_tcp_pdu_xmit+0x51/0x180 [iscsi_tcp]
iscsi_tcp_task_xmit+0xb3/0x290 [libiscsi_tcp]
iscsi_xmit_task+0x4e/0xc0 [libiscsi]
iscsi_xmitworker+0x243/0x330 [libiscsi]
process_one_work+0x1d8/0x4b0
worker_thread+0x49/0x4a0
kthread+0x102/0x140

Fixes: f80de881d8df ("sd: remove __data_len hack for WRITE SAME")
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Jens Axboe <axboe@fb.com>
Cc: Lee Duncan <lduncan@suse.com>
Cc: Chris Leech <cleech@redhat.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

authored by Bart Van Assche and committed by Jens Axboe 08965c2e 0d4ee015

+16 -1
+16 -1
drivers/scsi/sd.c
··· 836 836 struct bio *bio = rq->bio; 837 837 sector_t sector = blk_rq_pos(rq); 838 838 unsigned int nr_sectors = blk_rq_sectors(rq); 839 + unsigned int nr_bytes = blk_rq_bytes(rq); 839 840 int ret; 840 841 841 842 if (sdkp->device->no_write_same) ··· 869 868 870 869 cmd->transfersize = sdp->sector_size; 871 870 cmd->allowed = SD_MAX_RETRIES; 872 - return scsi_init_io(cmd); 871 + 872 + /* 873 + * For WRITE SAME the data transferred via the DATA OUT buffer is 874 + * different from the amount of data actually written to the target. 875 + * 876 + * We set up __data_len to the amount of data transferred via the 877 + * DATA OUT buffer so that blk_rq_map_sg sets up the proper S/G list 878 + * to transfer a single sector of data first, but then reset it to 879 + * the amount of data to be written right after so that the I/O path 880 + * knows how much to actually write. 881 + */ 882 + rq->__data_len = sdp->sector_size; 883 + ret = scsi_init_io(cmd); 884 + rq->__data_len = nr_bytes; 885 + return ret; 873 886 } 874 887 875 888 static int sd_setup_flush_cmnd(struct scsi_cmnd *cmd)