From: Mike Snitzer Date: Fri, 18 Feb 2022 04:40:02 +0000 (-0500) Subject: dm: interlock pending dm_io and dm_wait_for_bios_completion X-Git-Tag: v4.9.313~1 X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=7bb369096d1711d28cda36853f8e1920bbe3e86d;p=wrapfs-4.9.y.git dm: interlock pending dm_io and dm_wait_for_bios_completion commit 9f6dc633761006f974701d4c88da71ab68670749 upstream. Commit d208b89401e0 ("dm: fix mempool NULL pointer race when completing IO") didn't go far enough. When bio_end_io_acct ends the count of in-flight I/Os may reach zero and the DM device may be suspended. There is a possibility that the suspend races with dm_stats_account_io. Fix this by adding percpu "pending_io" counters to track outstanding dm_io. Move kicking of suspend queue to dm_io_dec_pending(). Also, rename md_in_flight_bios() to dm_in_flight_bios() and update it to iterate all pending_io counters. Fixes: d208b89401e0 ("dm: fix mempool NULL pointer race when completing IO") Cc: stable@vger.kernel.org Co-developed-by: Mikulas Patocka Signed-off-by: Mikulas Patocka Signed-off-by: Mike Snitzer Signed-off-by: Mikulas Patocka Reviewed-by: Mike Snitzer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 86199d09eb06..ec6c2b566621 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2027,6 +2027,8 @@ static int dm_wait_for_completion(struct mapped_device *md, long task_state) } finish_wait(&md->wait, &wait); + smp_rmb(); /* paired with atomic_dec_return in end_io_acct */ + return r; }