Skip to content

Commit

Permalink
dm: fix inflight IO check
Browse files Browse the repository at this point in the history
After switching to percpu inflight counters, the inflight check
is totally buggy. It's perfectly valid for some counters to be
non-zero while having a total inflight IO count of 0, that's how
these kinds of counters work (inc on one CPU, dec on another).
Fix the md_in_flight() check to sum all counters before returning
a false positive, potentially.

While at it, remove the inflight read for IO completion. We don't
need it, just wake anyone that's waiting for the IO count to drop
to zero. The caller needs to re-check that value anyway when woken,
which it does.

Fixes: 6f75723 ("dm: remove the pending IO accounting")
Acked-by: Mike Snitzer <snitzer@redhat.com>
Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Jens Axboe committed Dec 11, 2018
1 parent 4ba09f6 commit b7934ba
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions drivers/md/dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -650,14 +650,14 @@ static bool md_in_flight(struct mapped_device *md)
{
int cpu;
struct hd_struct *part = &dm_disk(md)->part0;
long sum = 0;

for_each_possible_cpu(cpu) {
if (part_stat_local_read_cpu(part, in_flight[0], cpu) ||
part_stat_local_read_cpu(part, in_flight[1], cpu))
return true;
sum += part_stat_local_read_cpu(part, in_flight[0], cpu);
sum += part_stat_local_read_cpu(part, in_flight[1], cpu);
}

return false;
return sum != 0;
}

static void start_io_acct(struct dm_io *io)
Expand Down Expand Up @@ -691,10 +691,8 @@ static void end_io_acct(struct dm_io *io)
true, duration, &io->stats_aux);

/* nudge anyone waiting on suspend queue */
if (unlikely(waitqueue_active(&md->wait))) {
if (!md_in_flight(md))
wake_up(&md->wait);
}
if (unlikely(waitqueue_active(&md->wait)))
wake_up(&md->wait);
}

/*
Expand Down

0 comments on commit b7934ba

Please sign in to comment.