block: improve handling of the magic discard payload
Instead of allocating a single unused biovec for discard requests, send them down without any payload. Instead we allow the driver to add a "special" payload using a biovec embedded into struct request (unioned over other fields never used while in the driver), and overloading the number of segments for this case. This has a couple of advantages: - we don't have to allocate the bio_vec - the amount of special casing for discard requests in the block layer is significantly reduced - using this same scheme for other request types is trivial, which will be important for implementing the new WRITE_ZEROES op on devices where it actually requires a payload (e.g. SCSI) - we can get rid of playing games with the request length, as we'll never touch it and completions will work just fine - it will allow us to support ranged discard operations in the future by merging non-contiguous discard bios into a single request - last but not least it removes a lot of code This patch is the common base for my WIP series for ranges discards and to remove discard_zeroes_data in favor of always using REQ_OP_WRITE_ZEROES, so it would be good to get it in quickly. Signed-off-by:Christoph Hellwig <hch@lst.de> Signed-off-by:
Jens Axboe <axboe@fb.com>
Showing
- block/bio.c 1 addition, 9 deletionsblock/bio.c
- block/blk-core.c 2 additions, 32 deletionsblock/blk-core.c
- block/blk-lib.c 1 addition, 1 deletionblock/blk-lib.c
- block/blk-merge.c 17 additions, 36 deletionsblock/blk-merge.c
- drivers/nvme/host/core.c 4 additions, 13 deletionsdrivers/nvme/host/core.c
- drivers/nvme/host/nvme.h 4 additions, 2 deletionsdrivers/nvme/host/nvme.h
- drivers/nvme/host/pci.c 14 additions, 13 deletionsdrivers/nvme/host/pci.c
- drivers/nvme/host/rdma.c 5 additions, 8 deletionsdrivers/nvme/host/rdma.c
- drivers/nvme/target/loop.c 2 additions, 2 deletionsdrivers/nvme/target/loop.c
- drivers/scsi/scsi_lib.c 3 additions, 3 deletionsdrivers/scsi/scsi_lib.c
- drivers/scsi/sd.c 9 additions, 15 deletionsdrivers/scsi/sd.c
- include/linux/bio.h 2 additions, 1 deletioninclude/linux/bio.h
- include/linux/blkdev.h 12 additions, 3 deletionsinclude/linux/blkdev.h
Loading
Please register or sign in to comment