Patch "target: Fix max_unmap_lba_count calc overflow" has been added to the 4.7-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
target: Fix max_unmap_lba_count calc overflow
to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
target-fix-max_unmap_lba_count-calc-overflow.patch
and it can be found in the queue-4.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
ea263c7fada4af8ec7fe5fcfd6e7d7705a89351bMon Sep 17 00:00:00 2001
From: Mike Christie <[email protected]>
Date: Thu, 2 Jun 2016 20:12:37 -0500
Subject: target: Fix max_unmap_lba_count calc overflow
From: Mike Christie <[email protected]>
commit ea263c7fada4af8ec7fe5fcfd6e7d7705a89351b upstream.
max_discard_sectors only 32bits, and some non scsi backend devices will set this to the max 0xffffffff, so we can end up overflowing during the max_unmap_lba_count calculation.
This fixes a regression caused by my patch:
commit 8a9ebe717a133ba7bc90b06047f43cc6b8bcb8b3
Author: Mike Christie <[email protected]> Date: Mon Jan 18 14:09:27 2016 -0600
target: Fix WRITE_SAME/DISCARD conversion to linux 512b sectors
which can result in extra discards being sent to due the overflow causing max_unmap_lba_count to be smaller than what the backing device can actually support.
--- drivers/target/target_core_device.c | 8 +++++--- drivers/target/target_core_file.c | 3 +-- drivers/target/target_core_iblock.c | 3 +-- include/target/target_core_backend.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/target/target_core_device.c +5 -3
@@ -821,13 +821,15 @@ struct se_device *target_alloc_device(st* in ATA and we need to set TPE=1 */ bool target_configure_unmap_from_queue (struct se_dev_attrib *attrib, -struct request_queue *q,int block_size) +struct request_queue *q) { +int block_size =queue_logical_block_size (q); +if (!blk_queue_discard (q))return false; - attrib->max_unmap_lba_count = (q->limits.max_discard_sectors <<9 ) / - block_size; + attrib->max_unmap_lba_count = + q->limits.max_discard_sectors >> (ilog2 (block_size) -9 );/* * Currently hardcoded to 1 in Linux/SCSI code.. */
drivers/target/target_core_file.c +1 -2
@@ -161,8 +161,7 @@ static int fd_configure_device(struct se dev_size,div_u64 (dev_size, fd_dev->fd_block_size), fd_dev->fd_block_size); -if (target_configure_unmap_from_queue (&dev->dev_attrib, q, - fd_dev->fd_block_size)) +if (target_configure_unmap_from_queue (&dev->dev_attrib, q))pr_debug ("IFILE: BLOCK Discard support available," " disabled by default\n" );/*
drivers/target/target_core_iblock.c +1 -2
@@ -121,8 +121,7 @@ static int iblock_configure_device(struc dev->dev_attrib.hw_max_sectors =queue_max_hw_sectors (q); dev->dev_attrib.hw_queue_depth = q->nr_requests; -if (target_configure_unmap_from_queue (&dev->dev_attrib, q, - dev->dev_attrib.hw_block_size)) +if (target_configure_unmap_from_queue (&dev->dev_attrib, q))pr_debug ("IBLOCK: BLOCK Discard support available," " disabled by default\n" );
include/target/target_core_backend.h +1 -1
@@ -95,6 +95,6 @@ sense_reason_t passthrough_parse_cdb(strbool target_sense_desc_format (struct se_device *dev);sector_t target_to_linux_sector (struct se_device *dev,sector_t lb);bool target_configure_unmap_from_queue (struct se_dev_attrib *attrib, -struct request_queue *q,int block_size); +struct request_queue *q);#endif /* TARGET_CORE_BACKEND_H */
Patches currently in stable-queue which might be from [email protected] are
queue-4.7/target-fix-max_unmap_lba_count-calc-overflow.patch queue-4.7/target-fix-race-between-iscsi-target-connection-shutdown-abort_task.patch queue-4.7/target-fix-missing-complete-during-abort_task-cmd_t_fabric_stop.patch