• M
    dm: fix redundant IO accounting for bios that need splitting · dd6776d4
    Mike Snitzer 提交于
    commit a1e1cb72d96491277ede8d257ce6b48a381dd336 upstream.
    
    [Joseph] cherry-pick part_stat_get() from commit 1226b8dd0e91 ("block:
    switch to per-cpu in-flight counters") since we don't want the whole
    patch series get involved.
    
    The risk of redundant IO accounting was not taken into consideration
    when commit 18a25da8 ("dm: ensure bio submission follows a
    depth-first tree walk") introduced IO splitting in terms of recursion
    via generic_make_request().
    
    Fix this by subtracting the split bio's payload from the IO stats that
    were already accounted for by start_io_acct() upon dm_make_request()
    entry.  This repeat oscillation of the IO accounting, up then down,
    isn't ideal but refactoring DM core's IO splitting to pre-split bios
    _before_ they are accounted turned out to be an excessive amount of
    change that will need a full development cycle to refine and verify.
    
    Before this fix:
    
      /dev/mapper/stripe_dev is a 4-way stripe using a 32k chunksize, so
      bios are split on 32k boundaries.
    
      # fio --name=16M --filename=/dev/mapper/stripe_dev --rw=write --bs=64k --size=16M \
        	--iodepth=1 --ioengine=libaio --direct=1 --refill_buffers
    
      with debugging added:
      [103898.310264] device-mapper: core: start_io_acct: dm-2 WRITE bio->bi_iter.bi_sector=0 len=128
      [103898.318704] device-mapper: core: __split_and_process_bio: recursing for following split bio:
      [103898.329136] device-mapper: core: start_io_acct: dm-2 WRITE bio->bi_iter.bi_sector=64 len=64
      ...
    
      16M written yet 136M (278528 * 512b) accounted:
      # cat /sys/block/dm-2/stat | awk '{ print $7 }'
      278528
    
    After this fix:
    
      16M written and 16M (32768 * 512b) accounted:
      # cat /sys/block/dm-2/stat | awk '{ print $7 }'
      32768
    
    Fixes: 18a25da8 ("dm: ensure bio submission follows a depth-first tree walk")
    Cc: stable@vger.kernel.org # 4.16+
    Reported-by: NBryan Gurney <bgurney@redhat.com>
    Reviewed-by: NMing Lei <ming.lei@redhat.com>
    Signed-off-by: NMike Snitzer <snitzer@redhat.com>
    Signed-off-by: NJoseph Qi <joseph.qi@linux.alibaba.com>
    Signed-off-by: NShile Zhang <shile.zhang@linux.alibaba.com>
    Acked-by: NCaspar Zhang <caspar@linux.alibaba.com>
    dd6776d4
dm.c 73.9 KB