timers: Use timer_shutdown*() before freeing timers
Subsystems (60)
Steven Rostedt
reviewerPATCH 1/5 ARM: spear: Do not use timer namespace for timer_shutdown() function
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
A new "shutdown" timer state is being added to the generic timer code. One of the functions to change the timer into the state is called "timer_shutdown()". This means that there can not be other functions called "timer_shutdown()" as the timer code owns the "timer_*" name space.
Rename timer_shutdown() to spear_timer_shutdown() to avoid this conflict.
--- arch/arm/mach-spear/time.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-spear/time.c +4 -4
@@ -90,7 +90,7 @@ static void __init spear_clocksource_init(void) 200, 16, clocksource_mmio_readw_up); } -static inline void timer_shutdown (struct clock_event_device *evt) +static inline void spear_timer_shutdown (struct clock_event_device *evt) {u16 val =readw (gpt_base +CR (CLKEVT ));
@@ -101,7 +101,7 @@ static inline void timer_shutdown(struct clock_event_device *evt)static int spear_shutdown (struct clock_event_device *evt) { -timer_shutdown (evt); +spear_timer_shutdown (evt);return 0 ; }
@@ -111,7 +111,7 @@ static int spear_set_oneshot(struct clock_event_device *evt)u16 val;/* stop the timer */ -timer_shutdown (evt); +spear_timer_shutdown (evt); val =readw (gpt_base +CR (CLKEVT )); val |=CTRL_ONE_SHOT ;
@@ -126,7 +126,7 @@ static int spear_set_periodic(struct clock_event_device *evt)u16 val;/* stop the timer */ -timer_shutdown (evt); +spear_timer_shutdown (evt); period =clk_get_rate (gpt_clk) /HZ ; period >>=CTRL_PRESCALER16 ;
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 2/5 clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
A new "shutdown" timer state is being added to the generic timer code. One of the functions to change the timer into the state is called "timer_shutdown()". This means that there can not be other functions called "timer_shutdown()" as the timer code owns the "timer_*" name space.
Rename timer_shutdown() to arch_timer_shutdown() to avoid this conflict.
--- drivers/clocksource/arm_arch_timer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/clocksource/arm_arch_timer.c +6 -6
@@ -687,8 +687,8 @@ static irqreturn_t arch_timer_handler_virt_mem(int irq, void *dev_id)return timer_handler (ARCH_TIMER_MEM_VIRT_ACCESS , evt); } -static __always_inline int timer_shutdown(const int access, -struct clock_event_device *clk) +static __always_inline int arch_timer_shutdown(const int access, +struct clock_event_device *clk) {unsigned long ctrl;
@@ -701,22 +701,22 @@ static __always_inline int timer_shutdown(const int access,static int arch_timer_shutdown_virt (struct clock_event_device *clk) { -return timer_shutdown (ARCH_TIMER_VIRT_ACCESS , clk); +return arch_timer_shutdown (ARCH_TIMER_VIRT_ACCESS , clk); }static int arch_timer_shutdown_phys (struct clock_event_device *clk) { -return timer_shutdown (ARCH_TIMER_PHYS_ACCESS , clk); +return arch_timer_shutdown (ARCH_TIMER_PHYS_ACCESS , clk); }static int arch_timer_shutdown_virt_mem (struct clock_event_device *clk) { -return timer_shutdown (ARCH_TIMER_MEM_VIRT_ACCESS , clk); +return arch_timer_shutdown (ARCH_TIMER_MEM_VIRT_ACCESS , clk); }static int arch_timer_shutdown_phys_mem (struct clock_event_device *clk) { -return timer_shutdown (ARCH_TIMER_MEM_PHYS_ACCESS , clk); +return arch_timer_shutdown (ARCH_TIMER_MEM_PHYS_ACCESS , clk); } static __always_inline void set_next_event(const int access, unsigned long evt,
Signature · 1 line
2.35.1
Steven Rostedt
reviewercover timers: Use timer_shutdown*() before freeing timers
del_timer_sync() is often called before the object that owns the timer is freed. But sometimes there's a race that enables the timer again before it is freed and causes a use after free when that timer triggers. This patch set adds a new "shutdown" timer state, which is set on the new timer_shutdown() API. Once a timer is in this state, it can not be re-armed and if it is, it will warn.
The first three patches change existing timer_shutdown() functions used locally in ARM and some drivers to better namespace names.
The fourth patch implements the new API.
The fifth patch is now a treewide patch that uses a coccinelle script to convert the trivial locations where a del_timer*() is called on a timer of an object that is freed immediately afterward (or at least in the same function).
Changes since v4a: https://lore.kernel.org/all/[email protected]/
- Used more consistent names to rename the generic timer_shutdown() code (Guenter Roeck, Marc Zyngier)
- Remove del_singleshot_timer_sync() change and the fix that it required.
- Improved the coccinelle script such that the fifth patch is unmodified.
Steven Rostedt (Google) (5):
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
treewide: Convert del_timer*() to timer_shutdown*()
----
.../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/sh/drivers/push-switch.c | 2 +- block/blk-iocost.c | 2 +- block/blk-iolatency.c | 2 +- block/kyber-iosched.c | 2 +- drivers/acpi/apei/ghes.c | 2 +- drivers/atm/idt77252.c | 4 +- drivers/block/drbd/drbd_main.c | 2 +- drivers/block/loop.c | 2 +- drivers/bluetooth/hci_bcsp.c | 2 +- drivers/bluetooth/hci_qca.c | 4 +- drivers/clocksource/arm_arch_timer.c | 12 ++-- drivers/clocksource/timer-sp804.c | 6 +- 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/isdn/mISDN/l1oip_core.c | 4 +- drivers/isdn/mISDN/timerdev.c | 4 +- drivers/leds/trigger/ledtrig-activity.c | 2 +- drivers/leds/trigger/ledtrig-heartbeat.c | 2 +- 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 | 16 +++--- drivers/media/usb/s2255/s2255drv.c | 4 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 6 +- 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/intel/iwlwifi/mvm/sta.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 | 4 +- fs/ext4/super.c | 2 +- fs/nilfs2/segment.c | 2 +- include/linux/timer.h | 62 +++++++++++++++++++-- kernel/time/timer.c | 64 ++++++++++++---------- net/802/garp.c | 2 +- net/802/mrp.c | 4 +- net/bridge/br_multicast.c | 8 +-- net/bridge/br_multicast_eht.c | 4 +- net/core/gen_estimator.c | 2 +- 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/tipc/discover.c | 2 +- net/tipc/monitor.c | 2 +- sound/i2c/other/ak4117.c | 2 +- sound/synth/emux/emux.c | 2 +- 76 files changed, 203 insertions(+), 144 deletions(-)
Steven Rostedt
reviewerPATCH 3/5 clocksource/drivers/sp804: Do not use timer namespace for timer_shutdown() function
From: "Steven Rostedt (Google)" <[email protected]>
A new "shutdown" timer state is being added to the generic timer code. One of the functions to change the timer into the state is called "timer_shutdown()". This means that there can not be other functions called "timer_shutdown()" as the timer code owns the "timer_*" name space.
Rename timer_shutdown() to evt_timer_shutdown() to avoid this conflict.
--- drivers/clocksource/timer-sp804.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clocksource/timer-sp804.c +3 -3
@@ -155,14 +155,14 @@ static irqreturn_t sp804_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static inline void timer_shutdown (struct clock_event_device *evt) +static inline void evt_timer_shutdown (struct clock_event_device *evt) {writel (0 , common_clkevt->ctrl); }static int sp804_shutdown (struct clock_event_device *evt) { -timer_shutdown (evt); +evt_timer_shutdown (evt);return 0 ; }
@@ -171,7 +171,7 @@ static int sp804_set_periodic(struct clock_event_device *evt)unsigned long ctrl =TIMER_CTRL_32BIT |TIMER_CTRL_IE |TIMER_CTRL_PERIODIC |TIMER_CTRL_ENABLE ; -timer_shutdown (evt); +evt_timer_shutdown (evt);writel (common_clkevt->reload, common_clkevt->load);writel (ctrl, common_clkevt->ctrl);return 0 ;
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 4/5 timers: Add timer_shutdown_sync() and timer_shutdown() to be called before freeing timers
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
We are hitting a common bug were a timer is being triggered after it is freed. This causes a corruption in the timer link list and crashes the kernel. Unfortunately it is not easy to know what timer it was that was freed. Looking at the code, it appears that there are several cases that del_timer() is used when del_timer_sync() should have been.
Add a timer_shutdown_sync() that not only does a del_timer_sync() but will mark the timer as terminated in case it gets rearmed, it will trigger a WARN_ON. The timer_shutdown_sync() is more likely to be used by developers that are about to free a timer, then using del_timer_sync() as the latter is not as obvious to being needed for freeing. Having the word "shutdown" in the name of the function will hopefully help developers know that that function needs to be called before freeing.
The added bonus is the marking of the timer as being freed such that it will trigger a warning if it gets rearmed. At least that way if the system crashes on a freed timer, at least we may see which timer it was that was freed.
There's some situations that already know that the timer is shutdown and does not need to perform the synchronization (or can not due to its context). For these locations there's timer_shutdown() that only shuts down the timer (prevents it from being rearmed) but does not add checks if the timer is currently running.
This code is taken from Thomas Gleixner's "untested" version from my original patch and modified after testing and with some other comments from Linus addressed. As well as some extra comments added.
--- .../RCU/Design/Requirements/Requirements.rst | 2 +- Documentation/core-api/local_ops.rst | 2 +- Documentation/kernel-hacking/locking.rst | 5 ++ include/linux/timer.h | 62 ++++++++++++++++-- kernel/time/timer.c | 64 ++++++++++--------- 5 files changed, 97 insertions(+), 38 deletions(-)
Documentation/RCU/Design/Requirements/Requirements.rst +1 -1
@@ -1858,7 +1858,7 @@ unloaded. After a given module has been unloaded, any attempt to call one of its functions results in a segmentation fault. The module-unload functions must therefore cancel any delayed calls to loadable-module functions, for example, any outstanding mod_timer() must be dealt -with via del_timer_sync() or similar. +with via timer_shutdown_sync(). Unfortunately, there is no way to cancel an RCU callback; once you invoke call_rcu(), the callback function is eventually going to be
Documentation/core-api/local_ops.rst +1 -1
@@ -191,7 +191,7 @@ Here is a sample module which implements a basic per cpu counter using static void __exit test_exit(void) { - del_timer_sync(&test_timer); + timer_shutdown_sync(&test_timer); } module_init(test_init);
Documentation/kernel-hacking/locking.rst +5 -0
@@ -1009,6 +1009,11 @@ use del_timer_sync() (``include/linux/timer.h``) to handle this case. It returns the number of times the timer had to be deleted before we finally stopped it from adding itself back in. +Before freeing a timer, timer_shutdown() or timer_shutdown_sync() should be +called which will keep it from being rearmed, although if it is rearmed, it +will produce a warning. + + Locking Speed =============
include/linux/timer.h +56 -6
80 lines not on this page · raw message
kernel/time/timer.c +34 -30
137 lines not on this page · raw message
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 5/5 treewide: Convert del_timer*() to timer_shutdown*()
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Due to several bugs caused by timers being re-armed after they are shutdown and just before they are freed, a new state of timers was added called "shutdown". After a timer is set to this state, then it can no longer be re-armed, and will trigger a warning if it is.
The following script was run to find all the trivial locations where del_timer() or del_timer_sync() is called in the same function that the object holding the timer is freed. It also ignores any locations where the timer->function is modified between the del_timer*() and the free(), as that is not considered a "trivial" case.
The coccinelle script:
@@
expression E;
identifier ptr, timer, rfield, slab;
@@
(
- del_timer(&ptr->timer);
+ timer_shutdown(&ptr->timer);
|
- del_timer_sync(&ptr->timer);
+ timer_shutdown_sync(&ptr->timer);
)
... when strict
when != ptr->timer.function = E; ( kfree_rcu(ptr, rfield); | kmem_cache_free(slab, ptr); | kfree(ptr);
)
--- arch/sh/drivers/push-switch.c | 2 +- block/blk-iocost.c | 2 +- block/blk-iolatency.c | 2 +- block/kyber-iosched.c | 2 +- drivers/acpi/apei/ghes.c | 2 +- drivers/atm/idt77252.c | 4 ++-- drivers/block/drbd/drbd_main.c | 2 +- drivers/block/loop.c | 2 +- drivers/bluetooth/hci_bcsp.c | 2 +- drivers/bluetooth/hci_qca.c | 4 ++-- 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/isdn/mISDN/l1oip_core.c | 4 ++-- drivers/isdn/mISDN/timerdev.c | 4 ++-- drivers/leds/trigger/ledtrig-activity.c | 2 +- drivers/leds/trigger/ledtrig-heartbeat.c | 2 +- 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 | 16 ++++++++-------- drivers/media/usb/s2255/s2255drv.c | 4 ++-- drivers/net/ethernet/intel/i40e/i40e_main.c | 6 +++--- 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/intel/iwlwifi/mvm/sta.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 ++-- .../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 | 4 ++-- fs/ext4/super.c | 2 +- fs/nilfs2/segment.c | 2 +- net/802/garp.c | 2 +- net/802/mrp.c | 4 ++-- net/bridge/br_multicast.c | 8 ++++---- net/bridge/br_multicast_eht.c | 4 ++-- net/core/gen_estimator.c | 2 +- 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/tipc/discover.c | 2 +- net/tipc/monitor.c | 2 +- sound/i2c/other/ak4117.c | 2 +- sound/synth/emux/emux.c | 2 +- 68 files changed, 93 insertions(+), 93 deletions(-)
arch/sh/drivers/push-switch.c +1 -1
@@ -102,7 +102,7 @@ static int switch_drv_remove(struct platform_device *pdev)platform_set_drvdata (pdev,NULL );flush_work (&psw->work); -del_timer_sync (&psw->debounce); +timer_shutdown_sync (&psw->debounce);free_irq (irq, pdev);kfree (psw);
block/blk-iocost.c +1 -1
@@ -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); +timer_shutdown_sync (&ioc->timer);free_percpu (ioc->pcpu_stat);kfree (ioc); }
block/blk-iolatency.c +1 -1
@@ -645,7 +645,7 @@ static void blkcg_iolatency_exit(struct rq_qos *rqos) {struct blk_iolatency *blkiolat =BLKIOLATENCY (rqos); -del_timer_sync (&blkiolat->timer); +timer_shutdown_sync (&blkiolat->timer);flush_work (&blkiolat->enable_work);blkcg_deactivate_policy (rqos->q, &blkcg_policy_iolatency);kfree (blkiolat);
block/kyber-iosched.c +1 -1
@@ -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); +timer_shutdown_sync (&kqd->timer);blk_stat_disable_accounting (kqd->q);for (i =0 ; i <KYBER_NUM_DOMAINS ; i++)
drivers/acpi/apei/ghes.c +1 -1
@@ -1405,7 +1405,7 @@ static int ghes_remove(struct platform_device *ghes_dev) ghes->flags |=GHES_EXITING ;switch (generic->notify.type) {case ACPI_HEST_NOTIFY_POLLED : -del_timer_sync (&ghes->timer); +timer_shutdown_sync (&ghes->timer);break ;case ACPI_HEST_NOTIFY_EXTERNAL :free_irq (ghes->irq, ghes);
drivers/atm/idt77252.c +2 -2
@@ -2213,7 +2213,7 @@ idt77252_init_ubr(struct idt77252_dev *card, struct vc_map *vc, }spin_unlock_irqrestore (&vc->lock, flags);if (est) { -del_timer_sync (&est->timer); +timer_shutdown_sync (&est->timer);kfree (est); }
@@ -3752,7 +3752,7 @@ static void __exit idt77252_exit(void) card = idt77252_chain; dev = card->atmdev; idt77252_chain = card->next; -del_timer_sync (&card->tst_timer); +timer_shutdown_sync (&card->tst_timer);if (dev->phy->stop) dev->phy->stop (dev);
drivers/block/drbd/drbd_main.c +1 -1
@@ -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); +timer_shutdown_sync (&device->request_timer);/* paranoia asserts */ D_ASSERT (device, device->open_cnt ==0 );
drivers/block/loop.c +1 -1
@@ -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); +timer_shutdown_sync (&lo->timer);mutex_destroy (&lo->lo_mutex);kfree (lo); }
drivers/bluetooth/hci_bcsp.c +1 -1
@@ -737,7 +737,7 @@ static int bcsp_close(struct hci_uart *hu) {struct bcsp_struct *bcsp = hu->priv; -del_timer_sync (&bcsp->tbcsp); +timer_shutdown_sync (&bcsp->tbcsp); hu->priv =NULL ;
drivers/bluetooth/hci_qca.c +2 -2
@@ -697,8 +697,8 @@ static int qca_close(struct hci_uart *hu)skb_queue_purge (&qca->txq);skb_queue_purge (&qca->rx_memdump_q);destroy_workqueue (qca->workqueue); -del_timer_sync (&qca->tx_idle_timer); -del_timer_sync (&qca->wake_retrans_timer); +timer_shutdown_sync (&qca->tx_idle_timer); +timer_shutdown_sync (&qca->wake_retrans_timer); qca->hu =NULL ;kfree_skb (qca->rx_skb);
drivers/gpu/drm/i915/i915_sw_fence.c +1 -1
@@ -465,7 +465,7 @@ static void irq_i915_sw_fence_work(struct irq_work *wrk)struct i915_sw_dma_fence_cb_timer *cb =container_of (wrk,typeof (*cb), work); -del_timer_sync (&cb->timer); +timer_shutdown_sync (&cb->timer);dma_fence_put (cb->dma);kfree_rcu (cb, rcu);
drivers/hid/hid-wiimote-core.c +1 -1
@@ -1764,7 +1764,7 @@ static void wiimote_destroy(struct wiimote_data *wdata)spin_unlock_irqrestore (&wdata->state.lock, flags);cancel_work_sync (&wdata->init_worker); -del_timer_sync (&wdata->timer); +timer_shutdown_sync (&wdata->timer);device_remove_file (&wdata->hdev->dev, &dev_attr_devtype);device_remove_file (&wdata->hdev->dev, &dev_attr_extension);
drivers/input/keyboard/locomokbd.c +1 -1
@@ -310,7 +310,7 @@ static void locomokbd_remove(struct locomo_dev *dev)free_irq (dev->irq[0 ], locomokbd); -del_timer_sync (&locomokbd->timer); +timer_shutdown_sync (&locomokbd->timer);input_unregister_device (locomokbd->input);locomo_set_drvdata (dev,NULL );
drivers/input/keyboard/omap-keypad.c +1 -1
@@ -296,7 +296,7 @@ static int omap_kp_remove(struct platform_device *pdev)omap_writew (1 ,OMAP1_MPUIO_BASE +OMAP_MPUIO_KBD_MASKIT );free_irq (omap_kp->irq, omap_kp); -del_timer_sync (&omap_kp->timer); +timer_shutdown_sync (&omap_kp->timer);tasklet_kill (&kp_tasklet);/* unregister everything */
drivers/input/mouse/alps.c +1 -1
@@ -2970,7 +2970,7 @@ static void alps_disconnect(struct psmouse *psmouse)struct alps_data *priv = psmouse->private;psmouse_reset (psmouse); -del_timer_sync (&priv->timer); +timer_shutdown_sync (&priv->timer);if (priv->dev2)input_unregister_device (priv->dev2);if (!IS_ERR_OR_NULL (priv->dev3))
drivers/isdn/mISDN/l1oip_core.c +2 -2
@@ -1236,8 +1236,8 @@ release_card(struct l1oip *hc) hc->shutdown = true; -del_timer_sync (&hc->keep_tl); -del_timer_sync (&hc->timeout_tl); +timer_shutdown_sync (&hc->keep_tl); +timer_shutdown_sync (&hc->timeout_tl);cancel_work_sync (&hc->workq);
drivers/isdn/mISDN/timerdev.c +2 -2
@@ -74,7 +74,7 @@ mISDN_close(struct inode *ino, struct file *filep)while (!list_empty (list)) { timer = list_first_entry(list, struct mISDNtimer, list);spin_unlock_irq (&dev->lock); -del_timer_sync (&timer->tl); +timer_shutdown_sync (&timer->tl);spin_lock_irq (&dev->lock);/* it might have been moved to ->expired */ list_del (&timer->list);
@@ -204,7 +204,7 @@ misdn_del_timer(struct mISDNtimerdev *dev, int id)list_del_init (&timer->list); timer->id =-1 ;spin_unlock_irq (&dev->lock); -del_timer_sync (&timer->tl); +timer_shutdown_sync (&timer->tl);kfree (timer);return id; }
drivers/leds/trigger/ledtrig-activity.c +1 -1
@@ -208,7 +208,7 @@ static void activity_deactivate(struct led_classdev *led_cdev) {struct activity_data *activity_data =led_get_trigger_data (led_cdev); -del_timer_sync (&activity_data->timer); +timer_shutdown_sync (&activity_data->timer);kfree (activity_data);clear_bit (LED_BLINK_SW , &led_cdev->work_flags); }
drivers/leds/trigger/ledtrig-heartbeat.c +1 -1
@@ -151,7 +151,7 @@ static void heartbeat_trig_deactivate(struct led_classdev *led_cdev)struct heartbeat_trig_data *heartbeat_data =led_get_trigger_data (led_cdev); -del_timer_sync (&heartbeat_data->timer); +timer_shutdown_sync (&heartbeat_data->timer);kfree (heartbeat_data);clear_bit (LED_BLINK_SW , &led_cdev->work_flags); }
drivers/leds/trigger/ledtrig-pattern.c +1 -1
@@ -430,7 +430,7 @@ static void pattern_trig_deactivate(struct led_classdev *led_cdev)if (led_cdev->pattern_clear) led_cdev->pattern_clear (led_cdev); -del_timer_sync (&data->timer); +timer_shutdown_sync (&data->timer);led_set_brightness (led_cdev,LED_OFF );kfree (data);
drivers/leds/trigger/ledtrig-transient.c +1 -1
@@ -180,7 +180,7 @@ static void transient_trig_deactivate(struct led_classdev *led_cdev) {struct transient_trig_data *transient_data =led_get_trigger_data (led_cdev); -del_timer_sync (&transient_data->timer); +timer_shutdown_sync (&transient_data->timer);led_set_brightness_nosleep (led_cdev, transient_data->restore_state);kfree (transient_data); }
drivers/media/pci/ivtv/ivtv-driver.c +1 -1
@@ -1425,7 +1425,7 @@ static void ivtv_remove(struct pci_dev *pdev)/* Interrupts */ ivtv_set_irq_mask (itv,0xffffffff ); -del_timer_sync (&itv->dma_timer); +timer_shutdown_sync (&itv->dma_timer);/* Kill irq worker */ kthread_flush_worker (&itv->irq_worker);
drivers/media/usb/pvrusb2/pvrusb2-hdw.c +8 -8
@@ -2605,10 +2605,10 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,return hdw; fail:if (hdw) { -del_timer_sync (&hdw->quiescent_timer); -del_timer_sync (&hdw->decoder_stabilization_timer); -del_timer_sync (&hdw->encoder_run_timer); -del_timer_sync (&hdw->encoder_wait_timer); +timer_shutdown_sync (&hdw->quiescent_timer); +timer_shutdown_sync (&hdw->decoder_stabilization_timer); +timer_shutdown_sync (&hdw->encoder_run_timer); +timer_shutdown_sync (&hdw->encoder_wait_timer);flush_work (&hdw->workpoll);v4l2_device_unregister (&hdw->v4l2_dev);usb_free_urb (hdw->ctl_read_urb);
@@ -2668,10 +2668,10 @@ void pvr2_hdw_destroy(struct pvr2_hdw *hdw)if (!hdw)return ;pvr2_trace (PVR2_TRACE_INIT ,"pvr2_hdw_destroy: hdw=%p" ,hdw);flush_work (&hdw->workpoll); -del_timer_sync (&hdw->quiescent_timer); -del_timer_sync (&hdw->decoder_stabilization_timer); -del_timer_sync (&hdw->encoder_run_timer); -del_timer_sync (&hdw->encoder_wait_timer); +timer_shutdown_sync (&hdw->quiescent_timer); +timer_shutdown_sync (&hdw->decoder_stabilization_timer); +timer_shutdown_sync (&hdw->encoder_run_timer); +timer_shutdown_sync (&hdw->encoder_wait_timer);if (hdw->fw_buffer) {kfree (hdw->fw_buffer); hdw->fw_buffer =NULL ;
drivers/media/usb/s2255/s2255drv.c +2 -2
@@ -1487,7 +1487,7 @@ static void s2255_destroy(struct s2255_dev *dev)/* board shutdown stops the read pipe if it is running */ s2255_board_shutdown (dev);/* make sure firmware still not trying to load */ -del_timer_sync (&dev->timer);/* only started in .probe and .open */ +timer_shutdown_sync (&dev->timer);/* only started in .probe and .open */ if (dev->fw_data->fw_urb) {usb_kill_urb (dev->fw_data->fw_urb);usb_free_urb (dev->fw_data->fw_urb);
@@ -2322,7 +2322,7 @@ static int s2255_probe(struct usb_interface *interface, errorFWDATA2:usb_free_urb (dev->fw_data->fw_urb); errorFWURB: -del_timer_sync (&dev->timer); +timer_shutdown_sync (&dev->timer); errorEP:usb_put_dev (dev->udev); errorUDEV:
drivers/net/ethernet/intel/i40e/i40e_main.c +3 -3
@@ -15530,7 +15530,7 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw) err_switch_setup:i40e_reset_interrupt_capability (pf); -del_timer_sync (&pf->service_timer); +timer_shutdown_sync (&pf->service_timer);i40e_shutdown_adminq (hw);iounmap (hw->hw_addr);pci_disable_pcie_error_reporting (pf->pdev);
@@ -16149,7 +16149,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)kfree (pf->vsi); err_switch_setup:i40e_reset_interrupt_capability (pf); -del_timer_sync (&pf->service_timer); +timer_shutdown_sync (&pf->service_timer); err_mac_addr: err_configure_lan_hmc: (void )i40e_shutdown_lan_hmc (hw);
@@ -16211,7 +16211,7 @@ static void i40e_remove(struct pci_dev *pdev)set_bit (__I40E_SUSPENDED, pf->state);set_bit (__I40E_DOWN, pf->state);if (pf->service_timer.function) -del_timer_sync (&pf->service_timer); +timer_shutdown_sync (&pf->service_timer);if (pf->service_task.func)cancel_work_sync (&pf->service_task);
drivers/net/ethernet/marvell/sky2.c +1 -1
@@ -5013,7 +5013,7 @@ static void sky2_remove(struct pci_dev *pdev)if (!hw)return ; -del_timer_sync (&hw->watchdog_timer); +timer_shutdown_sync (&hw->watchdog_timer);cancel_work_sync (&hw->restart_work);for (i = hw->ports-1 ; i >=0 ; --i)
drivers/net/ethernet/sun/sunvnet.c +1 -1
@@ -524,7 +524,7 @@ static void vnet_port_remove(struct vio_dev *vdev)hlist_del_rcu (&port->hash);synchronize_rcu (); -del_timer_sync (&port->clean_timer); +timer_shutdown_sync (&port->clean_timer);sunvnet_port_rm_txq_common (port);netif_napi_del (&port->napi);sunvnet_port_free_tx_bufs_common (port);
drivers/net/usb/sierra_net.c +1 -1
@@ -759,7 +759,7 @@ static void sierra_net_unbind(struct usbnet *dev, struct usb_interface *intf)dev_dbg (&dev->udev->dev,"%s" , __func__);/* kill the timer and work */ -del_timer_sync (&priv->sync_timer); +timer_shutdown_sync (&priv->sync_timer);cancel_work_sync (&priv->sierra_net_kevent);/* tell modem we are going away */
drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +1 -1
@@ -371,7 +371,7 @@ void iwl_dbg_tlv_del_timers(struct iwl_trans *trans)struct iwl_dbg_tlv_timer_node *node, *tmp;list_for_each_entry_safe (node, tmp, timer_list, list) { -del_timer_sync (&node->timer); +timer_shutdown_sync (&node->timer);list_del (&node->list);kfree (node); }
drivers/net/wireless/intel/iwlwifi/mvm/sta.c +1 -1
@@ -2826,7 +2826,7 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,/* synchronize all rx queues so we can safely delete */ iwl_mvm_free_reorder (mvm, baid_data); -del_timer_sync (&baid_data->session_timer); +timer_shutdown_sync (&baid_data->session_timer);RCU_INIT_POINTER (mvm->baid_map[baid],NULL );kfree_rcu (baid_data, rcu_head);IWL_DEBUG_HT (mvm,"BAID %d is free\n" , baid);
drivers/net/wireless/intersil/hostap/hostap_ap.c +1 -1
@@ -135,7 +135,7 @@ static void ap_free_sta(struct ap_data *ap, struct sta_info *sta)if (!sta->ap)kfree (sta->u.sta.challenge); -del_timer_sync (&sta->timer); +timer_shutdown_sync (&sta->timer);#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ kfree (sta);
drivers/net/wireless/marvell/mwifiex/main.c +1 -1
@@ -123,7 +123,7 @@ static int mwifiex_unregister(struct mwifiex_adapter *adapter)if (adapter->if_ops.cleanup_if) adapter->if_ops.cleanup_if (adapter); -del_timer_sync (&adapter->cmd_timer); +timer_shutdown_sync (&adapter->cmd_timer);/* Free private structures */ for (i =0 ; i < adapter->priv_num; i++) {
drivers/net/wireless/microchip/wilc1000/hif.c +3 -3
@@ -1520,10 +1520,10 @@ int wilc_deinit(struct wilc_vif *vif)mutex_lock (&vif->wilc->deinit_lock); -del_timer_sync (&hif_drv->scan_timer); -del_timer_sync (&hif_drv->connect_timer); +timer_shutdown_sync (&hif_drv->scan_timer); +timer_shutdown_sync (&hif_drv->connect_timer);del_timer_sync (&vif->periodic_rssi); -del_timer_sync (&hif_drv->remain_on_ch_timer); +timer_shutdown_sync (&hif_drv->remain_on_ch_timer);if (hif_drv->usr_scan_req.scan_result) { hif_drv->usr_scan_req.scan_result(SCAN_EVENT_ABORTED, NULL,
drivers/nfc/pn533/pn533.c +1 -1
@@ -2788,7 +2788,7 @@ void pn53x_common_clean(struct pn533 *priv)struct pn533_cmd *cmd, *n;/* delete the timer before cleanup the worker */ -del_timer_sync (&priv->listen_timer); +timer_shutdown_sync (&priv->listen_timer);flush_delayed_work (&priv->poll_work);destroy_workqueue (priv->wq);
drivers/nfc/pn533/uart.c +1 -1
@@ -310,7 +310,7 @@ static void pn532_uart_remove(struct serdev_device *serdev)pn53x_unregister_nfc (pn532->priv);serdev_device_close (serdev);pn53x_common_clean (pn532->priv); -del_timer_sync (&pn532->cmd_timeout); +timer_shutdown_sync (&pn532->cmd_timeout);kfree_skb (pn532->recv_skb);kfree (pn532); }
drivers/pcmcia/bcm63xx_pcmcia.c +1 -1
@@ -443,7 +443,7 @@ static int bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)struct resource *res; skt =platform_get_drvdata (pdev); -del_timer_sync (&skt->timer); +timer_shutdown_sync (&skt->timer);iounmap (skt->base);iounmap (skt->io_base); res = skt->reg_res;
drivers/pcmcia/electra_cf.c +1 -1
@@ -317,7 +317,7 @@ static int electra_cf_remove(struct platform_device *ofdev) cf->active =0 ;pcmcia_unregister_socket (&cf->socket);free_irq (cf->irq, cf); -del_timer_sync (&cf->timer); +timer_shutdown_sync (&cf->timer);iounmap (cf->io_virt);iounmap (cf->mem_base);
drivers/pcmcia/omap_cf.c +1 -1
@@ -296,7 +296,7 @@ static int __exit omap_cf_remove(struct platform_device *pdev) cf->active =0 ;pcmcia_unregister_socket (&cf->socket); -del_timer_sync (&cf->timer); +timer_shutdown_sync (&cf->timer);release_mem_region (cf->phys_cf,SZ_8K );free_irq (cf->irq, cf);kfree (cf);
drivers/pcmcia/pd6729.c +2 -2
@@ -727,7 +727,7 @@ static int pd6729_pci_probe(struct pci_dev *dev,if (irq_mode ==1 )free_irq (dev->irq, socket);else -del_timer_sync (&socket->poll_timer); +timer_shutdown_sync (&socket->poll_timer); err_out_free_res:pci_release_regions (dev); err_out_disable:
@@ -754,7 +754,7 @@ static void pd6729_pci_remove(struct pci_dev *dev)if (irq_mode ==1 )free_irq (dev->irq, socket);else -del_timer_sync (&socket->poll_timer); +timer_shutdown_sync (&socket->poll_timer);pci_release_regions (dev);pci_disable_device (dev);
drivers/pcmcia/yenta_socket.c +2 -2
@@ -814,7 +814,7 @@ static void yenta_close(struct pci_dev *dev)if (sock->cb_irq)free_irq (sock->cb_irq, sock);else -del_timer_sync (&sock->poll_timer); +timer_shutdown_sync (&sock->poll_timer);iounmap (sock->base);yenta_free_resources (sock);
@@ -1285,7 +1285,7 @@ static int yenta_probe(struct pci_dev *dev, const struct pci_device_id *id)if (socket->cb_irq)free_irq (socket->cb_irq, socket);else -del_timer_sync (&socket->poll_timer); +timer_shutdown_sync (&socket->poll_timer); unmap:iounmap (socket->base);yenta_free_resources (socket);
drivers/scsi/qla2xxx/qla_edif.c +2 -2
@@ -416,7 +416,7 @@ static void __qla2x00_release_all_sadb(struct scsi_qla_host *vha,*/ if (edif_entry->delete_sa_index !=INVALID_EDIF_SA_INDEX ) { -del_timer (&edif_entry->timer); +timer_shutdown (&edif_entry->timer);/* build and send the aen */ fcport->edif.rx_sa_set =1 ;
@@ -2799,7 +2799,7 @@ qla28xx_sa_update_iocb_entry(scsi_qla_host_t *v, struct req_que *req,"%s: removing edif_entry %p, new sa_index: 0x%x\n" , __func__, edif_entry, pkt->sa_index);qla_edif_list_delete_sa_index (sp->fcport, edif_entry); -del_timer (&edif_entry->timer); +timer_shutdown (&edif_entry->timer); ql_dbg(ql_dbg_edif, vha, 0x5033, "%s: releasing edif_entry %p, new sa_index: 0x%x\n",
drivers/staging/media/atomisp/i2c/atomisp-lm3554.c +1 -1
@@ -921,7 +921,7 @@ static void lm3554_remove(struct i2c_client *client)atomisp_gmin_remove_subdev (sd); -del_timer_sync (&flash->flash_off_delay); +timer_shutdown_sync (&flash->flash_off_delay);lm3554_gpio_uninit (client);
drivers/tty/n_gsm.c +1 -1
@@ -2098,7 +2098,7 @@ static void gsm_dlci_free(struct tty_port *port) { struct gsm_dlci *dlci = container_of(port, struct gsm_dlci, port); -del_timer_sync (&dlci->t1); +timer_shutdown_sync (&dlci->t1); dlci->gsm->dlci[dlci->addr] =NULL ;kfifo_free (&dlci->fifo);while ((dlci->skb =skb_dequeue (&dlci->skb_list)))
drivers/tty/sysrq.c +1 -1
@@ -1003,7 +1003,7 @@ static void sysrq_disconnect(struct input_handle *handle)input_close_device (handle);cancel_work_sync (&sysrq->reinject_work); -del_timer_sync (&sysrq->keyreset_timer); +timer_shutdown_sync (&sysrq->keyreset_timer);input_unregister_handle (handle);kfree (sysrq); }
drivers/usb/gadget/udc/m66592-udc.c +1 -1
@@ -1519,7 +1519,7 @@ static int m66592_remove(struct platform_device *pdev)usb_del_gadget_udc (&m66592->gadget); -del_timer_sync (&m66592->timer); +timer_shutdown_sync (&m66592->timer);iounmap (m66592->reg);free_irq (platform_get_irq (pdev,0 ), m66592);m66592_free_request (&m66592->ep[0 ].ep, m66592->ep0_req);
drivers/usb/serial/garmin_gps.c +1 -1
@@ -1405,7 +1405,7 @@ static void garmin_port_remove(struct usb_serial_port *port)usb_kill_anchored_urbs (&garmin_data_p->write_urbs);usb_kill_urb (port->interrupt_in_urb); -del_timer_sync (&garmin_data_p->timer); +timer_shutdown_sync (&garmin_data_p->timer);kfree (garmin_data_p); }
drivers/usb/serial/mos7840.c +2 -2
@@ -1725,8 +1725,8 @@ static void mos7840_port_remove(struct usb_serial_port *port)/* Turn off LED */ mos7840_set_led_sync (port,MODEM_CONTROL_REGISTER ,0x0300 ); -del_timer_sync (&mos7840_port->led_timer1); -del_timer_sync (&mos7840_port->led_timer2); +timer_shutdown_sync (&mos7840_port->led_timer1); +timer_shutdown_sync (&mos7840_port->led_timer2);usb_kill_urb (mos7840_port->led_urb);usb_free_urb (mos7840_port->led_urb);
fs/ext4/super.c +1 -1
@@ -1225,7 +1225,7 @@ static void ext4_put_super(struct super_block *sb) }ext4_es_unregister_shrinker (sbi); -del_timer_sync (&sbi->s_err_report); +timer_shutdown_sync (&sbi->s_err_report);ext4_release_system_zone (sb);ext4_mb_release (sb);ext4_ext_release (sb);
fs/nilfs2/segment.c +1 -1
@@ -2752,7 +2752,7 @@ static void nilfs_segctor_destroy(struct nilfs_sc_info *sci)down_write (&nilfs->ns_segctor_sem); -del_timer_sync (&sci->sc_timer); +timer_shutdown_sync (&sci->sc_timer);kfree (sci); }
net/802/garp.c +1 -1
@@ -618,7 +618,7 @@ void garp_uninit_applicant(struct net_device *dev, struct garp_application *appl/* Delete timer and generate a final TRANSMIT_PDU event to flush out * all pending messages before the applicant is gone. */ -del_timer_sync (&app->join_timer); +timer_shutdown_sync (&app->join_timer);spin_lock_bh (&app->lock);garp_gid_event (app,GARP_EVENT_TRANSMIT_PDU );
net/802/mrp.c +2 -2
@@ -903,8 +903,8 @@ void mrp_uninit_applicant(struct net_device *dev, struct mrp_application *appl)/* Delete timer and generate a final TX event to flush out * all pending messages before the applicant is gone. */ -del_timer_sync (&app->join_timer); -del_timer_sync (&app->periodic_timer); +timer_shutdown_sync (&app->join_timer); +timer_shutdown_sync (&app->periodic_timer);spin_lock_bh (&app->lock);mrp_mad_event (app,MRP_EVENT_TX );
net/bridge/br_multicast.c +4 -4
@@ -605,7 +605,7 @@ static void br_multicast_destroy_mdb_entry(struct net_bridge_mcast_gc *gc)WARN_ON (!hlist_unhashed (&mp->mdb_node));WARN_ON (mp->ports); -del_timer_sync (&mp->timer); +timer_shutdown_sync (&mp->timer);kfree_rcu (mp, rcu); }
@@ -646,7 +646,7 @@ static void br_multicast_destroy_group_src(struct net_bridge_mcast_gc *gc) src = container_of(gc, struct net_bridge_group_src, mcast_gc);WARN_ON (!hlist_unhashed (&src->node)); -del_timer_sync (&src->timer); +timer_shutdown_sync (&src->timer);kfree_rcu (src, rcu); }
@@ -670,8 +670,8 @@ static void br_multicast_destroy_port_group(struct net_bridge_mcast_gc *gc)WARN_ON (!hlist_unhashed (&pg->mglist));WARN_ON (!hlist_empty (&pg->src_list)); -del_timer_sync (&pg->rexmit_timer); -del_timer_sync (&pg->timer); +timer_shutdown_sync (&pg->rexmit_timer); +timer_shutdown_sync (&pg->timer);kfree_rcu (pg, rcu); }
net/bridge/br_multicast_eht.c +2 -2
@@ -142,7 +142,7 @@ static void br_multicast_destroy_eht_set_entry(struct net_bridge_mcast_gc *gc) set_h = container_of(gc, struct net_bridge_group_eht_set_entry, mcast_gc);WARN_ON (!RB_EMPTY_NODE (&set_h->rb_node)); -del_timer_sync (&set_h->timer); +timer_shutdown_sync (&set_h->timer);kfree (set_h); }
@@ -154,7 +154,7 @@ static void br_multicast_destroy_eht_set(struct net_bridge_mcast_gc *gc)WARN_ON (!RB_EMPTY_NODE (&eht_set->rb_node));WARN_ON (!RB_EMPTY_ROOT (&eht_set->entry_tree)); -del_timer_sync (&eht_set->timer); +timer_shutdown_sync (&eht_set->timer);kfree (eht_set); }
net/core/gen_estimator.c +1 -1
@@ -208,7 +208,7 @@ void gen_kill_estimator(struct net_rate_estimator __rcu **rate_est) est =xchg ((__force struct net_rate_estimator **)rate_est,NULL );if (est) { -del_timer_sync (&est->timer); +timer_shutdown_sync (&est->timer);kfree_rcu (est, rcu); } }
net/ipv4/ipmr.c +1 -1
@@ -412,7 +412,7 @@ static struct mr_table *ipmr_new_table(struct net *net, u32 id)static void ipmr_free_table (struct mr_table *mrt) { -del_timer_sync (&mrt->ipmr_expire_timer); +timer_shutdown_sync (&mrt->ipmr_expire_timer);mroute_clean_tables (mrt,MRT_FLUSH_VIFS |MRT_FLUSH_VIFS_STATIC |MRT_FLUSH_MFC |MRT_FLUSH_MFC_STATIC );rhltable_destroy (&mrt->mfc_hash);
net/ipv6/ip6mr.c +1 -1
@@ -392,7 +392,7 @@ static struct mr_table *ip6mr_new_table(struct net *net, u32 id)static void ip6mr_free_table (struct mr_table *mrt) { -del_timer_sync (&mrt->ipmr_expire_timer); +timer_shutdown_sync (&mrt->ipmr_expire_timer);mroute_clean_tables (mrt,MRT6_FLUSH_MIFS |MRT6_FLUSH_MIFS_STATIC |MRT6_FLUSH_MFC |MRT6_FLUSH_MFC_STATIC );rhltable_destroy (&mrt->mfc_hash);
net/mac80211/mesh_pathtbl.c +1 -1
@@ -512,7 +512,7 @@ static void mesh_path_free_rcu(struct mesh_table *tbl, mpath->flags |=MESH_PATH_RESOLVING |MESH_PATH_DELETED ;mesh_gate_del (tbl, mpath);spin_unlock_bh (&mpath->state_lock); -del_timer_sync (&mpath->timer); +timer_shutdown_sync (&mpath->timer);atomic_dec (&sdata->u.mesh.mpaths);atomic_dec (&tbl->entries);mesh_path_flush_pending (mpath);
net/netfilter/ipset/ip_set_list_set.c +1 -1
@@ -427,7 +427,7 @@ list_set_destroy(struct ip_set *set)struct set_elem *e, *n;if (SET_WITH_TIMEOUT (set)) -del_timer_sync (&map->gc); +timer_shutdown_sync (&map->gc);list_for_each_entry_safe (e, n, &map->members, list) {list_del (&e->list);
net/netfilter/ipvs/ip_vs_lblc.c +1 -1
@@ -384,7 +384,7 @@ static void ip_vs_lblc_done_svc(struct ip_vs_service *svc)struct ip_vs_lblc_table *tbl = svc->sched_data;/* remove periodic timer */ -del_timer_sync (&tbl->periodic_timer); +timer_shutdown_sync (&tbl->periodic_timer);/* got to clean up table entries here */ ip_vs_lblc_flush (svc);
net/netfilter/ipvs/ip_vs_lblcr.c +1 -1
@@ -547,7 +547,7 @@ static void ip_vs_lblcr_done_svc(struct ip_vs_service *svc)struct ip_vs_lblcr_table *tbl = svc->sched_data;/* remove periodic timer */ -del_timer_sync (&tbl->periodic_timer); +timer_shutdown_sync (&tbl->periodic_timer);/* got to clean up table entries here */ ip_vs_lblcr_flush (svc);
net/netfilter/xt_LED.c +1 -1
@@ -166,7 +166,7 @@ static void led_tg_destroy(const struct xt_tgdtor_param *par)list_del (&ledinternal->list); -del_timer_sync (&ledinternal->timer); +timer_shutdown_sync (&ledinternal->timer);led_trigger_unregister (&ledinternal->netfilter_led_trigger);
net/rxrpc/conn_object.c +1 -1
@@ -358,7 +358,7 @@ static void rxrpc_destroy_connection(struct rcu_head *rcu)_net ("DESTROY CONN %d" , conn->debug_id); -del_timer_sync (&conn->timer); +timer_shutdown_sync (&conn->timer);rxrpc_purge_queue (&conn->rx_queue); conn->security->clear (conn);
net/sched/cls_flow.c +1 -1
@@ -367,7 +367,7 @@ static const struct nla_policy flow_policy[TCA_FLOW_MAX + 1] = {static void __flow_destroy_filter (struct flow_filter *f) { -del_timer_sync (&f->perturb_timer); +timer_shutdown_sync (&f->perturb_timer);tcf_exts_destroy (&f->exts);tcf_em_tree_destroy (&f->ematches);tcf_exts_put_net (&f->exts);
net/sunrpc/svc.c +1 -1
@@ -567,7 +567,7 @@ svc_destroy(struct kref *ref) struct svc_serv *serv = container_of(ref, struct svc_serv, sv_refcnt);dprintk ("svc: svc_destroy(%s)\n" , serv->sv_program->pg_name); -del_timer_sync (&serv->sv_temptimer); +timer_shutdown_sync (&serv->sv_temptimer);/* * The last user is gone and thus all sockets have to be destroyed to
net/tipc/discover.c +1 -1
@@ -385,7 +385,7 @@ int tipc_disc_create(struct net *net, struct tipc_bearer *b,*/ void tipc_disc_delete (struct tipc_discoverer *d) { -del_timer_sync (&d->timer); +timer_shutdown_sync (&d->timer);kfree_skb (d->skb);kfree (d); }
net/tipc/monitor.c +1 -1
@@ -700,7 +700,7 @@ void tipc_mon_delete(struct net *net, int bearer_id) } mon->self =NULL ;write_unlock_bh (&mon->lock); -del_timer_sync (&mon->timer); +timer_shutdown_sync (&mon->timer);kfree (self->domain);kfree (self);kfree (mon);
sound/i2c/other/ak4117.c +1 -1
@@ -47,7 +47,7 @@ static void reg_dump(struct ak4117 *ak4117)static void snd_ak4117_free (struct ak4117 *chip) { -del_timer_sync (&chip->timer); +timer_shutdown_sync (&chip->timer);kfree (chip); }
sound/synth/emux/emux.c +1 -1
@@ -129,7 +129,7 @@ int snd_emux_free(struct snd_emux *emu)if (! emu)return -EINVAL ; -del_timer_sync (&emu->tlist); +timer_shutdown_sync (&emu->tlist);snd_emux_proc_free (emu);snd_emux_delete_virmidi (emu);
Signature · 1 line
2.35.1
Re: [PATCH v5a 2/5] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function
In reply to Steven RostedtQuoted 12 lines · Steven Rostedt
From: "Steven Rostedt (Google)" <[email protected]>
A new "shutdown" timer state is being added to the generic timer code. One of the functions to change the timer into the state is called "
timer_shutdown()". This means that there can not be other functions called "timer_shutdown()" as the timer code owns the "timer_*" name space.Rename
timer_shutdown()toarch_timer_shutdown()to avoid this conflict.
Quoted 7 lines
Cc Mark Rutland <[email protected]>Cc Marc Zyngier <[email protected]>Cc Daniel Lezcano <[email protected]>Cc Thomas Gleixner <[email protected]>Reviewed-by Guenter Roeck <[email protected]>Signed-off-by Steven Rostedt (Google) <[email protected]>
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Quoted 8 lines · Steven Rostedt
del_timer_sync()is often called before the object that owns the timer is freed. But sometimes there's a race that enables the timer again before it is freed and causes a use after free when that timer triggers. This patch set adds a new "shutdown" timer state, which is set on the newtimer_shutdown()API. Once a timer is in this state, it can not be re-armed and if it is, it will warn.
Quoted 9 lines
The first three patches change existing
timer_shutdown()functions used locally in ARM and some drivers to better namespace names.The fourth patch implements the new API.
The fifth patch is now a treewide patch that uses a coccinelle script to convert the trivial locations where a del_timer*() is called on a timer of an object that is freed immediately afterward (or at least in the same function).
Series looks good in my testbed.
Build results:
total: 152 pass: 152 fail: 0 Qemu test results: total: 500 pass: 500 fail: 0
No runtime warnings reported.
For the series:
Guenter
Steven Rostedt
reviewerQuoted 3 lines · On Sun, 6 Nov 2022 09:08:11 -0800 Guenter Roeck <[email protected]> wrote:
For the series:
Tested-by Guenter Roeck <[email protected]>
Thanks Guenter!
Now I guess the question is, is this good enough, and if so, who's going to take it?
-- Steve
Re: [PATCH v5a 5/5] treewide: Convert del_timer*() to timer_shutdown*()
In reply to Steven RostedtThanks, this looks reasonable.
Quoted 6 lines · Steven Rostedt
The coccinelle script:
@@
expression E;
identifier ptr, timer, rfield, slab;
I think Julia suggested making 'ptr' be an expression too, and I think she's right. Probably 'slab' should be too - there's no reason to limit it to just one identifier.
Quoted 2 lines
... when strict
when != ptr->timer.function = E;I suspect any "ptr->timer" access anywhere between the del_timer_sync() and the freeing should disable things.
Although hopefully there aren't any other odd cases than that one "clear timer function by hand" one.
Linus
Steven Rostedt
reviewerRe: [PATCH v5a 5/5] treewide: Convert del_timer*() to timer_shutdown*()
Quoted 11 lines · On Sun, 6 Nov 2022 12:51:46 -0800 Linus Torvalds…
Thanks, this looks reasonable.
Quoted 6 lines · Steven Rostedt
The coccinelle script:
@@
expression E;
identifier ptr, timer, rfield, slab;I think Julia suggested making 'ptr' be an expression too, and I think
And I forgot to add Julia to the Cc :-/
Quoted 11 lines
she's right. Probably 'slab' should be too - there's no reason to limit it to just one identifier.
Quoted 2 lines
... when strict when != ptr->timer.function = E;I suspect any "
ptr->timer" access anywhere between thedel_timer_sync()and the freeing should disable things.Although hopefully there aren't any other odd cases than that one "clear timer function by hand" one.
OK, I did the following with this new script:
$ cat timer.cocci
@@
expression E,ptr,slab;
identifier timer, rfield;
@@
(
- del_timer(&ptr->timer);
+ timer_shutdown(&ptr->timer);
|
- del_timer_sync(&ptr->timer);
+ timer_shutdown_sync(&ptr->timer);
)
... when strict
when != ptr->timer.function = E;
(
kfree_rcu(ptr, rfield);
|
kmem_cache_free(slab, ptr);
|
kfree(ptr);
)$ git show | patch -p1 -R $ spatch --dir timer.cocci . > /tmp/t.patch $ patch -p1 < /tmp/t.patch
And it caught some more:
$ git diff
drivers/atm/idt77252.c +1 -1
@@ -2530,7 +2530,7 @@ idt77252_close(struct atm_vcc *vcc) vc->tx_vcc =NULL ;if (vc->estimator) { -del_timer (&vc->estimator->timer); +timer_shutdown (&vc->estimator->timer);kfree (vc->estimator); vc->estimator =NULL ; }
drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c +1 -1
@@ -394,7 +394,7 @@ void brcmf_btcoex_detach(struct brcmf_cfg80211_info *cfg)if (cfg->btcoex->timer_on) { cfg->btcoex->timer_on = false; -del_timer_sync (&cfg->btcoex->timer); +timer_shutdown_sync (&cfg->btcoex->timer); }cancel_work_sync (&cfg->btcoex->work);
net/netfilter/xt_IDLETIMER.c +2 -2
@@ -413,7 +413,7 @@ static void idletimer_tg_destroy(const struct xt_tgdtor_param *par)pr_debug ("deleting timer %s\n" , info->label);list_del (&info->timer->entry); -del_timer_sync (&info->timer->timer); +timer_shutdown_sync (&info->timer->timer);cancel_work_sync (&info->timer->work);sysfs_remove_file (idletimer_tg_kobj, &info->timer->attr.attr);kfree (info->timer->attr.attr.name);
@@ -441,7 +441,7 @@ static void idletimer_tg_destroy_v1(const struct xt_tgdtor_param *par)if (info->timer->timer_type &XT_IDLETIMER_ALARM ) {alarm_cancel (&info->timer->alarm); }else { -del_timer_sync (&info->timer->timer); +timer_shutdown_sync (&info->timer->timer); }cancel_work_sync (&info->timer->work);sysfs_remove_file (idletimer_tg_kobj, &info->timer->attr.attr);
Which all look legit.
I'll post a v6a using the new script.
-- Steve
Re: [PATCH v5a 5/5] treewide: Convert del_timer*() to timer_shutdown*()
Quoted 44 lines · Steven Rostedt
Quoted 11 lines · On Sun, 6 Nov 2022 12:51:46 -0800 Linus Torvalds…
Thanks, this looks reasonable.
Quoted 6 lines · Steven Rostedt
The coccinelle script:
@@
expression E;
identifier ptr, timer, rfield, slab;I think Julia suggested making 'ptr' be an expression too, and I think
And I forgot to add Julia to the Cc :-/
Quoted 11 lines
she's right. Probably 'slab' should be too - there's no reason to limit it to just one identifier.
Quoted 2 lines
... when strict when != ptr->timer.function = E;I suspect any "
ptr->timer" access anywhere between thedel_timer_sync()and the freeing should disable things.Although hopefully there aren't any other odd cases than that one "clear timer function by hand" one.
OK, I did the following with this new script:
$ cat timer.cocci @@ expression E,ptr,slab; identifier timer, rfield; @@ ((quoted diff) +1
-1- del_timer(&ptr->timer); + timer_shutdown(&ptr->timer);|
(quoted diff) +1
-1- del_timer_sync(&ptr->timer); + timer_shutdown_sync(&ptr->timer);)
... when strict
Quoted 9 lines
when != ptr->timer.function = E; ( kfree_rcu(ptr, rfield); | kmem_cache_free(slab, ptr); | kfree(ptr);)
Same modified script, same results. I am curious, though:
Quoted 5 lines
net/netfilter/xt_IDLETIMER.c +0
-0@@ -413,7 +413,7 @@ static void idletimer_tg_destroy(const struct xt_tgdtor_param *par)pr_debug ("deleting timer %s\n" , info->label);
...
net/netfilter/xt_IDLETIMER.c static void idletimer_tg_destroy_v1(const struct xt_tgdtor_param *par) · line 442
Quoted 3 lines
net/netfilter/xt_IDLETIMER.c +0
-0@@ -441,7 +441,7 @@ static void idletimer_tg_destroy_v1(const struct xt_tgdtor_param *par)if (info->timer->timer_type &XT_IDLETIMER_ALARM ) {alarm_cancel (&info->timer->alarm);
Does that mean something similar may be needed for alarms ?
Quoted 10 lines
net/netfilter/xt_IDLETIMER.c +1
-1}else { -del_timer_sync (&info->timer->timer); +timer_shutdown_sync (&info->timer->timer); }cancel_work_sync (&info->timer->work);sysfs_remove_file (idletimer_tg_kobj, &info->timer->attr.attr);Which all look legit.
I checked as well and agree.
Guenter
Steven Rostedt
reviewerRe: [PATCH v5a 5/5] treewide: Convert del_timer*() to timer_shutdown*()
Quoted 5 lines · On Sun, 6 Nov 2022 13:15:18 -0800 Guenter Roeck <[email protected]> wrote:
net/netfilter/xt_IDLETIMER.c static void idletimer_tg_destroy_v1(const struct xt_tgdtor_param *par) · line 442
Quoted 3 lines
net/netfilter/xt_IDLETIMER.c +0
-0@@ -441,7 +441,7 @@ static void idletimer_tg_destroy_v1(const struct xt_tgdtor_param *par)if (info->timer->timer_type &XT_IDLETIMER_ALARM ) {alarm_cancel (&info->timer->alarm);Does that mean something similar may be needed for alarms ?
No idea. But that could be added to the queue after workqueues ;-)
-- Steve
Re: [PATCH v5a 5/5] treewide: Convert del_timer*() to timer_shutdown*()
In reply to Steven RostedtQuoted 3 lines · Steven Rostedt
... when strict
when != ptr->timer.function = E;.. and I tried this with just 'ptr->timer', and it doesn't seem to make any difference, so apparently that NULL pointer initialization was the only case.
And then - like you and Guenter - I went through the patch manually to look for anything that looked odd, and didn't find anything.
So yes, I'm happy with this. It looks like a very reasonable "let's handle the scripted trivial cases automatically", and then anything more complicated can be left for 6.2.
And with that cocci script (and how to run it), people can see what the script was, and even run it themselves to verify, and that just makes me feel all warm and fuzzy about it.
Linus
Steven Rostedt
reviewerRe: [PATCH v5a 5/5] treewide: Convert del_timer*() to timer_shutdown*()
Quoted 3 lines · On Sun, 6 Nov 2022 13:39:45 -0800 Linus Torvalds…
So yes, I'm happy with this. It looks like a very reasonable "let's handle the scripted trivial cases automatically", and then anything more complicated can be left for 6.2.
Great to hear.
Quoted 4 lines
And with that cocci script (and how to run it), people can see what the script was, and even run it themselves to verify, and that just makes me feel all warm and fuzzy about it.
I can update the change log to include:
$ cat timer.cocci
@@
expression E, ptr, slab;
identifier timer, rfield;
@@
(
- del_timer(&ptr->timer);
+ timer_shutdown(&ptr->timer);
|
- del_timer_sync(&ptr->timer);
+ timer_shutdown_sync(&ptr->timer);
)
... when strict
when != ptr->timer.function = E;
(
kfree_rcu(ptr, rfield);
|
kmem_cache_free(slab, ptr);
|
kfree(ptr);
)
$ spatch --dir timer.cocci . > /tmp/t.patch
$ patch -p1 < /tmp/t.patchif you want.
The question now comes, how should you take it?
- You pull in this series directly.
- Thomas takes it and sends you a pull request (although he's been very quiet on this topic, even though he told me he was OK with it on IRC).
- I add it to my tree, and send you a pull request?
I'll let you choose.
-- Steve
Re: [PATCH v5a 5/5] treewide: Convert del_timer*() to timer_shutdown*()
Quoted 2 lines · Steven Rostedt
I can update the change log to include:
Yup, full running instructions for coccinelle patches is probably a good idea.
I've done them semi-occasionally, but it's rare enough that I always have to look it up anyway, and I suspect many others have never done it, so having it in the commit message is probably a good idea.
Quoted 1 line
when != ptr->timer.function = E;
I do think that you should just remove that E expression and the "function = E" part.
Really, _any_ use of the timer after the timer delete makes it questionable,
It doesn't change the patch in my testing, but I think it's silly to have that very specific pattern, when the more general case of "hey, if you use the timer after deleting it, it's not obvious that it should be a shutdown any more" just is more sensible anyway.
Linus
Re: [PATCH v5a 5/5] treewide: Convert del_timer*() to timer_shutdown*()
Quoted 6 lines · Linus Torvalds
Quoted 2 lines · Steven Rostedt
I can update the change log to include:
Yup, full running instructions for coccinelle patches is probably a good idea.
Quoted 9 lines
I've done them semi-occasionally, but it's rare enough that I always have to look it up anyway, and I suspect many others have never done it, so having it in the commit message is probably a good idea.
Quoted 1 line
when != ptr->timer.function = E;I do think that you should just remove that E expression and the "function = E" part.
Agreed. Removing this line does not make a difference. It looks like the "when strict" takes care of the condition.
Guenter
Steven Rostedt
reviewerRe: [PATCH v5a 5/5] treewide: Convert del_timer*() to timer_shutdown*()
In reply to Linus TorvaldsQuoted 9 lines · On Sun, 6 Nov 2022 14:40:14 -0800 Linus Torvalds…
I do think that you should just remove that E expression and the "function = E" part.
Really, _any_ use of the timer after the timer delete makes it questionable,
It doesn't change the patch in my testing, but I think it's silly to have that very specific pattern, when the more general case of "hey, if you use the timer after deleting it, it's not obvious that it should be a shutdown any more" just is more sensible anyway.
OK, I updated the script to:
@@
expression ptr, slab;
identifier timer, rfield;
@@
(
- del_timer(&ptr->timer);
+ timer_shutdown(&ptr->timer);
|
- del_timer_sync(&ptr->timer);
+ timer_shutdown_sync(&ptr->timer);
)
... when strict
when != ptr->timer
(
kfree_rcu(ptr, rfield);
|
kmem_cache_free(slab, ptr);
|
kfree(ptr);)
And produced no difference from https://lore.kernel.org/all/[email protected]/
I can post a v7a with the updated change log and also Guenter's tested-by tag. But the patches will remain the same. Are you going to just take that then?
-- Steve
Re: [PATCH v5a 5/5] treewide: Convert del_timer*() to timer_shutdown*()
Quoted 4 lines · Steven Rostedt
I can post a v7a with the updated change log and also Guenter's tested-by tag. But the patches will remain the same. Are you going to just take that then?
Sure. Not today, I need to go do the rc4, but if you do a pull request with that series, I'll pull it.
Thanks,
Linus
Re: [PATCH v5a 5/5] treewide: Convert del_timer*() to timer_shutdown*()
In reply to Steven RostedtQuoted 44 lines · Steven Rostedt
Quoted 11 lines · On Sun, 6 Nov 2022 12:51:46 -0800 Linus Torvalds…
Thanks, this looks reasonable.
Quoted 6 lines · Steven Rostedt
The coccinelle script:
@@
expression E;
identifier ptr, timer, rfield, slab;I think Julia suggested making 'ptr' be an expression too, and I think
And I forgot to add Julia to the Cc :-/
Quoted 11 lines
she's right. Probably 'slab' should be too - there's no reason to limit it to just one identifier.
Quoted 2 lines
... when strict when != ptr->timer.function = E;I suspect any "
ptr->timer" access anywhere between thedel_timer_sync()and the freeing should disable things.Although hopefully there aren't any other odd cases than that one "clear timer function by hand" one.
OK, I did the following with this new script:
$ cat timer.cocci @@ expression E,ptr,slab; identifier timer, rfield; @@ ((quoted diff) +1
-1- del_timer(&ptr->timer); + timer_shutdown(&ptr->timer);|
(quoted diff) +1
-1- del_timer_sync(&ptr->timer); + timer_shutdown_sync(&ptr->timer);)
... when strict
Quoted 1 line
when != ptr->timer.function = E;
Maybe change the second when line to when != ptr->timer to see what are the differences in the results? That could show if there is anything important that has not been taken into account.
julia
Quoted 73 lines
(
kfree_rcu(ptr, rfield); | kmem_cache_free(slab, ptr); | kfree(ptr);)
$ git show | patch -p1 -R $ spatch --dir timer.cocci . > /tmp/t.patch $ patch -p1 < /tmp/t.patchAnd it caught some more:
$ git diffdrivers/atm/idt77252.c +1
-1@@ -2530,7 +2530,7 @@ idt77252_close(struct atm_vcc *vcc) vc->tx_vcc =NULL ;if (vc->estimator) { -del_timer (&vc->estimator->timer); +timer_shutdown (&vc->estimator->timer);kfree (vc->estimator); vc->estimator =NULL ; }drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c +1
-1@@ -394,7 +394,7 @@ void brcmf_btcoex_detach(struct brcmf_cfg80211_info *cfg)if (cfg->btcoex->timer_on) { cfg->btcoex->timer_on = false; -del_timer_sync (&cfg->btcoex->timer); +timer_shutdown_sync (&cfg->btcoex->timer); }cancel_work_sync (&cfg->btcoex->work);net/netfilter/xt_IDLETIMER.c +2
-2@@ -413,7 +413,7 @@ static void idletimer_tg_destroy(const struct xt_tgdtor_param *par)pr_debug ("deleting timer %s\n" , info->label);list_del (&info->timer->entry); -del_timer_sync (&info->timer->timer); +timer_shutdown_sync (&info->timer->timer);cancel_work_sync (&info->timer->work);sysfs_remove_file (idletimer_tg_kobj, &info->timer->attr.attr);kfree (info->timer->attr.attr.name);@@ -441,7 +441,7 @@ static void idletimer_tg_destroy_v1(const struct xt_tgdtor_param *par)if (info->timer->timer_type &XT_IDLETIMER_ALARM ) {alarm_cancel (&info->timer->alarm); }else { -del_timer_sync (&info->timer->timer); +timer_shutdown_sync (&info->timer->timer); }cancel_work_sync (&info->timer->work);sysfs_remove_file (idletimer_tg_kobj, &info->timer->attr.attr);Which all look legit.
I'll post a v6a using the new script.
-- Steve
Re: [PATCH v5a 5/5] treewide: Convert del_timer*() to timer_shutdown*()
In reply to Linus TorvaldsQuoted 8 lines · Linus Torvalds
Quoted 3 lines · Steven Rostedt
... when strict when != ptr->timer.function = E;.. and I tried this with just '
ptr->timer', and it doesn't seem to make any difference, so apparently that NULL pointer initialization was the only case.
OK, good to know.
julia
Quoted 14 lines
And then - like you and Guenter - I went through the patch manually to look for anything that looked odd, and didn't find anything.
So yes, I'm happy with this. It looks like a very reasonable "let's handle the scripted trivial cases automatically", and then anything more complicated can be left for 6.2.
And with that cocci script (and how to run it), people can see what the script was, and even run it themselves to verify, and that just makes me feel all warm and fuzzy about it.
Linus
Re: [PATCH v5a 1/5] ARM: spear: Do not use timer namespace for timer_shutdown() function
In reply to Steven RostedtQuoted 11 lines · Steven Rostedt
From: "Steven Rostedt (Google)" <[email protected]>
A new "shutdown" timer state is being added to the generic timer code. One of the functions to change the timer into the state is called "
timer_shutdown()". This means that there can not be other functions called "timer_shutdown()" as the timer code owns the "timer_*" name space.Rename
timer_shutdown()tospear_timer_shutdown()to avoid this conflict.
Quoted 8 lines
Cc Viresh Kumar <[email protected]>Cc Shiraz Hashim <[email protected]>Cc Russell King <[email protected]>Acked-by Arnd Bergmann <[email protected]>Reviewed-by Guenter Roeck <[email protected]>Signed-off-by Steven Rostedt (Google) <[email protected]>
I just replied to the previous version, ignore that now :)
Thanks.
Signature · 1 line
viresh
Re: [PATCH v5a 2/5] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function
In reply to Steven RostedtQuoted 11 lines · Steven Rostedt
From: "Steven Rostedt (Google)" <[email protected]>
A new "shutdown" timer state is being added to the generic timer code. One of the functions to change the timer into the state is called "
timer_shutdown()". This means that there can not be other functions called "timer_shutdown()" as the timer code owns the "timer_*" name space.Rename
timer_shutdown()toarch_timer_shutdown()to avoid this conflict.
Quoted 7 lines
Cc Mark Rutland <[email protected]>Cc Marc Zyngier <[email protected]>Cc Daniel Lezcano <[email protected]>Cc Thomas Gleixner <[email protected]>Reviewed-by Guenter Roeck <[email protected]>Signed-off-by Steven Rostedt (Google) <[email protected]>
Mark.
Quoted 48 lines
--- drivers/clocksource/arm_arch_timer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/clocksource/arm_arch_timer.c +6
-6@@ -687,8 +687,8 @@ static irqreturn_t arch_timer_handler_virt_mem(int irq, void *dev_id)return timer_handler (ARCH_TIMER_MEM_VIRT_ACCESS , evt); } -static __always_inline int timer_shutdown(const int access, -struct clock_event_device *clk) +static __always_inline int arch_timer_shutdown(const int access, +struct clock_event_device *clk) {unsigned long ctrl;@@ -701,22 +701,22 @@ static __always_inline int timer_shutdown(const int access,static int arch_timer_shutdown_virt (struct clock_event_device *clk) { -return timer_shutdown (ARCH_TIMER_VIRT_ACCESS , clk); +return arch_timer_shutdown (ARCH_TIMER_VIRT_ACCESS , clk); }static int arch_timer_shutdown_phys (struct clock_event_device *clk) { -return timer_shutdown (ARCH_TIMER_PHYS_ACCESS , clk); +return arch_timer_shutdown (ARCH_TIMER_PHYS_ACCESS , clk); }static int arch_timer_shutdown_virt_mem (struct clock_event_device *clk) { -return timer_shutdown (ARCH_TIMER_MEM_VIRT_ACCESS , clk); +return arch_timer_shutdown (ARCH_TIMER_MEM_VIRT_ACCESS , clk); }static int arch_timer_shutdown_phys_mem (struct clock_event_device *clk) { -return timer_shutdown (ARCH_TIMER_MEM_PHYS_ACCESS , clk); +return arch_timer_shutdown (ARCH_TIMER_MEM_PHYS_ACCESS , clk); } static __always_inline void set_next_event(const int access, unsigned long evt,Signature · 1 line
2.35.1