Skip to content

timers: Use timer_shutdown*() before freeing timers

Steven Rostedt alsa-devel bridge cgroups drbd-dev dri-devel intel-gfx intel-wired-lan linux-acpi linux-arm-kernel linux-block linux-bluetooth linux-doc linux-edac linux-ext4 linux-input linux-leds linux-media linux-nfs linux-nilfs linux-parisc linux-pm linux-s390 linux-scsi linux-sh linux-staging linux-usb linux-wireless lkml lvs-devel netdev netfilter-devel rcu soc 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest35 of 38 patches 41 repliesIn review

35 of 38 patches are in this archive. The cover letter announces 38.

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/38SUNRPC/xprt: Use del_timer_sync() instead of del_singleshot_timer_sync()net/sunrpc/xprt.c+1 -10 replies
2/38ARM: spear: Do not use timer namespace for timer_shutdown() functionarch/arm/mach-spear/time.c+4 -43 replies
3/38clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() functiondrivers/clocksource/arm_arch_timer.c+6 -63 replies
4/38clocksource/drivers/sp804: Do not use timer namespace for timer_shutdown() functiondrivers/clocksource/timer-sp804.c+3 -31 reply
5/38timers: Add timer_shutdown_sync() and timer_shutdown() to be called before freeing timersDocumentation/RCU/Design/Requirements/Requirements.rst Documentation/core-api/local_ops.rst Documentation/kernel-hacking/locking.rst +2 more+98 -390 replies
6/38timers: sh: Use timer_shutdown_sync() before freeing timerarch/sh/drivers/push-switch.c+1 -10 replies
8/38timers: ACPI: Use timer_shutdown_sync() before freeing timerdrivers/acpi/apei/ghes.c+1 -10 replies
9/38timers: atm: Use timer_shutdown_sync() before freeing timerdrivers/atm/idt77252.c+2 -20 replies
10/38timers: Bluetooth: Use timer_shutdown_sync() before freeing timerdrivers/bluetooth/hci_bcsp.c drivers/bluetooth/hci_h5.c drivers/bluetooth/hci_qca.c+6 -410 replies
11/38timers: drm: Use timer_shutdown_sync() before freeing timerdrivers/gpu/drm/i915/i915_sw_fence.c+1 -10 replies
12/38timers: HID: Use timer_shutdown_sync() before freeing timerdrivers/hid/hid-wiimote-core.c+1 -10 replies
14/38timers: mISDN: Use timer_shutdown_sync() before freeing timerdrivers/isdn/hardware/mISDN/hfcmulti.c drivers/isdn/mISDN/l1oip_core.c drivers/isdn/mISDN/timerdev.c+5 -80 replies
15/38timers: leds: Use timer_shutdown_sync() before freeing timerdrivers/leds/trigger/ledtrig-pattern.c drivers/leds/trigger/ledtrig-transient.c+2 -20 replies
16/38timers: media: Use timer_shutdown_sync() before freeing timerdrivers/media/pci/ivtv/ivtv-driver.c drivers/media/usb/pvrusb2/pvrusb2-hdw.c drivers/media/usb/s2255/s2255drv.c +1 more+12 -120 replies
17/38timers: net: Use timer_shutdown_sync() before freeing timerdrivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/ethernet/marvell/sky2.c drivers/net/ethernet/sun/sunvnet.c +24 more+35 -330 replies
18/38timers: usb: Use timer_shutdown_sync() before freeing timerdrivers/usb/gadget/udc/m66592-udc.c drivers/usb/serial/garmin_gps.c drivers/usb/serial/mos7840.c+3 -30 replies
19/38timers: nfc: pn533: Use timer_shutdown_sync() before freeing timerdrivers/nfc/pn533/pn533.c drivers/nfc/pn533/uart.c+2 -21 reply
20/38timers: pcmcia: Use timer_shutdown_sync() before freeing timerdrivers/pcmcia/bcm63xx_pcmcia.c drivers/pcmcia/electra_cf.c drivers/pcmcia/omap_cf.c +2 more+7 -70 replies
21/38timers: scsi: Use timer_shutdown_sync() and timer_shutdown() before freeing timerdrivers/scsi/qla2xxx/qla_edif.c+2 -20 replies
22/38timers: tty: Use timer_shutdown_sync() before freeing timerdrivers/tty/n_gsm.c drivers/tty/sysrq.c+2 -20 replies
23/38timers: ext4: Use timer_shutdown_sync() before freeing timerfs/ext4/super.c+1 -10 replies
24/38timers: fs/nilfs2: Use timer_shutdown_sync() before freeing timerfs/nilfs2/segment.c+1 -10 replies
25/38timers: ALSA: Use timer_shutdown_sync() before freeing timersound/i2c/other/ak4117.c sound/synth/emux/emux.c+2 -20 replies
26/38timers: jbd2: Use timer_shutdown() before freeing timerfs/jbd2/journal.c+2 -00 replies
27/38timers: sched/psi: Use timer_shutdown_sync() before freeing timerkernel/sched/psi.c+1 -00 replies
28/38timers: workqueue: Use timer_shutdown_sync() before freeing timerkernel/workqueue.c+2 -20 replies
29/38random: use timer_shutdown_sync() for on stack timersdrivers/char/random.c+1 -10 replies
30/38timers: dma-buf: Use timer_shutdown_sync() for on stack timersdrivers/dma-buf/st-dma-fence.c+1 -11 reply
31/38timers: drm: Use timer_shutdown_sync() for on stack timersdrivers/gpu/drm/gud/gud_pipe.c+1 -11 reply
32/38timers: media: Use timer_shutdown_sync() for on stack timersdrivers/media/usb/pvrusb2/pvrusb2-hdw.c+1 -10 replies
33/38timers: s390/cmm: Use timer_shutdown_sync() before a module is releasedarch/s390/mm/cmm.c+2 -20 replies
34/38timers: atm: Use timer_shutdown_sync() before a module is releaseddrivers/atm/idt77105.c drivers/atm/iphase.c+3 -30 replies
35/38timers: hangcheck: Use timer_shutdown_sync() before a module is releaseddrivers/char/hangcheck-timer.c+2 -20 replies
36/38timers: ipmi: Use timer_shutdown_sync() before a module is releaseddrivers/char/ipmi/ipmi_msghandler.c+1 -10 replies
38/38timers: PM: Use timer_shutdown_sync()drivers/base/power/wakeup.c+1 -60 replies

