diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-10 11:16:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-10 11:16:07 -0700 |
| commit | 0a85ed6e7fce8075bb3090f8eac05ca1000f5969 (patch) | |
| tree | a3dea96c1d9c827b223e1238b9ed9aecdae6502c /tools | |
| parent | gcc-10: mark more functions __init to avoid section mismatch warnings (diff) | |
| parent | nvme: fix possible hang when ns scanning fails during error recovery (diff) | |
| download | linux-dev-0a85ed6e7fce8075bb3090f8eac05ca1000f5969.tar.xz linux-dev-0a85ed6e7fce8075bb3090f8eac05ca1000f5969.zip | |
Merge tag 'block-5.7-2020-05-09' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
- a small series fixing a use-after-free of bdi name (Christoph,Yufen)
- NVMe fix for a regression with the smaller CQ update (Alexey)
- NVMe fix for a hang at namespace scanning error recovery (Sagi)
- fix race with blk-iocost iocg->abs_vdebt updates (Tejun)
* tag 'block-5.7-2020-05-09' of git://git.kernel.dk/linux-block:
nvme: fix possible hang when ns scanning fails during error recovery
nvme-pci: fix "slimmer CQ head update"
bdi: add a ->dev_name field to struct backing_dev_info
bdi: use bdi_dev_name() to get device name
bdi: move bdi_dev_name out of line
vboxsf: don't use the source name in the bdi name
iocost: protect iocg->abs_vdebt with iocg->waitq.lock
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/cgroup/iocost_monitor.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/cgroup/iocost_monitor.py b/tools/cgroup/iocost_monitor.py index 7427a5ee761b..9d8e9613008a 100644 --- a/tools/cgroup/iocost_monitor.py +++ b/tools/cgroup/iocost_monitor.py @@ -159,7 +159,12 @@ class IocgStat: else: self.inflight_pct = 0 - self.debt_ms = iocg.abs_vdebt.counter.value_() / VTIME_PER_USEC / 1000 + # vdebt used to be an atomic64_t and is now u64, support both + try: + self.debt_ms = iocg.abs_vdebt.counter.value_() / VTIME_PER_USEC / 1000 + except: + self.debt_ms = iocg.abs_vdebt.value_() / VTIME_PER_USEC / 1000 + self.use_delay = blkg.use_delay.counter.value_() self.delay_ms = blkg.delay_nsec.counter.value_() / 1_000_000 |