GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-05-05 06:43:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

null_blk: synchronization fix for zoned device

Browse source 
Parallel write,read,zone-mgmt operations accessing/altering zone state
and write-pointer may get into race. Avoid the situation by using a new
spinlock for zoned device.
Concurrent zone-appends (on a zone) returning same write-pointer issue
is also avoided using this lock.

Cc: stable@vger.kernel.org
Fixes: e0489ed5da ("null_blk: Support REQ_OP_ZONE_APPEND")
Signed-off-by: Kanchan Joshi <joshi.k@samsung.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Kanchan Joshi 2020-09-28 15:25:49 +05:30 • committed by Jens Axboe
parent f255c19b3a
commit 35bc10b2ea
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/block/null_blk.h
View file

@ -47,6 +47,7 @@ struct nullb_device {
unsigned int nr_zones_closed; unsigned int nr_zones_closed;
struct blk_zone *zones; struct blk_zone *zones;
sector_t zone_size_sects; sector_t zone_size_sects;
spinlock_t zone_lock;
unsigned long size; /* device size in MB */ unsigned long size; /* device size in MB */
unsigned long completion_nsec; /* time in ns to complete a request */ unsigned long completion_nsec; /* time in ns to complete a request */

22
drivers/block/null_blk_zoned.c
View file

@ -45,6 +45,7 @@ int null_init_zoned_dev(struct nullb_device *dev, struct request_queue *q)
if (!dev->zones) if (!dev->zones)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&dev->zone_lock);
if (dev->zone_nr_conv >= dev->nr_zones) { if (dev->zone_nr_conv >= dev->nr_zones) {
dev->zone_nr_conv = dev->nr_zones - 1; dev->zone_nr_conv = dev->nr_zones - 1;
pr_info("changed the number of conventional zones to %u", pr_info("changed the number of conventional zones to %u",
@ -149,8 +150,11 @@ int null_report_zones(struct gendisk *disk, sector_t sector,
* So use a local copy to avoid corruption of the device zone * So use a local copy to avoid corruption of the device zone
* array. * array.
*/ */
spin_lock_irq(&dev->zone_lock);
memcpy(&zone, &dev->zones[first_zone + i], memcpy(&zone, &dev->zones[first_zone + i],
sizeof(struct blk_zone)); sizeof(struct blk_zone));
spin_unlock_irq(&dev->zone_lock);
error = cb(&zone, i, data); error = cb(&zone, i, data);
if (error) if (error)
return error; return error;
@ -499,18 +503,28 @@ static blk_status_t null_zone_mgmt(struct nullb_cmd *cmd, enum req_opf op,
blk_status_t null_process_zoned_cmd(struct nullb_cmd *cmd, enum req_opf op, blk_status_t null_process_zoned_cmd(struct nullb_cmd *cmd, enum req_opf op,
sector_t sector, sector_t nr_sectors) sector_t sector, sector_t nr_sectors)
{ {
blk_status_t sts;
struct nullb_device *dev = cmd->nq->dev;
spin_lock_irq(&dev->zone_lock);
switch (op) { switch (op) {
case REQ_OP_WRITE: case REQ_OP_WRITE:
return null_zone_write(cmd, sector, nr_sectors, false); sts = null_zone_write(cmd, sector, nr_sectors, false);
break;
case REQ_OP_ZONE_APPEND: case REQ_OP_ZONE_APPEND:
return null_zone_write(cmd, sector, nr_sectors, true); sts = null_zone_write(cmd, sector, nr_sectors, true);
break;
case REQ_OP_ZONE_RESET: case REQ_OP_ZONE_RESET:
case REQ_OP_ZONE_RESET_ALL: case REQ_OP_ZONE_RESET_ALL:
case REQ_OP_ZONE_OPEN: case REQ_OP_ZONE_OPEN:
case REQ_OP_ZONE_CLOSE: case REQ_OP_ZONE_CLOSE:
case REQ_OP_ZONE_FINISH: case REQ_OP_ZONE_FINISH:
return null_zone_mgmt(cmd, op, sector); sts = null_zone_mgmt(cmd, op, sector);
break;
default: default:
return null_process_cmd(cmd, op, sector, nr_sectors); sts = null_process_cmd(cmd, op, sector, nr_sectors);
} }
spin_unlock_irq(&dev->zone_lock);
return sts;
} }