Reviews trailers per patch

12 of 35 patches have a Reviewed-by or Acked-by.

PatchRyusuke KonishiJason A. DonenfeldTakashi IwaiDominik BrodowskiCorey MinyardJohannes WeinerSuren BaghdasaryanNoralf TrønnesGuenter RoeckArnd BergmannViresh KumarKrzysztof KozlowskiChristian König
SeriesT-b
1/38
2/38R-b A-b A-b
3/38R-b
4/38R-b
5/38
6/38
8/38
9/38
10/38
11/38
12/38
14/38
15/38
16/38
17/38
18/38
19/38R-b
20/38A-b
21/38
22/38
23/38
24/38A-b
25/38R-b
26/38
27/38A-b R-b
28/38
29/38A-b
30/38R-b
31/38A-b
32/38
33/38
34/38
35/38
36/38A-b
38/38

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 13 reviewers.

Read the v1 thread

Cover letter [PATCH v4a 00/38] timers: Use timer_shutdown*() before freeing timers

Back in April, I posted an RFC patch set to help mitigate a common issue where a timer gets armed just before it is freed, and when the timer goes off, it crashes in the timer code without any evidence of who the culprit was. I got side tracked and never finished up on that patch set. Since this type of crash is still our #1 crash we are seeing in the field, it has become a priority again to finish it.

The last version of that patch set is here:

https://lore.kernel.org/all/[email protected]/

I'm calling this version 4a as it only has obvious changes were the timer that is being shutdown is in the same function where it will be freed or released, as this series should be "safe" for adding. I'll be calling the other patches 4b for the next merge window.

Patch 1 fixes an issue with sunrpc/xprt where it incorrectly uses del_singleshot_timer_sync() for something that is not a oneshot timer. As this will be converted to shutdown, this needs to be fixed first.

Patches 2-4 changes existing timer_shutdown() functions used locally in ARM and some drivers to better namespace names.

Patch 5 implements the new timer_shutdown() and timer_shutdown_sync() functions that disable re-arming the timer after they are called.

Patches 6-28 change all the locations where there's a kfree(), kfree_rcu(), kmem_cache_free() and one call_rcu() call where the RCU function frees the timer (the workqueue patch) in the same function as the del_timer{,_sync}() is called on that timer, and there's no extra exit path between the del_timer and freeing of the timer.

Patches 29-32 add timer_shutdown*() on on-stack timers that are about to be released at the end of the function.

Patches 33-37 add timer_shutdown*() on module timers in the module exit code.

Patch 38 simply converts an open coded "shutdown" code into timer_shutdown(), as a way timer_shutdown() disables the timer is by setting that timer function to NULL.

