From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Rostedt Subject: [RFC][PATCH v2 04/31] timers: block: Use del_timer_shutdown() before freeing timer Date: Thu, 27 Oct 2022 11:05:29 -0400 Message-ID: <20221027150925.819019339@goodmis.org> References: <20221027150525.753064657@goodmis.org> Mime-Version: 1.0 Content-Transfer-Encoding: base64 Return-path: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: drbd-dev-bounces-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org Errors-To: drbd-dev-bounces-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org Content-Type: text/plain; charset="iso-8859-1" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Jens Axboe , Stephen Boyd , Philipp Reisner , linux-block-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Tejun Heo , cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Thomas Gleixner , Linus Torvalds , Lars Ellenberg , Guenter Roeck , drbd-dev-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org RnJvbTogIlN0ZXZlbiBSb3N0ZWR0IChHb29nbGUpIiA8cm9zdGVkdEBnb29kbWlzLm9yZz4KCkJl Zm9yZSBhIHRpbWVyIGlzIGZyZWVkLCBkZWxfdGltZXJfc2h1dGRvd24oKSBtdXN0IGJlIGNhbGxl ZC4KCkxpbms6IGh0dHBzOi8vbG9yZS5rZXJuZWwub3JnL2FsbC8yMDIyMDQwNzE2MTc0NS43ZDY3 NTRiM0BnYW5kYWxmLmxvY2FsLmhvbWUvCgpDYzogUGhpbGlwcCBSZWlzbmVyIDxwaGlsaXBwLnJl aXNuZXJAbGluYml0LmNvbT4KQ2M6IExhcnMgRWxsZW5iZXJnIDxsYXJzLmVsbGVuYmVyZ0BsaW5i aXQuY29tPgpDYzogIkNocmlzdG9waCBCw7ZobXdhbGRlciIgPGNocmlzdG9waC5ib2VobXdhbGRl ckBsaW5iaXQuY29tPgpDYzogSmVucyBBeGJvZSA8YXhib2VAa2VybmVsLmRrPgpDYzogZHJiZC1k ZXZAbGlzdHMubGluYml0LmNvbQpDYzogVGVqdW4gSGVvIDx0akBrZXJuZWwub3JnPgpDYzogY2dy b3Vwc0B2Z2VyLmtlcm5lbC5vcmcKQ2M6IGxpbnV4LWJsb2NrQHZnZXIua2VybmVsLm9yZwpTaWdu ZWQtb2ZmLWJ5OiBTdGV2ZW4gUm9zdGVkdCAoR29vZ2xlKSA8cm9zdGVkdEBnb29kbWlzLm9yZz4K LS0tCiBibG9jay9ibGstaW9jb3N0LmMgICAgICAgICAgICAgfCAyICstCiBibG9jay9ibGstaW9s YXRlbmN5LmMgICAgICAgICAgfCAyICstCiBibG9jay9ibGstc3RhdC5jICAgICAgICAgICAgICAg fCAyICstCiBibG9jay9ibGstdGhyb3R0bGUuYyAgICAgICAgICAgfCAyICstCiBibG9jay9reWJl ci1pb3NjaGVkLmMgICAgICAgICAgfCAyICstCiBkcml2ZXJzL2Jsb2NrL2RyYmQvZHJiZF9tYWlu LmMgfCAyICstCiBkcml2ZXJzL2Jsb2NrL2xvb3AuYyAgICAgICAgICAgfCAyICstCiBkcml2ZXJz L2Jsb2NrL3N1bnZkYy5jICAgICAgICAgfCAyICstCiA4IGZpbGVzIGNoYW5nZWQsIDggaW5zZXJ0 aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ibG9jay9ibGstaW9jb3N0LmMg Yi9ibG9jay9ibGstaW9jb3N0LmMKaW5kZXggNDk1Mzk2NDI1YmFkLi5lMmQ0YmRkM2QxMzUgMTAw NjQ0Ci0tLSBhL2Jsb2NrL2Jsay1pb2Nvc3QuYworKysgYi9ibG9jay9ibGstaW9jb3N0LmMKQEAg LTI4MTQsNyArMjgxNCw3IEBAIHN0YXRpYyB2b2lkIGlvY19ycW9zX2V4aXQoc3RydWN0IHJxX3Fv cyAqcnFvcykKIAlpb2MtPnJ1bm5pbmcgPSBJT0NfU1RPUDsKIAlzcGluX3VubG9ja19pcnEoJmlv Yy0+bG9jayk7CiAKLQlkZWxfdGltZXJfc3luYygmaW9jLT50aW1lcik7CisJZGVsX3RpbWVyX3No dXRkb3duKCZpb2MtPnRpbWVyKTsKIAlmcmVlX3BlcmNwdShpb2MtPnBjcHVfc3RhdCk7CiAJa2Zy ZWUoaW9jKTsKIH0KZGlmZiAtLWdpdCBhL2Jsb2NrL2Jsay1pb2xhdGVuY3kuYyBiL2Jsb2NrL2Js ay1pb2xhdGVuY3kuYwppbmRleCA1NzFmYTk1YWFmZTkuLjdiNjFmMDlhZmVkZCAxMDA2NDQKLS0t IGEvYmxvY2svYmxrLWlvbGF0ZW5jeS5jCisrKyBiL2Jsb2NrL2Jsay1pb2xhdGVuY3kuYwpAQCAt NjQ1LDcgKzY0NSw3IEBAIHN0YXRpYyB2b2lkIGJsa2NnX2lvbGF0ZW5jeV9leGl0KHN0cnVjdCBy cV9xb3MgKnJxb3MpCiB7CiAJc3RydWN0IGJsa19pb2xhdGVuY3kgKmJsa2lvbGF0ID0gQkxLSU9M QVRFTkNZKHJxb3MpOwogCi0JZGVsX3RpbWVyX3N5bmMoJmJsa2lvbGF0LT50aW1lcik7CisJZGVs X3RpbWVyX3NodXRkb3duKCZibGtpb2xhdC0+dGltZXIpOwogCWZsdXNoX3dvcmsoJmJsa2lvbGF0 LT5lbmFibGVfd29yayk7CiAJYmxrY2dfZGVhY3RpdmF0ZV9wb2xpY3kocnFvcy0+cSwgJmJsa2Nn X3BvbGljeV9pb2xhdGVuY3kpOwogCWtmcmVlKGJsa2lvbGF0KTsKZGlmZiAtLWdpdCBhL2Jsb2Nr L2Jsay1zdGF0LmMgYi9ibG9jay9ibGstc3RhdC5jCmluZGV4IDJlYTAxYjVjMWFjYS4uZGU1MWRi MzAyYzQ0IDEwMDY0NAotLS0gYS9ibG9jay9ibGstc3RhdC5jCisrKyBiL2Jsb2NrL2Jsay1zdGF0 LmMKQEAgLTE2NSw3ICsxNjUsNyBAQCB2b2lkIGJsa19zdGF0X3JlbW92ZV9jYWxsYmFjayhzdHJ1 Y3QgcmVxdWVzdF9xdWV1ZSAqcSwKIAkJYmxrX3F1ZXVlX2ZsYWdfY2xlYXIoUVVFVUVfRkxBR19T VEFUUywgcSk7CiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmcS0+c3RhdHMtPmxvY2ssIGZsYWdz KTsKIAotCWRlbF90aW1lcl9zeW5jKCZjYi0+dGltZXIpOworCWRlbF90aW1lcl9zaHV0ZG93bigm Y2ItPnRpbWVyKTsKIH0KIAogc3RhdGljIHZvaWQgYmxrX3N0YXRfZnJlZV9jYWxsYmFja19yY3Uo c3RydWN0IHJjdV9oZWFkICpoZWFkKQpkaWZmIC0tZ2l0IGEvYmxvY2svYmxrLXRocm90dGxlLmMg Yi9ibG9jay9ibGstdGhyb3R0bGUuYwppbmRleCA4NDc3MjFkYzJiMmIuLjk1YWY5OWYyNDEzNyAx MDA2NDQKLS0tIGEvYmxvY2svYmxrLXRocm90dGxlLmMKKysrIGIvYmxvY2svYmxrLXRocm90dGxl LmMKQEAgLTQ5MCw3ICs0OTAsNyBAQCBzdGF0aWMgdm9pZCB0aHJvdGxfcGRfZnJlZShzdHJ1Y3Qg YmxrZ19wb2xpY3lfZGF0YSAqcGQpCiB7CiAJc3RydWN0IHRocm90bF9ncnAgKnRnID0gcGRfdG9f dGcocGQpOwogCi0JZGVsX3RpbWVyX3N5bmMoJnRnLT5zZXJ2aWNlX3F1ZXVlLnBlbmRpbmdfdGlt ZXIpOworCWRlbF90aW1lcl9zaHV0ZG93bigmdGctPnNlcnZpY2VfcXVldWUucGVuZGluZ190aW1l cik7CiAJYmxrZ19yd3N0YXRfZXhpdCgmdGctPnN0YXRfYnl0ZXMpOwogCWJsa2dfcndzdGF0X2V4 aXQoJnRnLT5zdGF0X2lvcyk7CiAJa2ZyZWUodGcpOwpkaWZmIC0tZ2l0IGEvYmxvY2sva3liZXIt aW9zY2hlZC5jIGIvYmxvY2sva3liZXItaW9zY2hlZC5jCmluZGV4IGIwNTM1N2JjZWQ5OS4uNTlh NDQ0YTQ3YmEzIDEwMDY0NAotLS0gYS9ibG9jay9reWJlci1pb3NjaGVkLmMKKysrIGIvYmxvY2sv a3liZXItaW9zY2hlZC5jCkBAIC00MzQsNyArNDM0LDcgQEAgc3RhdGljIHZvaWQga3liZXJfZXhp dF9zY2hlZChzdHJ1Y3QgZWxldmF0b3JfcXVldWUgKmUpCiAJc3RydWN0IGt5YmVyX3F1ZXVlX2Rh dGEgKmtxZCA9IGUtPmVsZXZhdG9yX2RhdGE7CiAJaW50IGk7CiAKLQlkZWxfdGltZXJfc3luYygm a3FkLT50aW1lcik7CisJZGVsX3RpbWVyX3NodXRkb3duKCZrcWQtPnRpbWVyKTsKIAlibGtfc3Rh dF9kaXNhYmxlX2FjY291bnRpbmcoa3FkLT5xKTsKIAogCWZvciAoaSA9IDA7IGkgPCBLWUJFUl9O VU1fRE9NQUlOUzsgaSsrKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ibG9jay9kcmJkL2RyYmRfbWFp bi5jIGIvZHJpdmVycy9ibG9jay9kcmJkL2RyYmRfbWFpbi5jCmluZGV4IGYzZTRkYjE2ZmQwNy4u M2Y1NzRmMzc2OWMzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2Jsb2NrL2RyYmQvZHJiZF9tYWluLmMK KysrIGIvZHJpdmVycy9ibG9jay9kcmJkL2RyYmRfbWFpbi5jCkBAIC0yMTg0LDcgKzIxODQsNyBA QCB2b2lkIGRyYmRfZGVzdHJveV9kZXZpY2Uoc3RydWN0IGtyZWYgKmtyZWYpCiAJc3RydWN0IGRy YmRfcmVzb3VyY2UgKnJlc291cmNlID0gZGV2aWNlLT5yZXNvdXJjZTsKIAlzdHJ1Y3QgZHJiZF9w ZWVyX2RldmljZSAqcGVlcl9kZXZpY2UsICp0bXBfcGVlcl9kZXZpY2U7CiAKLQlkZWxfdGltZXJf c3luYygmZGV2aWNlLT5yZXF1ZXN0X3RpbWVyKTsKKwlkZWxfdGltZXJfc2h1dGRvd24oJmRldmlj ZS0+cmVxdWVzdF90aW1lcik7CiAKIAkvKiBwYXJhbm9pYSBhc3NlcnRzICovCiAJRF9BU1NFUlQo ZGV2aWNlLCBkZXZpY2UtPm9wZW5fY250ID09IDApOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ibG9j ay9sb29wLmMgYi9kcml2ZXJzL2Jsb2NrL2xvb3AuYwppbmRleCBhZDkyMTkyYzdkNjEuLmQxMzRh NWZkNGFlNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ibG9jay9sb29wLmMKKysrIGIvZHJpdmVycy9i bG9jay9sb29wLmMKQEAgLTE3NTUsNyArMTc1NSw3IEBAIHN0YXRpYyB2b2lkIGxvX2ZyZWVfZGlz ayhzdHJ1Y3QgZ2VuZGlzayAqZGlzaykKIAlpZiAobG8tPndvcmtxdWV1ZSkKIAkJZGVzdHJveV93 b3JrcXVldWUobG8tPndvcmtxdWV1ZSk7CiAJbG9vcF9mcmVlX2lkbGVfd29ya2VycyhsbywgdHJ1 ZSk7Ci0JZGVsX3RpbWVyX3N5bmMoJmxvLT50aW1lcik7CisJZGVsX3RpbWVyX3NodXRkb3duKCZs by0+dGltZXIpOwogCW11dGV4X2Rlc3Ryb3koJmxvLT5sb19tdXRleCk7CiAJa2ZyZWUobG8pOwog fQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ibG9jay9zdW52ZGMuYyBiL2RyaXZlcnMvYmxvY2svc3Vu dmRjLmMKaW5kZXggZmI4NTVkYTk3MWVlLi45ODY4OTM3YTk2MDIgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvYmxvY2svc3VudmRjLmMKKysrIGIvZHJpdmVycy9ibG9jay9zdW52ZGMuYwpAQCAtMTA2Nyw3 ICsxMDY3LDcgQEAgc3RhdGljIHZvaWQgdmRjX3BvcnRfcmVtb3ZlKHN0cnVjdCB2aW9fZGV2ICp2 ZGV2KQogCiAJCWZsdXNoX3dvcmsoJnBvcnQtPmxkY19yZXNldF93b3JrKTsKIAkJY2FuY2VsX2Rl bGF5ZWRfd29ya19zeW5jKCZwb3J0LT5sZGNfcmVzZXRfdGltZXJfd29yayk7Ci0JCWRlbF90aW1l cl9zeW5jKCZwb3J0LT52aW8udGltZXIpOworCQlkZWxfdGltZXJfc2h1dGRvd24oJnBvcnQtPnZp by50aW1lcik7CiAKIAkJZGVsX2dlbmRpc2socG9ydC0+ZGlzayk7CiAJCXB1dF9kaXNrKHBvcnQt PmRpc2spOwotLSAKMi4zNS4xCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyYmQtZGV2IG1haWxpbmcgbGlzdApkcmJkLWRldkBsaXN0cy5saW5iaXQuY29t Cmh0dHBzOi8vbGlzdHMubGluYml0LmNvbS9tYWlsbWFuL2xpc3RpbmZvL2RyYmQtZGV2Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mail19.linbit.com (LINBIT Mail Daemon) with ESMTP id 5B4204203C5 for ; Thu, 27 Oct 2022 17:17:54 +0200 (CEST) Message-ID: <20221027150925.819019339@goodmis.org> Date: Thu, 27 Oct 2022 11:05:29 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org References: <20221027150525.753064657@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: Jens Axboe , Stephen Boyd , Philipp Reisner , linux-block@vger.kernel.org, Tejun Heo , cgroups@vger.kernel.org, Thomas Gleixner , Linus Torvalds , Lars Ellenberg , Guenter Roeck , drbd-dev@lists.linbit.com Subject: [Drbd-dev] [RFC][PATCH v2 04/31] timers: block: Use del_timer_shutdown() before freeing timer List-Id: "*Coordination* of development, patches, contributions -- *Questions* \(even to developers\) go to drbd-user, please." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: "Steven Rostedt (Google)" Before a timer is freed, del_timer_shutdown() must be called. Link: https://lore.kernel.org/all/20220407161745.7d6754b3@gandalf.local.home/ Cc: Philipp Reisner Cc: Lars Ellenberg Cc: "Christoph Böhmwalder" Cc: Jens Axboe Cc: drbd-dev@lists.linbit.com Cc: Tejun Heo Cc: cgroups@vger.kernel.org Cc: linux-block@vger.kernel.org Signed-off-by: Steven Rostedt (Google) --- block/blk-iocost.c | 2 +- block/blk-iolatency.c | 2 +- block/blk-stat.c | 2 +- block/blk-throttle.c | 2 +- block/kyber-iosched.c | 2 +- drivers/block/drbd/drbd_main.c | 2 +- drivers/block/loop.c | 2 +- drivers/block/sunvdc.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 495396425bad..e2d4bdd3d135 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -2814,7 +2814,7 @@ static void ioc_rqos_exit(struct rq_qos *rqos) ioc->running = IOC_STOP; spin_unlock_irq(&ioc->lock); - del_timer_sync(&ioc->timer); + del_timer_shutdown(&ioc->timer); free_percpu(ioc->pcpu_stat); kfree(ioc); } diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c index 571fa95aafe9..7b61f09afedd 100644 --- a/block/blk-iolatency.c +++ b/block/blk-iolatency.c @@ -645,7 +645,7 @@ static void blkcg_iolatency_exit(struct rq_qos *rqos) { struct blk_iolatency *blkiolat = BLKIOLATENCY(rqos); - del_timer_sync(&blkiolat->timer); + del_timer_shutdown(&blkiolat->timer); flush_work(&blkiolat->enable_work); blkcg_deactivate_policy(rqos->q, &blkcg_policy_iolatency); kfree(blkiolat); diff --git a/block/blk-stat.c b/block/blk-stat.c index 2ea01b5c1aca..de51db302c44 100644 --- a/block/blk-stat.c +++ b/block/blk-stat.c @@ -165,7 +165,7 @@ void blk_stat_remove_callback(struct request_queue *q, blk_queue_flag_clear(QUEUE_FLAG_STATS, q); spin_unlock_irqrestore(&q->stats->lock, flags); - del_timer_sync(&cb->timer); + del_timer_shutdown(&cb->timer); } static void blk_stat_free_callback_rcu(struct rcu_head *head) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 847721dc2b2b..95af99f24137 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -490,7 +490,7 @@ static void throtl_pd_free(struct blkg_policy_data *pd) { struct throtl_grp *tg = pd_to_tg(pd); - del_timer_sync(&tg->service_queue.pending_timer); + del_timer_shutdown(&tg->service_queue.pending_timer); blkg_rwstat_exit(&tg->stat_bytes); blkg_rwstat_exit(&tg->stat_ios); kfree(tg); diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c index b05357bced99..59a444a47ba3 100644 --- a/block/kyber-iosched.c +++ b/block/kyber-iosched.c @@ -434,7 +434,7 @@ static void kyber_exit_sched(struct elevator_queue *e) struct kyber_queue_data *kqd = e->elevator_data; int i; - del_timer_sync(&kqd->timer); + del_timer_shutdown(&kqd->timer); blk_stat_disable_accounting(kqd->q); for (i = 0; i < KYBER_NUM_DOMAINS; i++) diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index f3e4db16fd07..3f574f3769c3 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -2184,7 +2184,7 @@ void drbd_destroy_device(struct kref *kref) struct drbd_resource *resource = device->resource; struct drbd_peer_device *peer_device, *tmp_peer_device; - del_timer_sync(&device->request_timer); + del_timer_shutdown(&device->request_timer); /* paranoia asserts */ D_ASSERT(device, device->open_cnt == 0); diff --git a/drivers/block/loop.c b/drivers/block/loop.c index ad92192c7d61..d134a5fd4ae7 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1755,7 +1755,7 @@ static void lo_free_disk(struct gendisk *disk) if (lo->workqueue) destroy_workqueue(lo->workqueue); loop_free_idle_workers(lo, true); - del_timer_sync(&lo->timer); + del_timer_shutdown(&lo->timer); mutex_destroy(&lo->lo_mutex); kfree(lo); } diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c index fb855da971ee..9868937a9602 100644 --- a/drivers/block/sunvdc.c +++ b/drivers/block/sunvdc.c @@ -1067,7 +1067,7 @@ static void vdc_port_remove(struct vio_dev *vdev) flush_work(&port->ldc_reset_work); cancel_delayed_work_sync(&port->ldc_reset_timer_work); - del_timer_sync(&port->vio.timer); + del_timer_shutdown(&port->vio.timer); del_gendisk(port->disk); put_disk(port->disk); -- 2.35.1