Ming Lei d8ef677e32 FROMGIT: block: avoid double io accounting for flush request ...

For flush request, rq->end_io() may be called two times, one is from
timeout handling(blk_mq_check_expired()), another is from normal
completion(__blk_mq_end_request()).

Move blk_account_io_flush() after flush_rq->ref drops to zero, so
io accounting can be done just once for flush request.

Fixes: b686631865 ("block: add iostat counters for flush requests")
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: John Garry <john.garry@huawei.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20210511152236.763464-2-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Bug: 188199752
(cherry picked from commit 773cd5fb22e7c61c65c7528a3e1cb5bcbc1408ea git://git.kernel.dk/linux-block/ for-5.14/block)
Signed-off-by: Bart Van Assche <bvanassche@google.com>
Change-Id: I0cbcb35fce831daab99145d2401a6fdeb5d575b4

2021-05-14 13:50:36 -07:00

..

partitions

Merge 1f06959bd2 ("block: remove the unused q argument to part_in_flight and part_in_flight_rw") into android-mailine

2020-10-24 10:17:17 +02:00

badblocks.c

treewide: Use fallthrough pseudo-keyword

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

bfq-cgroup.c

bfq: fix blkio cgroup leakage v4

2020-08-18 07:48:08 -07:00

bfq-iosched.c

bfq: Avoid false bfq queue merging

2021-03-04 11:37:18 +01:00

bfq-iosched.h

bfq: fix blkio cgroup leakage v4

2020-08-18 07:48:08 -07:00

bfq-wf2q.c

bfq: fix blkio cgroup leakage v4

2020-08-18 07:48:08 -07:00

bio-integrity.c

block: make function __bio_integrity_free() static

2020-07-02 12:38:18 -06:00

bio.c

Revert "BACKPORT: bio: limit bio max size"

2021-05-11 09:34:37 -07:00

blk-cgroup-rwstat.c

blk-cgroup: Fix the recursive blkg rwstat

2021-03-30 14:31:48 +02: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

blk-cgroup: Use cond_resched() when destroy blkgs

2021-02-13 13:55:13 +01:00

blk-core.c

scsi: block: Do not accept any requests while suspended

2021-01-12 20:18:17 +01:00

blk-crypto-fallback.c

Merge commit 382625d0d4 ("Merge tag 'for-5.9/block-20200802' of git://git.kernel.dk/linux-block") into android-mainline

2020-08-06 10:07:17 -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

Merge 3ad11d7ac8 ("Merge tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block") into android-mainline

2020-10-24 17:29:43 +02:00

blk-exec.c

block: add a blk_account_io_merge_bio helper

2020-05-27 05:21:23 -06:00

blk-flush.c

FROMGIT: block: avoid double io accounting for flush request

2021-05-14 13:50:36 -07: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 NULL iocg deref from racing against initialization

2021-01-12 20:18:23 +01:00

blk-iolatency.c

block: Remove redundant 'return' statement

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

blk-lib.c

block: add a bdev_is_partition helper

2020-09-25 08:18:57 -06:00

blk-map.c

block: fix bmd->is_null_mapped initialization

2020-09-23 09:18:39 -06:00

blk-merge.c

block: recalculate segment count for multi-segment discards correctly

2021-03-30 14:32:06 +02: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

…

blk-mq-debugfs.c

blk-mq-debugfs: Add decode for BLK_MQ_F_TAG_HCTX_SHARED

2021-01-19 18:27:29 +01:00

blk-mq-debugfs.h

…

blk-mq-pci.c

…

blk-mq-rdma.c

…

blk-mq-sched.c

blk-mq: get rid of the dead flush handle code path

2020-10-09 12:35:39 -06:00

blk-mq-sched.h

Merge tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block

2020-10-13 12:12:44 -07:00

blk-mq-sysfs.c

blk-mq: move cancel of hctx->run_work to the front of blk_exit_queue

2020-10-09 12:46:28 -06:00

blk-mq-tag.c

block-mq: fix comments in blk_mq_queue_tag_busy_iter

2020-09-29 08:11:00 -06:00

blk-mq-tag.h

blk-mq: Relocate hctx_may_queue()

2020-09-03 15:20:47 -06:00

blk-mq-virtio.c

Merge 4646de87d3 ("Merge tag 'mailbox-v5.7' of git://git.linaro.org/landing-teams/working/fujitsu/integration") into android-mainline

2020-04-04 15:55:11 +02:00

blk-mq.c

FROMLIST: blk-mq: Swap two calls in blk_mq_exit_queue()

2021-05-14 10:17:49 -07:00

blk-mq.h

blk-mq: test QUEUE_FLAG_HCTX_ACTIVE for sbitmap_shared in hctx_may_queue

2021-02-03 23:28:44 +01:00

blk-pm.c

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

2021-01-06 14:56:50 +01:00

blk-pm.h

scsi: block: Do not accept any requests while suspended

2021-01-12 20:18:17 +01:00

blk-rq-qos.c

Revert "blk-rq-qos: remove redundant finish_wait to rq_qos_wait."

2020-07-15 09:33:37 -06:00

blk-rq-qos.h

blk-rq-qos: fix first node deletion of rq_qos_del()

2019-10-15 10:13:13 -06:00

blk-settings.c

Revert "BACKPORT: bio: limit bio max size"

2021-05-11 09:34:37 -07:00

blk-stat.c

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

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

blk-stat.h

…

blk-sysfs.c

blk-mq: move cancel of hctx->run_work to the front of blk_exit_queue

2020-10-09 12:46:28 -06:00

blk-throttle.c

blk-throttle: Re-use the throtl_set_slice_end()

2020-10-08 08:01:38 -06:00

blk-timeout.c

block: blk-timeout: delete duplicated word

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

blk-wbt.c

treewide: Use fallthrough pseudo-keyword

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

blk-wbt.h

blk-wbt: remove wbt_update_limits

2020-05-29 16:30:39 -06:00

blk-zoned.c

block: Fix REQ_OP_ZONE_RESET_ALL handling

2021-03-30 14:31:51 +02:00

blk.h

block: move blk_mq_sched_try_merge to blk-merge.c

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

bounce.c

block: make bio_crypt_clone() able to fail

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

bsg-lib.c

block: drop double zeroing

2020-09-23 09:18:13 -06:00

bsg.c

Merge 5.10.20 into android12-5.10

2021-03-07 12:33:33 +01:00

cmdline-parser.c

…

elevator.c

block: fix comment and add lockdep assert

2020-10-09 12:34:06 -06:00

genhd.c

block: Suppress uevent for hidden device when removed

2021-03-30 14:31:52 +02:00

ioctl.c

block: return -EBUSY when there are open partitions in blkdev_reread_part

2021-04-28 13:39:59 +02:00

ioprio.c

Revert "block: grant IOPRIO_CLASS_RT to CAP_SYS_NICE"

2020-10-24 17:30:14 +02:00

Kconfig

Merge 1f06959bd2 ("block: remove the unused q argument to part_in_flight and part_in_flight_rw") into android-mailine

2020-10-24 10:17:17 +02:00

Kconfig.iosched

treewide: replace '---help---' in Kconfig files with 'help'

2020-06-14 01:57:21 +09:00

keyslot-manager.c

UPSTREAM: block/keyslot-manager: introduce devm_blk_ksm_init()

2021-02-23 08:10:56 +01:00

kyber-iosched.c

blk-mq: Use pointers for blk_mq_tags bitmap tags

2020-09-03 15:20:47 -06:00

Makefile

blk-mq: merge blk-softirq.c into blk-mq.c

2020-06-24 09:15:56 -06:00

mq-deadline.c

blk-mq, elevator: Count requests per hctx to improve performance

2020-09-03 15:20: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

OWNERS

ANDROID: Add OWNERS files referring to the respective android-mainline OWNERS

2021-04-03 14:11:30 +00:00

scsi_ioctl.c

Revert "Revert "iov_iter: transparently handle compat iovecs in import_iovec""

2020-11-02 09:27:36 +01: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: Allow t10-pi to be modular

2020-01-06 20:59:04 -07:00