Linus, I sorted the patches this way to let you see which you would think is safe to go into this -rc. I honestly believe that they are all safe, but that's just my own opinion.

This series is here:

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
timers-start

Head SHA1: f58b516a65bac76f1bfa00126856d6c6c3d24a40

Steven Rostedt (Google) (38):
SUNRPC/xprt: Use del_timer_sync() instead of del_singleshot_timer_sync()
ARM: spear: Do not use timer namespace for timer_shutdown() function clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function clocksource/drivers/sp804: Do not use timer namespace for timer_shutdown() function
timers: Add timer_shutdown_sync() and timer_shutdown() to be called before freeing timers
timers: sh: Use timer_shutdown_sync() before freeing timer
timers: block: Use timer_shutdown_sync() before freeing timer
timers: ACPI: Use timer_shutdown_sync() before freeing timer
timers: atm: Use timer_shutdown_sync() before freeing timer
timers: Bluetooth: Use timer_shutdown_sync() before freeing timer
timers: drm: Use timer_shutdown_sync() before freeing timer
timers: HID: Use timer_shutdown_sync() before freeing timer
timers: Input: Use timer_shutdown_sync() before freeing timer
timers: mISDN: Use timer_shutdown_sync() before freeing timer
timers: leds: Use timer_shutdown_sync() before freeing timer
timers: media: Use timer_shutdown_sync() before freeing timer
timers: net: Use timer_shutdown_sync() before freeing timer
timers: usb: Use timer_shutdown_sync() before freeing timer
timers: nfc: pn533: Use timer_shutdown_sync() before freeing timer
timers: pcmcia: Use timer_shutdown_sync() before freeing timer
timers: scsi: Use timer_shutdown_sync() and timer_shutdown() before freeing timer
timers: tty: Use timer_shutdown_sync() before freeing timer
timers: ext4: Use timer_shutdown_sync() before freeing timer
timers: fs/nilfs2: Use timer_shutdown_sync() before freeing timer
timers: ALSA: Use timer_shutdown_sync() before freeing timer
timers: jbd2: Use timer_shutdown() before freeing timer
timers: sched/psi: Use timer_shutdown_sync() before freeing timer
timers: workqueue: Use timer_shutdown_sync() before freeing timer
random: use timer_shutdown_sync() for on stack timers
timers: dma-buf: Use timer_shutdown_sync() for on stack timers
timers: drm: Use timer_shutdown_sync() for on stack timers
timers: media: Use timer_shutdown_sync() for on stack timers
timers: s390/cmm: Use timer_shutdown_sync() before a module is released
timers: atm: Use timer_shutdown_sync() before a module is released
timers: hangcheck: Use timer_shutdown_sync() before a module is released
timers: ipmi: Use timer_shutdown_sync() before a module is released
timers: Input: Use timer_shutdown_sync() before a module is released
timers: PM: Use timer_shutdown_sync()

