Ming Lei 866663b7b5 block: return ELEVATOR_DISCARD_MERGE if possible ...

When merging one bio to request, if they are discard IO and the queue
supports multi-range discard, we need to return ELEVATOR_DISCARD_MERGE
because both block core and related drivers(nvme, virtio-blk) doesn't
handle mixed discard io merge(traditional IO merge together with
discard merge) well.

Fix the issue by returning ELEVATOR_DISCARD_MERGE in this situation,
so both blk-mq and drivers just need to handle multi-range discard.

Reported-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Fixes: 2705dfb209 ("block: fix discard request merge")
Link: https://lore.kernel.org/r/20210729034226.1591070-1-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

2021-08-09 14:37:47 -06:00

..

partitions

block: remove cmdline-parser.c

2021-08-02 13:37:28 -06:00

badblocks.c

treewide: Use fallthrough pseudo-keyword

2020-08-23 17:36:59 -05:00

bfq-cgroup.c

block, bfq: merge bursts of newly-created queues

2021-03-25 10:50:07 -06:00

bfq-iosched.c

block: return ELEVATOR_DISCARD_MERGE if possible

2021-08-09 14:37:47 -06:00

bfq-iosched.h

block, bfq: merge bursts of newly-created queues

2021-03-25 10:50:07 -06:00

bfq-wf2q.c

block, bfq: always inject I/O of queues blocked by wakers

2021-03-25 10:50:07 -06:00

bio-integrity.c

block: use bvec_kmap_local in bio_integrity_process

2021-08-02 13:37:28 -06:00

bio.c

block: rewrite bio_copy_data_iter to use bvec_kmap_local and memcpy_to_bvec

2021-08-02 13:37:27 -06:00

blk-cgroup-rwstat.c

blk-cgroup: Fix the recursive blkg rwstat

2021-03-05 11:32:15 -07:00

blk-cgroup-rwstat.h

blk-cgroup: separate out blkg_rwstat under CONFIG_BLK_CGROUP_RWSTAT

2019-11-07 12:28:13 -07:00

blk-cgroup.c

block: move the bdi from the request_queue to the gendisk

2021-08-09 11:53:23 -06:00

blk-core.c

block: move the bdi from the request_queue to the gendisk

2021-08-09 11:53:23 -06:00

blk-crypto-fallback.c

block: rename BIO_MAX_PAGES to BIO_MAX_VECS

2021-03-11 07:47:48 -07:00

blk-crypto-internal.h

block: make blk_crypto_rq_bio_prep() able to fail

2020-10-05 10:47:43 -06:00

blk-crypto.c

dm: support key eviction from keyslot managers of underlying devices

2021-02-11 09:45:25 -05:00

blk-exec.c

block: return errors from blk_execute_rq()

2021-06-30 15:35:45 -06:00

blk-flush.c

block: avoid double io accounting for flush request

2021-05-24 06:47:21 -06:00

blk-integrity.c

block: remove the unused blk_integrity_merge_bio export

2020-10-06 07:29:53 -06:00

blk-ioc.c

block: remove retry loop in ioc_release_fn()

2020-07-16 10:22:15 -06:00

blk-iocost.c

blk-iocost: fix operation ordering in iocg_wake_fn()

2021-07-27 19:25:37 -06:00

blk-iolatency.c

block: Remove redundant 'return' statement

2020-10-08 07:59:48 -06:00

blk-ioprio.c

block: Introduce the ioprio rq-qos policy

2021-06-21 15:03:40 -06:00

blk-ioprio.h

block: Introduce the ioprio rq-qos policy

2021-06-21 15:03:40 -06:00

blk-lib.c

block: export blk_next_bio()

2021-06-17 15:51:20 +02:00

blk-map.c

block: use memcpy_from_bvec in bio_copy_kern_endio_read

2021-08-02 13:37:28 -06:00

blk-merge.c

block: return ELEVATOR_DISCARD_MERGE if possible

2021-08-09 14:37:47 -06:00

blk-mq-cpumap.c

blk-mq: remove the calling of local_memory_node()

2020-10-20 07:08:17 -06:00

blk-mq-debugfs-zoned.c

block: Cleanup license notice

2019-01-17 21:21:40 -07:00

blk-mq-debugfs.c

block: Introduce the ioprio rq-qos policy

2021-06-21 15:03:40 -06:00

blk-mq-debugfs.h

blk-mq: no need to check return value of debugfs_create functions

2019-06-13 03:00:30 -06:00

blk-mq-pci.c

block: Fix blk_mq_*_map_queues() kernel-doc headers

2019-05-31 15:12:34 -06:00

blk-mq-rdma.c

block: Fix blk_mq_*_map_queues() kernel-doc headers

2019-05-31 15:12:34 -06:00

blk-mq-sched.c

blk-mq-sched: Fix blk_mq_sched_alloc_tags() error handling

2021-07-27 16:44:38 -06:00

blk-mq-sched.h

blk: Fix lock inversion between ioc lock and bfqd lock