----

 .../RCU/Design/Requirements/Requirements.rst       |  2 +-
 Documentation/core-api/local_ops.rst               |  2 +-
 Documentation/kernel-hacking/locking.rst           |  5 ++
 arch/arm/mach-spear/time.c                         |  8 +--
 arch/s390/mm/cmm.c                                 |  4 +-
 arch/sh/drivers/push-switch.c                      |  2 +-
 block/blk-iocost.c                                 |  2 +-
 block/blk-iolatency.c                              |  2 +-
 block/blk-throttle.c                               |  2 +-
 block/kyber-iosched.c                              |  2 +-
 drivers/acpi/apei/ghes.c                           |  2 +-
 drivers/atm/idt77105.c                             |  4 +-
 drivers/atm/idt77252.c                             |  4 +-
 drivers/atm/iphase.c                               |  2 +-
 drivers/base/power/wakeup.c                        |  7 +--
 drivers/block/drbd/drbd_main.c                     |  2 +-
 drivers/block/loop.c                               |  2 +-
 drivers/block/sunvdc.c                             |  2 +-
 drivers/bluetooth/hci_bcsp.c                       |  2 +-
 drivers/bluetooth/hci_h5.c                         |  4 +-
 drivers/bluetooth/hci_qca.c                        |  4 +-
 drivers/char/hangcheck-timer.c                     |  4 +-
 drivers/char/ipmi/ipmi_msghandler.c                |  2 +-
 drivers/char/random.c                              |  2 +-
 drivers/clocksource/arm_arch_timer.c               | 12 ++--
 drivers/clocksource/timer-sp804.c                  |  6 +-
 drivers/dma-buf/st-dma-fence.c                     |  2 +-
 drivers/gpu/drm/gud/gud_pipe.c                     |  2 +-
 drivers/gpu/drm/i915/i915_sw_fence.c               |  2 +-
 drivers/hid/hid-wiimote-core.c                     |  2 +-
 drivers/input/keyboard/locomokbd.c                 |  2 +-
 drivers/input/keyboard/omap-keypad.c               |  2 +-
 drivers/input/mouse/alps.c                         |  2 +-
 drivers/input/serio/hil_mlc.c                      |  2 +-
 drivers/isdn/hardware/mISDN/hfcmulti.c             |  5 +-
 drivers/isdn/mISDN/l1oip_core.c                    |  4 +-
 drivers/isdn/mISDN/timerdev.c                      |  4 +-
 drivers/leds/trigger/ledtrig-pattern.c             |  2 +-
 drivers/leds/trigger/ledtrig-transient.c           |  2 +-
 drivers/media/pci/ivtv/ivtv-driver.c               |  2 +-
 drivers/media/usb/pvrusb2/pvrusb2-hdw.c            | 18 +++---
 drivers/media/usb/s2255/s2255drv.c                 |  4 +-
 drivers/net/ethernet/intel/i40e/i40e_main.c        |  7 +--
 drivers/net/ethernet/marvell/sky2.c                |  2 +-
 drivers/net/ethernet/sun/sunvnet.c                 |  2 +-
 drivers/net/usb/sierra_net.c                       |  2 +-
 drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c   |  2 +-
 drivers/net/wireless/intersil/hostap/hostap_ap.c   |  2 +-
 drivers/net/wireless/marvell/mwifiex/main.c        |  2 +-
 drivers/net/wireless/microchip/wilc1000/hif.c      |  6 +-
 drivers/nfc/pn533/pn533.c                          |  2 +-
 drivers/nfc/pn533/uart.c                           |  2 +-
 drivers/pcmcia/bcm63xx_pcmcia.c                    |  2 +-
 drivers/pcmcia/electra_cf.c                        |  2 +-
 drivers/pcmcia/omap_cf.c                           |  2 +-
 drivers/pcmcia/pd6729.c                            |  4 +-
 drivers/pcmcia/yenta_socket.c                      |  4 +-
 drivers/scsi/qla2xxx/qla_edif.c                    |  4 +-
 drivers/staging/media/atomisp/i2c/atomisp-lm3554.c |  2 +-
 drivers/tty/n_gsm.c                                |  2 +-
 drivers/tty/sysrq.c                                |  2 +-
 drivers/usb/gadget/udc/m66592-udc.c                |  2 +-
 drivers/usb/serial/garmin_gps.c                    |  2 +-
 drivers/usb/serial/mos7840.c                       |  2 +-
 fs/ext4/super.c                                    |  2 +-
 fs/jbd2/journal.c                                  |  2 +
 fs/nilfs2/segment.c                                |  2 +-
 include/linux/timer.h                              | 64 +++++++++++++++++++---
 kernel/sched/psi.c                                 |  1 +
 kernel/time/timer.c                                | 64 ++++++++++++----------
 kernel/workqueue.c                                 |  4 +-
 net/802/garp.c                                     |  2 +-
 net/802/mrp.c                                      |  2 +-
 net/bridge/br_multicast.c                          |  6 +-
 net/bridge/br_multicast_eht.c                      |  4 +-
 net/core/gen_estimator.c                           |  2 +-
 net/core/neighbour.c                               |  2 +
 net/ipv4/inet_timewait_sock.c                      |  1 +
 net/ipv4/ipmr.c                                    |  2 +-
 net/ipv6/ip6mr.c                                   |  2 +-
 net/mac80211/mesh_pathtbl.c                        |  2 +-
 net/netfilter/ipset/ip_set_list_set.c              |  2 +-
 net/netfilter/ipvs/ip_vs_lblc.c                    |  2 +-
 net/netfilter/ipvs/ip_vs_lblcr.c                   |  2 +-
 net/netfilter/xt_LED.c                             |  2 +-
 net/rxrpc/conn_object.c                            |  2 +-
 net/sched/cls_flow.c                               |  2 +-
 net/sunrpc/svc.c                                   |  2 +-
 net/sunrpc/xprt.c                                  |  2 +-
 net/tipc/discover.c                                |  2 +-
 net/tipc/monitor.c                                 |  2 +-
 sound/i2c/other/ak4117.c                           |  2 +-
 sound/synth/emux/emux.c                            |  2 +-
 93 files changed, 227 insertions(+), 169 deletions(-)