2021-06-24 18:43:55 -06:00

blk-mq-sysfs.c

block: remove blk-mq-sysfs dead code

2021-08-02 13:37:29 -06:00

blk-mq-tag.c

blk-mq: Use request queue-wide tags for tagset-wide sbitmap

2021-05-24 06:47:22 -06:00

blk-mq-tag.h

blk-mq: Some tag allocation code refactoring

2021-05-24 06:47:22 -06:00

blk-mq-virtio.c

blk-mq: Fix typo in comment

2020-03-17 20:55:21 +01:00

blk-mq.c

block: move the bdi from the request_queue to the gendisk

2021-08-09 11:53:23 -06:00

blk-mq.h

blk: Fix lock inversion between ioc lock and bfqd lock

2021-06-24 18:43:55 -06:00

blk-pm.c

scsi: block: Fix a race in the runtime power management code

2020-12-09 11:41:41 -05:00

blk-pm.h

block: Remove unused blk_pm_*() function definitions

2021-02-22 06:33:48 -07:00

blk-rq-qos.c

rq-qos: fix missed wake-ups in rq_qos_throttle try two

2021-06-08 15:12:57 -06:00

blk-rq-qos.h

block: Introduce the ioprio rq-qos policy

2021-06-21 15:03:40 -06:00

blk-settings.c

block: move the bdi from the request_queue to the gendisk

2021-08-09 11:53:23 -06:00

blk-stat.c

blk-stat: make q->stats->lock irqsafe

2020-09-01 16:48:46 -06:00

blk-stat.h

block: deactivate blk_stat timer in wbt_disable_default()

2018-12-12 06:47:51 -07:00

blk-sysfs.c

block: move the bdi from the request_queue to the gendisk

2021-08-09 11:53:23 -06:00

blk-throttle.c

block: store a block_device pointer in struct bio

2021-01-24 18:17:20 -07:00

blk-timeout.c

block: blk-timeout: delete duplicated word

2020-07-31 16:29:47 -06:00

blk-wbt.c

block: move the bdi from the request_queue to the gendisk

2021-08-09 11:53:23 -06:00

blk-wbt.h

blk-wbt: introduce a new disable state to prevent false positive by rwb_enabled()

2021-06-21 15:03:41 -06:00

blk-zoned.c

block: improve handling of all zones reset operation

2021-06-04 12:07:34 -04:00

blk.h

block: remove disk_name()

2021-08-02 13:37:28 -06:00

bounce.c

block: use memcpy_from_bvec in __blk_queue_bounce

2021-08-02 13:37:28 -06:00

bsg-lib.c

Merge tag 'block-5.14-2021-07-08' of git://git.kernel.dk/linux-block

2021-07-09 12:05:33 -07:00

bsg.c

Merge tag 'block-5.14-2021-07-08' of git://git.kernel.dk/linux-block

2021-07-09 12:05:33 -07:00

disk-events.c

block: add a helper to raise a media changed event

2021-08-02 13:37:28 -06:00

elevator.c

block: return ELEVATOR_DISCARD_MERGE if possible

2021-08-09 14:37:47 -06:00

genhd.c

block: move the bdi from the request_queue to the gendisk

2021-08-09 11:53:23 -06:00

holder.c

block: support delayed holder registration

2021-08-09 11:50:42 -06:00

ioctl.c

block: remove the bd_bdi in struct block_device

2021-08-09 11:53:26 -06:00

ioprio.c

block: Fix sys_ioprio_set(.which=IOPRIO_WHO_PGRP) task iteration

2021-04-08 13:43:53 -06:00

Kconfig

block: make the block holder code optional

2021-08-09 11:50:42 -06:00

Kconfig.iosched

block/mq-deadline: Add cgroup support

2021-06-21 15:03:41 -06:00

keyslot-manager.c

Merge tag 'for-5.12/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

2021-02-22 10:22:54 -08:00

kyber-iosched.c

kyber: fix out of bounds access when preempted

2021-05-11 08:12:14 -06:00

Makefile

block: make the block holder code optional

2021-08-09 11:50:42 -06:00

mq-deadline-cgroup.c

block/mq-deadline: Add cgroup support

2021-06-21 15:03:41 -06:00

mq-deadline-cgroup.h

block/mq-deadline: Add cgroup support

2021-06-21 15:03:41 -06:00

mq-deadline-main.c

block: return ELEVATOR_DISCARD_MERGE if possible

2021-08-09 14:37:47 -06:00

opal_proto.h

block: sed-opal: Change the check condition for regular session validity

2020-03-12 08:00:10 -06:00

scsi_ioctl.c

Merge tag 'block-5.14-2021-07-08' of git://git.kernel.dk/linux-block

2021-07-09 12:05:33 -07:00

sed-opal.c

block: sed-opal: Change the check condition for regular session validity

2020-03-12 08:00:10 -06:00

t10-pi.c

block: use bvec_kmap_local in t10_pi_type1_{prepare,complete}

2021-08-02 13:37:28 -06:00