timers: Use timer_shutdown*() before freeing timers
Subsystems (78)
Steven Rostedt
reviewercover 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(-)
PATCH 7/38 timers: block: Use timer_shutdown_sync() before freeing timer
From: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- block/blk-iocost.c | 2 +- block/blk-iolatency.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 +- 7 files changed, 7 insertions(+), 7 deletions(-)
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/blk-throttle.c +1 -1
@@ -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); +timer_shutdown_sync (&tg->service_queue.pending_timer);blkg_rwstat_exit (&tg->stat_bytes);blkg_rwstat_exit (&tg->stat_ios);kfree (tg);
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/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/block/sunvdc.c +1 -1
@@ -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); +timer_shutdown_sync (&port->vio.timer);del_gendisk (port->disk);put_disk (port->disk);
Signature · 5 lines
2.35.1 _______________________________________________ drbd-dev mailing list [email protected] https://lists.linbit.com/mailman/listinfo/drbd-dev
Steven Rostedt
reviewerPATCH 1/38 SUNRPC/xprt: Use del_timer_sync() instead of del_singleshot_timer_sync()
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Back on June 22, 2005, it was decided to use del_singleshot_timer_sync() because it wouldn't loop like del_timer_sync(), and since the timer that was being removed was not about to be rearmed, it was considered an efficiency to use del_singleshot_timer_sync() over del_timer_sync().
But on June 23, 2005, commit 55c888d6d09a0 ("timers fixes/improvements") happened, which converted del_singleshot_timer_sync() into:
#define del_singleshot_timer_sync(t) del_timer_sync(t)
Making the to equivalent.
Now work is being done to add a "shutdown" state to timers where a timer must be in that state in order to be freed to prevent use-after-free bugs caused by timers being re-armed just before being freed, the del_singleshot_timer_sync() is now being converted into something that will set the timer to the shutdown state. This means that once del_singleshot_timer_sync() is called, the timer can no longer be re-armed.
As the timer here will be re-armed, it can not use del_singleshot_timer_sync(). But as the reason it was used in the first place no longer exists, just use del_timer_sync().
--- net/sunrpc/xprt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sunrpc/xprt.c +1 -1
@@ -1164,7 +1164,7 @@ xprt_request_enqueue_receive(struct rpc_task *task)spin_unlock (&xprt->queue_lock);/* Turn off autodisconnect */ -del_singleshot_timer_sync (&xprt->timer); +del_timer_sync (&xprt->timer);return 0 ; }
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 2/38 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 evt_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 evt_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); +evt_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); +evt_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); +evt_timer_shutdown (evt); period =clk_get_rate (gpt_clk) /HZ ; period >>=CTRL_PRESCALER16 ;
Signature · 1 line
2.35.1
Re: [PATCH v4a 02/38] ARM: spear: Do not use timer namespace for timer_shutdown() function
Quoted 7 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.
Quoted 8 lines
Rename
timer_shutdown()toevt_timer_shutdown()to avoid this conflict.Cc Viresh Kumar <[email protected]>Cc Shiraz Hashim <[email protected]>Cc Russell King <[email protected]>Signed-off-by Steven Rostedt (Google) <[email protected]>
Nitpick: I would have called it spear_timer_shutdown(). POV, so
Quoted 46 lines
--- 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 evt_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); +evt_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); +evt_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); +evt_timer_shutdown (evt); period =clk_get_rate (gpt_clk) /HZ ; period >>=CTRL_PRESCALER16 ;Signature · 1 line
2.35.1
Viresh Kumar
Acked-byRe: [PATCH v4a 02/38] ARM: spear: Do not use timer namespace for timer_shutdown() function
Quoted 10 lines · Guenter Roeck
Quoted 9 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()toevt_timer_shutdown()to avoid this conflict.
Quoted 8 lines
Quoted 6 lines
Cc Viresh Kumar <[email protected]>Cc Shiraz Hashim <[email protected]>Cc Russell King <[email protected]>Signed-off-by Steven Rostedt (Google) <[email protected]>Nitpick: I would have called it
spear_timer_shutdown(). POV, so
+1
Other than that:
Signature · 1 line
viresh
Re: [PATCH v4a 02/38] ARM: spear: Do not use timer namespace for timer_shutdown() function
In reply to Steven RostedtQuoted 7 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.
Quoted 8 lines
Rename
timer_shutdown()toevt_timer_shutdown()to avoid this conflict.Cc Viresh Kumar <[email protected]>Cc Shiraz Hashim <[email protected]>Cc Russell King <[email protected]>Signed-off-by Steven Rostedt (Google) <[email protected]>
For arch/arm/mach-*
Steven Rostedt
reviewerPATCH 3/38 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 clk_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 clk_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 clk_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 clk_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 clk_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 clk_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
Marc Zyngier
maintainerRe: [PATCH v4a 03/38] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function
Quoted 9 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()toclk_timer_shutdown()to avoid this conflict.
bikeshed: s/clk_timer/arch_timer/ would make the naming consistent with the rest of the code.
Thanks,
M.
Quoted 58 lines
Cc Mark Rutland <[email protected]>Cc Marc Zyngier <[email protected]>Cc Daniel Lezcano <[email protected]>Cc Thomas Gleixner <[email protected]>Signed-off-by Steven Rostedt (Google) <[email protected]>--- 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 clk_timer_shutdown(const int access, +struct clock_event_device *clk) {unsigned long ctrl;@@ -701,22 +701,22 @@ static __always_inline int timer_shutdown(constint access, static int arch_timer_shutdown_virt(struct clock_event_device *clk) { - return timer_shutdown(ARCH_TIMER_VIRT_ACCESS, clk); + return clk_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 clk_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 clk_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 clk_timer_shutdown (ARCH_TIMER_MEM_PHYS_ACCESS , clk);}
static
__always_inlinevoid set_next_event(const int access, unsigned
long evt,
Signature · 1 line
Jazz is not dead. It just smells funny...
Re: [PATCH v4a 03/38] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function
In reply to Steven RostedtQuoted 7 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.
Quoted 8 lines
Rename
timer_shutdown()toclk_timer_shutdown()to avoid this conflict.Cc Mark Rutland <[email protected]>Cc Marc Zyngier <[email protected]>Cc Daniel Lezcano <[email protected]>Cc Thomas Gleixner <[email protected]>Signed-off-by Steven Rostedt (Google) <[email protected]>
Same nitpick as Marc (arch_timer_shutdown), but this is POV, so
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 clk_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 clk_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 clk_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 clk_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 clk_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
reviewerRe: [PATCH v4a 03/38] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function
Quoted 3 lines · On Sat, 5 Nov 2022 07:07:13 -0700 Guenter Roeck <[email protected]> wrote:
Same nitpick as Marc (
arch_timer_shutdown), but this is POV, soReviewed-by Guenter Roeck <[email protected]>
Yeah, makes sense. I can update this patch.
-- Steve
Steven Rostedt
reviewerPATCH 4/38 clocksource/drivers/sp804: 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 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
Re: [PATCH v4a 04/38] clocksource/drivers/sp804: Do not use timer namespace for timer_shutdown() function
Quoted 7 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.
Quoted 5 lines
Rename
timer_shutdown()toevt_timer_shutdown()to avoid this conflict.Cc Daniel Lezcano <[email protected]>Cc Thomas Gleixner <[email protected]>Signed-off-by Steven Rostedt (Google) <[email protected]>
Quoted 36 lines
--- 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 5/38 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 | 64 +++++++++++++++++-- kernel/time/timer.c | 64 ++++++++++--------- 5 files changed, 98 insertions(+), 39 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 +57 -7
83 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 6/38 timers: sh: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- arch/sh/drivers/push-switch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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);
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 8/38 timers: ACPI: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- drivers/acpi/apei/ghes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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);
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 9/38 timers: atm: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- drivers/atm/idt77252.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
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);
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 10/38 timers: Bluetooth: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
In h5_close(), the timer is removed with del_timer_sync(), but it is only freed if hu->serdev is NULL. I added timer_shutdown_sync() just before it is freed. timer_shutdown() may also be used, but just in case it gets re-armed somehow, I figured another sync will keep that from being an issue.
--- drivers/bluetooth/hci_bcsp.c | 2 +- drivers/bluetooth/hci_h5.c | 4 +++- drivers/bluetooth/hci_qca.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-)
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_h5.c +3 -1
@@ -265,8 +265,10 @@ static int h5_close(struct hci_uart *hu)if (h5->vnd && h5->vnd->close) h5->vnd->close (h5); -if (!hu->serdev) +if (!hu->serdev) { +timer_shutdown_sync (&h5->timer);kfree (h5); + }return 0 ; }
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);
Signature · 1 line
2.35.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=692348
---Test result---
Test Summary:
CheckPatch PASS 1.29 seconds GitLint PASS 0.49 seconds SubjectPrefix PASS 0.35 seconds BuildKernel FAIL 30.86 seconds BuildKernel32 FAIL 25.94 seconds Incremental Build with patchesERROR 0.18 seconds TestRunner: Setup PASS 598.19 seconds TestRunner: l2cap-tester PASS 19.13 seconds TestRunner: iso-tester PASS 18.83 seconds TestRunner: bnep-tester PASS 7.40 seconds TestRunner: mgmt-tester PASS 121.79 seconds TestRunner: rfcomm-tester PASS 12.04 seconds TestRunner: sco-tester PASS 11.01 seconds TestRunner: ioctl-tester PASS 12.36 seconds TestRunner: mesh-tester PASS 8.84 seconds TestRunner: smp-tester PASS 10.71 seconds TestRunner: userchan-tester PASS 7.61 seconds
Details
##############################
Test: BuildKernel - FAIL - 30.86 seconds
Build Kernel with minimal configuration supports Bluetoothdrivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: BuildKernel32 - FAIL - 25.94 seconds
Build 32bit Kernel with minimal configuration supports Bluetoothdrivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: Incremental Build with patches - SKIPPED - 0.18 seconds Incremental build per patch in the series buildkernel failed
---
Regards,
Linux Bluetooth
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=692348
---Test result---
Test Summary:
CheckPatch PASS 0.88 seconds GitLint PASS 0.28 seconds SubjectPrefix PASS 0.09 seconds BuildKernel FAIL 25.45 seconds BuildKernel32 FAIL 21.86 seconds TestRunnerSetup PASS 415.52 seconds TestRunner_l2cap-tester PASS 15.37 seconds TestRunner_iso-tester PASS 14.88 seconds TestRunner_bnep-tester PASS 5.24 seconds TestRunner_mgmt-tester PASS 102.37 seconds TestRunner_rfcomm-tester PASS 9.01 seconds TestRunner_sco-tester PASS 8.48 seconds TestRunner_ioctl-tester PASS 9.72 seconds TestRunner_mesh-tester PASS 6.58 seconds TestRunner_smp-tester PASS 8.42 seconds TestRunner_userchan-tester PASS 5.53 seconds IncrementalBuild FAIL 23.27 seconds
Details
##############################
Test: BuildKernel - FAIL
Desc: Build Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: BuildKernel32 - FAIL
Desc: Build 32bit Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
[v4a,10/38] timers: Bluetooth: Use timer_shutdown_sync() before freeing timer
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
---
Regards,
Linux Bluetooth
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=692348
---Test result---
Test Summary:
CheckPatch PASS 0.96 seconds GitLint PASS 0.33 seconds SubjectPrefix PASS 0.12 seconds BuildKernel FAIL 26.03 seconds BuildKernel32 FAIL 22.37 seconds TestRunnerSetup PASS 417.48 seconds TestRunner_l2cap-tester PASS 15.69 seconds TestRunner_iso-tester PASS 15.18 seconds TestRunner_bnep-tester PASS 5.35 seconds TestRunner_mgmt-tester PASS 103.46 seconds TestRunner_rfcomm-tester PASS 9.17 seconds TestRunner_sco-tester PASS 8.46 seconds TestRunner_ioctl-tester PASS 9.59 seconds TestRunner_mesh-tester PASS 6.62 seconds TestRunner_smp-tester PASS 8.45 seconds TestRunner_userchan-tester PASS 5.51 seconds IncrementalBuild FAIL 23.43 seconds
Details
##############################
Test: BuildKernel - FAIL
Desc: Build Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: BuildKernel32 - FAIL
Desc: Build 32bit Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
[v4a,10/38] timers: Bluetooth: Use timer_shutdown_sync() before freeing timer
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
---
Regards,
Linux Bluetooth
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=692348
---Test result---
Test Summary:
CheckPatch PASS 1.16 seconds GitLint PASS 0.39 seconds SubjectPrefix PASS 0.13 seconds BuildKernel FAIL 31.44 seconds BuildKernel32 FAIL 27.57 seconds TestRunnerSetup PASS 530.56 seconds TestRunner_l2cap-tester PASS 18.62 seconds TestRunner_iso-tester PASS 19.26 seconds TestRunner_bnep-tester PASS 6.43 seconds TestRunner_mgmt-tester PASS 126.64 seconds TestRunner_rfcomm-tester PASS 11.23 seconds TestRunner_sco-tester PASS 10.92 seconds TestRunner_ioctl-tester PASS 12.14 seconds TestRunner_mesh-tester PASS 8.50 seconds TestRunner_smp-tester PASS 10.29 seconds TestRunner_userchan-tester PASS 7.26 seconds IncrementalBuild FAIL 28.77 seconds
Details
##############################
Test: BuildKernel - FAIL
Desc: Build Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: BuildKernel32 - FAIL
Desc: Build 32bit Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
[v4a,10/38] timers: Bluetooth: Use timer_shutdown_sync() before freeing timer
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
---
Regards,
Linux Bluetooth
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=692348
---Test result---
Test Summary:
CheckPatch PASS 0.89 seconds GitLint PASS 0.28 seconds SubjectPrefix PASS 0.09 seconds BuildKernel FAIL 26.33 seconds BuildKernel32 FAIL 22.61 seconds TestRunnerSetup PASS 433.82 seconds TestRunner_l2cap-tester PASS 16.34 seconds TestRunner_iso-tester PASS 16.08 seconds TestRunner_bnep-tester PASS 5.56 seconds TestRunner_mgmt-tester PASS 108.15 seconds TestRunner_rfcomm-tester PASS 9.46 seconds TestRunner_sco-tester PASS 8.92 seconds TestRunner_ioctl-tester PASS 10.28 seconds TestRunner_mesh-tester PASS 7.01 seconds TestRunner_smp-tester PASS 8.73 seconds TestRunner_userchan-tester PASS 5.90 seconds IncrementalBuild FAIL 24.40 seconds
Details
##############################
Test: BuildKernel - FAIL
Desc: Build Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: BuildKernel32 - FAIL
Desc: Build 32bit Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
[v4a,10/38] timers: Bluetooth: Use timer_shutdown_sync() before freeing timer
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
---
Regards,
Linux Bluetooth
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=692348
---Test result---
Test Summary:
CheckPatch PASS 1.05 seconds GitLint PASS 0.31 seconds SubjectPrefix PASS 0.09 seconds BuildKernel FAIL 32.28 seconds BuildKernel32 FAIL 28.03 seconds TestRunnerSetup PASS 536.04 seconds TestRunner_l2cap-tester PASS 18.88 seconds TestRunner_iso-tester PASS 19.85 seconds TestRunner_bnep-tester PASS 6.78 seconds TestRunner_mgmt-tester PASS 130.63 seconds TestRunner_rfcomm-tester PASS 11.40 seconds TestRunner_sco-tester PASS 10.66 seconds TestRunner_ioctl-tester PASS 12.53 seconds TestRunner_mesh-tester PASS 8.66 seconds TestRunner_smp-tester PASS 10.40 seconds TestRunner_userchan-tester PASS 7.19 seconds IncrementalBuild FAIL 29.62 seconds
Details
##############################
Test: BuildKernel - FAIL
Desc: Build Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: BuildKernel32 - FAIL
Desc: Build 32bit Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
[v4a,10/38] timers: Bluetooth: Use timer_shutdown_sync() before freeing timer
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
---
Regards,
Linux Bluetooth
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=692348
---Test result---
Test Summary:
CheckPatch PASS 0.97 seconds GitLint PASS 0.34 seconds SubjectPrefix PASS 0.12 seconds BuildKernel FAIL 26.26 seconds BuildKernel32 FAIL 22.46 seconds TestRunnerSetup PASS 419.16 seconds TestRunner_l2cap-tester PASS 15.70 seconds TestRunner_iso-tester PASS 15.00 seconds TestRunner_bnep-tester PASS 5.31 seconds TestRunner_mgmt-tester PASS 103.63 seconds TestRunner_rfcomm-tester PASS 9.06 seconds TestRunner_sco-tester PASS 8.54 seconds TestRunner_ioctl-tester PASS 9.69 seconds TestRunner_mesh-tester PASS 6.69 seconds TestRunner_smp-tester PASS 8.43 seconds TestRunner_userchan-tester PASS 5.49 seconds IncrementalBuild FAIL 23.72 seconds
Details
##############################
Test: BuildKernel - FAIL
Desc: Build Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: BuildKernel32 - FAIL
Desc: Build 32bit Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
[v4a,10/38] timers: Bluetooth: Use timer_shutdown_sync() before freeing timer
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
---
Regards,
Linux Bluetooth
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=692348
---Test result---
Test Summary:
CheckPatch PASS 0.87 seconds GitLint PASS 0.29 seconds SubjectPrefix PASS 0.09 seconds BuildKernel FAIL 26.38 seconds BuildKernel32 FAIL 22.62 seconds TestRunnerSetup PASS 429.18 seconds TestRunner_l2cap-tester PASS 16.38 seconds TestRunner_iso-tester PASS 15.93 seconds TestRunner_bnep-tester PASS 5.64 seconds TestRunner_mgmt-tester PASS 111.19 seconds TestRunner_rfcomm-tester PASS 9.57 seconds TestRunner_sco-tester PASS 8.90 seconds TestRunner_ioctl-tester PASS 10.43 seconds TestRunner_mesh-tester PASS 7.11 seconds TestRunner_smp-tester PASS 8.75 seconds TestRunner_userchan-tester PASS 5.86 seconds IncrementalBuild FAIL 23.89 seconds
Details
##############################
Test: BuildKernel - FAIL
Desc: Build Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: BuildKernel32 - FAIL
Desc: Build 32bit Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
[v4a,10/38] timers: Bluetooth: Use timer_shutdown_sync() before freeing timer
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
---
Regards,
Linux Bluetooth
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=692348
---Test result---
Test Summary:
CheckPatch PASS 0.91 seconds GitLint PASS 0.29 seconds SubjectPrefix PASS 0.09 seconds BuildKernel FAIL 26.34 seconds BuildKernel32 FAIL 23.05 seconds TestRunnerSetup PASS 432.68 seconds TestRunner_l2cap-tester PASS 16.08 seconds TestRunner_iso-tester PASS 15.67 seconds TestRunner_bnep-tester PASS 5.53 seconds TestRunner_mgmt-tester PASS 106.96 seconds TestRunner_rfcomm-tester PASS 9.39 seconds TestRunner_sco-tester PASS 8.91 seconds TestRunner_ioctl-tester PASS 10.33 seconds TestRunner_mesh-tester PASS 7.06 seconds TestRunner_smp-tester PASS 8.79 seconds TestRunner_userchan-tester PASS 5.86 seconds IncrementalBuild FAIL 24.65 seconds
Details
##############################
Test: BuildKernel - FAIL
Desc: Build Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: BuildKernel32 - FAIL
Desc: Build 32bit Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
[v4a,10/38] timers: Bluetooth: Use timer_shutdown_sync() before freeing timer
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
---
Regards,
Linux Bluetooth
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=692348
---Test result---
Test Summary:
CheckPatch PASS 0.92 seconds GitLint PASS 0.30 seconds SubjectPrefix PASS 0.10 seconds BuildKernel FAIL 27.59 seconds BuildKernel32 FAIL 23.22 seconds TestRunnerSetup PASS 506.57 seconds TestRunner_l2cap-tester PASS 16.35 seconds TestRunner_iso-tester PASS 16.07 seconds TestRunner_bnep-tester PASS 5.59 seconds TestRunner_mgmt-tester PASS 108.38 seconds TestRunner_rfcomm-tester PASS 9.62 seconds TestRunner_sco-tester PASS 8.95 seconds TestRunner_ioctl-tester PASS 10.39 seconds TestRunner_mesh-tester PASS 7.11 seconds TestRunner_smp-tester PASS 8.85 seconds TestRunner_userchan-tester PASS 5.92 seconds IncrementalBuild FAIL 24.82 seconds
Details
##############################
Test: BuildKernel - FAIL
Desc: Build Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: BuildKernel32 - FAIL
Desc: Build 32bit Kernel for Bluetooth
Output:
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
[v4a,10/38] timers: Bluetooth: Use timer_shutdown_sync() before freeing timer
drivers/bluetooth/hci_bcsp.c: In function ‘bcsp_close’:drivers/bluetooth/hci_bcsp.c:740:2: error: implicit declaration of function ‘timer_shutdown_sync’ [-Werror=implicit-function-declaration]
740 | timer_shutdown_sync(&bcsp->tbcsp);
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/hci_bcsp.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1852: drivers] Error 2
---
Regards,
Linux Bluetooth
Steven Rostedt
reviewerPATCH 11/38 timers: drm: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- drivers/gpu/drm/i915/i915_sw_fence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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);
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 12/38 timers: HID: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- drivers/hid/hid-wiimote-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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);
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 14/38 timers: mISDN: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called, or at least timer_shutdown() (where sync is not possible in the context). Also remove the open coded "shutting down", and remove the unnecessary if statement of timer->function existing before calling timer_shutdown().
--- drivers/isdn/hardware/mISDN/hfcmulti.c | 5 +---- drivers/isdn/mISDN/l1oip_core.c | 4 ++-- drivers/isdn/mISDN/timerdev.c | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-)
drivers/isdn/hardware/mISDN/hfcmulti.c +1 -4
@@ -4543,10 +4543,7 @@ release_port(struct hfc_multi *hc, struct dchannel *dch)spin_lock_irqsave (&hc->lock, flags); -if (dch->timer.function) { -del_timer (&dch->timer); - dch->timer.function =NULL ; - } +timer_shutdown (&dch->timer);if (hc->ctype ==HFC_TYPE_E1 ) {/* E1 */ /* remove sync */
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; }
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 15/38 timers: leds: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- drivers/leds/trigger/ledtrig-pattern.c | 2 +- drivers/leds/trigger/ledtrig-transient.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
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); }
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 16/38 timers: media: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- drivers/media/pci/ivtv/ivtv-driver.c | 2 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 16 ++++++++-------- drivers/media/usb/s2255/s2255drv.c | 4 ++-- .../staging/media/atomisp/i2c/atomisp-lm3554.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-)
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/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);
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 17/38 timers: net: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
And if synchronization is already done, then at least timer_shutdown() needs to be called.
--- 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 +++--- 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/tipc/discover.c | 2 +- net/tipc/monitor.c | 2 +- 27 files changed, 35 insertions(+), 33 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +3 -4
@@ -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);
@@ -16210,8 +16210,7 @@ static void i40e_remove(struct pci_dev *pdev)/* no more scheduling of any task */ 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/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,
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 +1 -1
@@ -904,7 +904,7 @@ void mrp_uninit_applicant(struct net_device *dev, struct mrp_application *appl)* all pending messages before the applicant is gone. */ del_timer_sync (&app->join_timer); -del_timer_sync (&app->periodic_timer); +timer_shutdown_sync (&app->periodic_timer);spin_lock_bh (&app->lock);mrp_mad_event (app,MRP_EVENT_TX );
net/bridge/br_multicast.c +3 -3
@@ -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); }
@@ -671,7 +671,7 @@ static void br_multicast_destroy_port_group(struct net_bridge_mcast_gc *gc)WARN_ON (!hlist_empty (&pg->src_list));del_timer_sync (&pg->rexmit_timer); -del_timer_sync (&pg->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/core/neighbour.c +2 -0
@@ -895,6 +895,8 @@ void neigh_destroy(struct neighbour *neigh)if (neigh_del_timer (neigh))pr_warn ("Impossible event\n" ); +timer_shutdown (&neigh->timer); +write_lock_bh (&neigh->lock);__skb_queue_purge (&neigh->arp_queue);write_unlock_bh (&neigh->lock);
net/ipv4/inet_timewait_sock.c +1 -0
@@ -66,6 +66,7 @@ static void inet_twsk_kill(struct inet_timewait_sock *tw)void inet_twsk_free (struct inet_timewait_sock *tw) {struct module *owner = tw->tw_prot->owner; +timer_shutdown (&tw->tw_timer);twsk_destructor ((struct sock *)tw);#ifdef SOCK_REFCNT_DEBUG pr_debug ("%s timewait_sock %p released\n" , tw->tw_prot->name, tw);
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);
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 18/38 timers: usb: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- drivers/usb/gadget/udc/m66592-udc.c | 2 +- drivers/usb/serial/garmin_gps.c | 2 +- drivers/usb/serial/mos7840.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
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 +1 -1
@@ -1726,7 +1726,7 @@ static void mos7840_port_remove(struct usb_serial_port *port)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_timer2);usb_kill_urb (mos7840_port->led_urb);usb_free_urb (mos7840_port->led_urb);
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 19/38 timers: nfc: pn533: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- drivers/nfc/pn533/pn533.c | 2 +- drivers/nfc/pn533/uart.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
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); }
Signature · 1 line
2.35.1
Re: [PATCH v4a 19/38] timers: nfc: pn533: Use timer_shutdown_sync() before freeing timer
Quoted 6 lines · Steven Rostedt
From: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed,
timer_shutdown_sync()must be called.
Best regards,
Krzysztof
Steven Rostedt
reviewerPATCH 20/38 timers: pcmcia: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- 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 ++-- 5 files changed, 7 insertions(+), 7 deletions(-)
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);
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 21/38 timers: scsi: Use timer_shutdown_sync() and timer_shutdown() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called, or timer_shutdown() if it's already known that the timer is disabled.
--- drivers/scsi/qla2xxx/qla_edif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
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_sync (&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_sync (&edif_entry->timer); ql_dbg(ql_dbg_edif, vha, 0x5033, "%s: releasing edif_entry %p, new sa_index: 0x%x\n",
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 22/38 timers: tty: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- drivers/tty/n_gsm.c | 2 +- drivers/tty/sysrq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
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); }
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 23/38 timers: ext4: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- fs/ext4/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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);
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 24/38 timers: fs/nilfs2: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- fs/nilfs2/segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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); }
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 25/38 timers: ALSA: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- sound/i2c/other/ak4117.c | 2 +- sound/synth/emux/emux.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
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
Steven Rostedt
reviewerPATCH 26/38 timers: jbd2: Use timer_shutdown() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown() must be called. Note that it is assumed that the timer is not running while being freed, so only timer_shutdown() is used, and not timer_shutdown_sync().
--- fs/jbd2/journal.c | 2 ++ 1 file changed, 2 insertions(+)
fs/jbd2/journal.c +2 -0
@@ -2157,6 +2157,8 @@ int jbd2_journal_destroy(journal_t *journal)J_ASSERT (journal->j_checkpoint_transactions ==NULL );spin_unlock (&journal->j_list_lock); +timer_shutdown (&journal->j_commit_timer); +/* * OK, all checkpoint transactions have been checked, now check the * write out io error flag and abort the journal if some buffer failed
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 27/38 timers: sched/psi: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- kernel/sched/psi.c | 1 + 1 file changed, 1 insertion(+)
kernel/sched/psi.c +1 -0
@@ -1033,6 +1033,7 @@ void psi_cgroup_free(struct cgroup *cgroup)cancel_delayed_work_sync (&cgroup->psi->avgs_work);free_percpu (cgroup->psi->pcpu); +timer_shutdown_sync (&cgroup->psi->poll_timer);/* All triggers must be removed by now */ WARN_ONCE (cgroup->psi->poll_states,"psi: trigger leak\n" );kfree (cgroup->psi);
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 28/38 timers: workqueue: Use timer_shutdown_sync() before freeing timer
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is freed, timer_shutdown_sync() must be called.
--- kernel/workqueue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/workqueue.c +2 -2
@@ -3608,8 +3608,8 @@ static void put_unbound_pool(struct worker_pool *pool)wait_for_completion (pool->detach_completion);/* shut down the timers */ -del_timer_sync (&pool->idle_timer); -del_timer_sync (&pool->mayday_timer); +timer_shutdown_sync (&pool->idle_timer); +timer_shutdown_sync (&pool->mayday_timer);/* RCU protected to allow dereferences from get_work_pool() */ call_rcu (&pool->rcu, rcu_free_pool);
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 29/38 random: use timer_shutdown_sync() for on stack timers
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is released, timer_shutdown_sync() must be called.
--- drivers/char/random.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/random.c +1 -1
@@ -1233,7 +1233,7 @@ static void __cold try_to_generate_entropy(void) stack.entropy =random_get_entropy (); } -del_timer_sync (&stack.timer); +timer_shutdown_sync (&stack.timer);destroy_timer_on_stack (&stack.timer);mix_pool_bytes (&stack.entropy,sizeof (stack.entropy)); }
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 30/38 timers: dma-buf: Use timer_shutdown_sync() for on stack timers
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is released, timer_shutdown_sync() must be called.
--- drivers/dma-buf/st-dma-fence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma-buf/st-dma-fence.c +1 -1
@@ -412,7 +412,7 @@ static int test_wait_timeout(void *arg) err =0 ; err_free: -del_timer_sync (&wt.timer); +timer_shutdown_sync (&wt.timer);destroy_timer_on_stack (&wt.timer);dma_fence_signal (wt.f);dma_fence_put (wt.f);
Signature · 1 line
2.35.1
Re: [PATCH v4a 30/38] timers: dma-buf: Use timer_shutdown_sync() for on stack timers
Am 05.11.22 um 07:00 schrieb Steven Rostedt:
Quoted 4 lines
From: "Steven Rostedt (Google)" <[email protected]>
Before a timer is released,
timer_shutdown_sync()must be called.
Quoted 8 lines
Cc Sumit Semwal <[email protected]>Cc "Christian König" <[email protected]>Signed-off-by Steven Rostedt (Google) <[email protected]>
Quoted 17 lines
--- drivers/dma-buf/st-dma-fence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/dma-buf/st-dma-fence.c +1
-1@@ -412,7 +412,7 @@ static int test_wait_timeout(void *arg) err =0 ; err_free: -del_timer_sync (&wt.timer); +timer_shutdown_sync (&wt.timer);destroy_timer_on_stack (&wt.timer);dma_fence_signal (wt.f);dma_fence_put (wt.f);
Steven Rostedt
reviewerPATCH 31/38 timers: drm: Use timer_shutdown_sync() for on stack timers
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is released, timer_shutdown_sync() must be called.
--- drivers/gpu/drm/gud/gud_pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/gud/gud_pipe.c +1 -1
@@ -272,7 +272,7 @@ static int gud_usb_bulk(struct gud_device *gdrm, size_t len)usb_sg_wait (&ctx.sgr); -if (!del_timer_sync (&ctx.timer)) +if (!timer_shutdown_sync (&ctx.timer)) ret = -ETIMEDOUT ;else if (ctx.sgr.status <0 ) ret = ctx.sgr.status;
Signature · 1 line
2.35.1
Re: [PATCH v4a 31/38] timers: drm: Use timer_shutdown_sync() for on stack timers
Den 05.11.2022 07.00, skrev Steven Rostedt:
Quoted 16 lines
From: "Steven Rostedt (Google)" <[email protected]>
Before a timer is released,
timer_shutdown_sync()must be called.Cc "Noralf Trønnes" <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Tvrtko Ursulin <[email protected]>Signed-off-by Steven Rostedt (Google) <[email protected]>
Quoted 1 line
---
Quoted 16 lines
drivers/gpu/drm/gud/gud_pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/gud/gud_pipe.c +1
-1@@ -272,7 +272,7 @@ static int gud_usb_bulk(struct gud_device *gdrm, size_t len)usb_sg_wait (&ctx.sgr); -if (!del_timer_sync (&ctx.timer)) +if (!timer_shutdown_sync (&ctx.timer)) ret = -ETIMEDOUT ;else if (ctx.sgr.status <0 ) ret = ctx.sgr.status;
Steven Rostedt
reviewerPATCH 32/38 timers: media: Use timer_shutdown_sync() for on stack timers
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a timer is released, timer_shutdown_sync() must be called.
--- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/usb/pvrusb2/pvrusb2-hdw.c +1 -1
@@ -3722,7 +3722,7 @@ status); hdw->cmd_debug_state =5 ;/* Stop timer */ -del_timer_sync (&timer.timer); +timer_shutdown_sync (&timer.timer); hdw->cmd_debug_state =6 ; status =0 ;
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 33/38 timers: s390/cmm: Use timer_shutdown_sync() before a module is released
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a module is released, timer_shutdown_sync() must be called on its timers.
Also call it in the failure path of the module init function.
--- arch/s390/mm/cmm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/mm/cmm.c +2 -2
@@ -419,7 +419,7 @@ static int __init cmm_init(void)#endif unregister_sysctl_table (cmm_sysctl_header); out_sysctl: -del_timer_sync (&cmm_timer); +timer_shutdown_sync (&cmm_timer);return rc; }module_init (cmm_init);
@@ -432,7 +432,7 @@ static void __exit cmm_exit(void)#endif unregister_oom_notifier (&cmm_oom_nb);kthread_stop (cmm_thread_ptr); -del_timer_sync (&cmm_timer); +timer_shutdown_sync (&cmm_timer);cmm_free_pages (cmm_pages, &cmm_pages, &cmm_page_list);cmm_free_pages (cmm_timed_pages, &cmm_timed_pages, &cmm_timed_page_list); }
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 34/38 timers: atm: Use timer_shutdown_sync() before a module is released
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a module is released, timer_shutdown_sync() must be called on its timers.
--- drivers/atm/idt77105.c | 4 ++-- drivers/atm/iphase.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/atm/idt77105.c +2 -2
@@ -366,8 +366,8 @@ EXPORT_SYMBOL(idt77105_init); static void __exit idt77105_exit(void) {/* turn off timers */ -del_timer_sync (&stats_timer); -del_timer_sync (&restart_timer); +timer_shutdown_sync (&stats_timer); +timer_shutdown_sync (&restart_timer); }module_exit (idt77105_exit);
drivers/atm/iphase.c +1 -1
@@ -3280,7 +3280,7 @@ static void __exit ia_module_exit(void) {pci_unregister_driver (&ia_driver); -del_timer_sync (&ia_timer); +timer_shutdown_sync (&ia_timer); }module_init (ia_module_init);
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 35/38 timers: hangcheck: Use timer_shutdown_sync() before a module is released
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a module is released, timer_shutdown_sync() must be called on its timers.
Also fixed some whitespace issues in the line after.
--- drivers/char/hangcheck-timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/hangcheck-timer.c +2 -2
@@ -167,8 +167,8 @@ static int __init hangcheck_init(void) static void __exit hangcheck_exit(void) { -del_timer_sync (&hangcheck_ticktock); -printk ("Hangcheck: Stopped hangcheck timer.\n" ); +timer_shutdown_sync (&hangcheck_ticktock); +printk ("Hangcheck: Stopped hangcheck timer.\n" ); }module_init (hangcheck_init);
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 36/38 timers: ipmi: Use timer_shutdown_sync() before a module is released
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Before a module is released, timer_shutdown_sync() must be called on its timers.
--- drivers/char/ipmi/ipmi_msghandler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/ipmi/ipmi_msghandler.c +1 -1
@@ -5540,7 +5540,7 @@ static void __exit cleanup_ipmi(void)* here. */ atomic_set (&stop_operation,1 ); -del_timer_sync (&ipmi_timer); +timer_shutdown_sync (&ipmi_timer); initialized = false;
Signature · 1 line
2.35.1
Steven Rostedt
reviewerPATCH 38/38 timers: PM: Use timer_shutdown_sync()
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
Instead of open coding making the timer look like it was not registered by setting the function pointer to NULL, call timer_shutdown_sync() that does the same thing.
--- drivers/base/power/wakeup.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/base/power/wakeup.c +1 -6
@@ -202,12 +202,7 @@ void wakeup_source_remove(struct wakeup_source *ws)raw_spin_unlock_irqrestore (&events_lock, flags);synchronize_srcu (&wakeup_srcu); -del_timer_sync (&ws->timer); -/* -* Clear timer.function to make wakeup_source_not_registered() treat -* this wakeup source as not registered. -*/ - ws->timer.function =NULL ; +timer_shutdown_sync (&ws->timer); }EXPORT_SYMBOL_GPL (wakeup_source_remove);
Signature · 1 line
2.35.1
Quoted 8 lines · Steven Rostedt
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.
Quoted 9 lines
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.
Just in case you didn't notice:
Looking through the resulting code, I think some of the remaining calls to del_singleshot_timer_sync() can be converted as well.
The calls in drivers/staging/wlan-ng/prism2usb.c:prism2sta_disconnect_usb() are obvious (the containing data structure is freed in the same function). For drivers/char/tpm/tpm-dev-common.c:tpm_common_release(), the containing data structure is freed in the calling code.
Thanks,
Guenter
Steven Rostedt
reviewerQuoted 9 lines · On Sat, 5 Nov 2022 07:18:17 -0700 Guenter Roeck <[email protected]> wrote:
Just in case you didn't notice:
Looking through the resulting code, I think some of the remaining calls to
del_singleshot_timer_sync()can be converted as well.The calls in drivers/staging/wlan-ng/prism2usb.c:prism2sta_disconnect_usb() are obvious (the containing data structure is freed in the same function). For drivers/char/tpm/tpm-dev-common.c:tpm_common_release(), the containing data structure is freed in the calling code.
Well, actually it is. In patch 5/38:
-#define del_singleshot_timer_sync(t) del_timer_sync(t) +#define del_singleshot_timer_sync(t) timer_shutdown_sync(t)
This was the reason for patch 1. It was the only user of that function that reused the timer after calling that function.
-- Steve
Quoted 4 lines · Steven Rostedt
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.
So this is the kind of thing that I would *not* want to get eartly.
I really would want to get just the infrastructure in to let people start doing conversions.
And then the "mindlessly obvious patches that are done by scripting and can not possibly matter".
The kinds that do not *need* review, because they are mechanical, and that just cause pointless noise for the rest of the patches that *do* want review.
Not this kind of thing that is so subtle that you have to explain it. That's not a "scripted patch for no semantic change".
So leave the del_singleshot_timer_sync() cases alone, they are irrelevant for the new infrastructure and for the "mindless scripted conversion" patches.
Quoted 2 lines
Patches 2-4 changes existing
timer_shutdown()functions used locally in ARM and some drivers to better namespace names.
Ok, these are relevant.
Quoted 2 lines
Patch 5 implements the new
timer_shutdown()andtimer_shutdown_sync()functions that disable re-arming the timer after they are called.
This is obviously what I'd want early so that people can start doign this in their trees.
Quoted 5 lines
Patches 6-28 change all the locations where there's a
kfree(),kfree_rcu(),kmem_cache_free()and onecall_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 thedel_timerand freeing of the timer.
So honestly, I was literally hoping for a "this is the coccinelle script" kind of patch.
Now there seems to be a number of patches here that are actualyl really hard to see that they are "obviously correct" and I can't tell if they are actually scripted or not.
They don't *look* scripted, but I can't really tell. I looked at the patches with ten lines of context, and I didn't see the immediately following kfree() even in that expanded patch context, so it's fairly far away.
Others in the series were *definitely* not scripted, doing clearly manual cleanups:
- if (dch->timer.function) {
- del_timer(&dch->timer);
- dch->timer.function = NULL;
- }
+ timer_shutdown(&dch->timer);
so no, this does *not* make me feel "ok, this is all trivial".
IOW, I'd really want *just* the infrastructure and *just* the provably trivial stuff. If it wasn't some scripted really obvious thing that cannot possibly change anything and that wasn't then edited manually for some reason, I really don't want it early.
IOW, any early conversions I'd take are literally about removing pure mindless noise. Not about doing conversions.
And I wouldn't mind it as a single conversion patch that has the coccinelle script as the explanation.
Really just THAT kind of "100% mindless conversion".
Linus
Steven Rostedt
reviewerQuoted 7 lines · On Sat, 5 Nov 2022 08:59:36 -0700 Linus Torvalds…
Quoted 4 lines · Steven Rostedt
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.So this is the kind of thing that I would *not* want to get eartly.
So I'll have to break up patch 5 to not update the del_singleshot_timer_sync() to a timer_shutdown_sync(), because that breaks this code.
Hmm, since that is a functional change, it probably should wait till the merge window. I'll move this patch and that part of patch 5 to the second part of the series for the merge window.
Quoted 21 lines
I really would want to get just the infrastructure in to let people start doing conversions.
And then the "mindlessly obvious patches that are done by scripting and can not possibly matter".
The kinds that do not *need* review, because they are mechanical, and that just cause pointless noise for the rest of the patches that *do* want review.
Not this kind of thing that is so subtle that you have to explain it. That's not a "scripted patch for no semantic change".
So leave the
del_singleshot_timer_sync()cases alone, they are irrelevant for the new infrastructure and for the "mindless scripted conversion" patches.Quoted 2 lines
Patches 2-4 changes existing
timer_shutdown()functions used locally in ARM and some drivers to better namespace names.
Quoted 7 lines
Ok, these are relevant.
Quoted 2 lines
Patch 5 implements the new
timer_shutdown()andtimer_shutdown_sync()functions that disable re-arming the timer after they are called.This is obviously what I'd want early so that people can start doign this in their trees.
But will need to remove the part that it changes del_singleshot_timer_sync().
Quoted 9 lines
Quoted 6 lines
Patches 6-28 change all the locations where there's a
kfree(),kfree_rcu(),kmem_cache_free()and onecall_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 thedel_timerand freeing of the timer.So honestly, I was literally hoping for a "this is the coccinelle script" kind of patch.
The above actual was, but I walked through them manually too, because I don't trust my conccinelle skills. All but the call_rcu() one was caught by conccinelle. That's why I pointed out the worqueue one. I'll remove that from this series.
Quoted 4 lines
Now there seems to be a number of patches here that are actualyl really hard to see that they are "obviously correct" and I can't tell if they are actually scripted or not.
Yes they are. The script that found these were:
----------------------8<------------------------
@@
identifier ptr, timer, rfield, slab;
@@
(
- del_timer(&ptr->timer);
+ timer_shutdown(&ptr->timer);
|
- del_timer_sync(&ptr->timer);
+ timer_shutdown_sync(&ptr->timer);
)
... ( kfree_rcu(ptr, rfield); | kmem_cache_free(slab, ptr); | kfree(ptr);
)
---------------------->8------------------------
So any function that had a del_timer*(&obj->timer) and then that obj was freed with kfree(), kfree_rcu() or kmem_cache_free() was updated.
What I did manually was to make sure there was no exit of the routine between those two calls. I'm sure coccinelle could do that too, but I'm not good enough at it to add that feature.
The reason the patches don't look obvious is because the distance between the del_timer() and the free may be quite far. I walked through these patches at least 3 times manually to make sure they are all OK.
Quoted 5 lines
They don't *look* scripted, but I can't really tell. I looked at the patches with ten lines of context, and I didn't see the immediately following
kfree()even in that expanded patch context, so it's fairly far away.
Yes, some are like a 100 lines away.
Quoted 11 lines
Others in the series were *definitely* not scripted, doing clearly manual cleanups:
(quoted diff) +1
-4- if (dch->timer.function) { - del_timer(&dch->timer); - dch->timer.function = NULL; - } + timer_shutdown(&dch->timer);so no, this does *not* make me feel "ok, this is all trivial".
Sorry, I'll remove that. It's basically open-coding the timer_shutdown() as the way it shuts down the timer is simply by setting the timer.function to NULL.
Quoted 11 lines
IOW, I'd really want *just* the infrastructure and *just* the provably trivial stuff. If it wasn't some scripted really obvious thing that cannot possibly change anything and that wasn't then edited manually for some reason, I really don't want it early.
IOW, any early conversions I'd take are literally about removing pure mindless noise. Not about doing conversions.
And I wouldn't mind it as a single conversion patch that has the coccinelle script as the explanation.
I'll need to update the coccinelle script (or ask someone to give me a fix) that catches the case of:
del_timer(&obj->timer); if (x) goto out; kfree(obj);
out:
return;
I'm sure it's a trivial change. I'll look into it some more.
I'm guessing you don't care about the case of:
del_timer(&obj->timer); if (x) goto label;
label:
kfree(obj);
As that's a bit more complex if we avoid the first goto case? Even though the second case is obviously correct.
I believe both of these cases exist in the kernel. I manually removed the places that my script found for the first case.
Quoted 2 lines
Really just THAT kind of "100% mindless conversion".
I'll look at making the most obviously correct case, where del_timer and kfree have no goto or returns between them. We can always add the rest in the merge window.
-- Steve
Steven Rostedt
reviewerQuoted 67 lines · On Sat, 5 Nov 2022 12:36:42 -0400 Steven Rostedt <[email protected]> wrote:
Quoted 7 lines · On Sat, 5 Nov 2022 08:59:36 -0700 Linus Torvalds…
Quoted 4 lines · Steven Rostedt
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.So this is the kind of thing that I would *not* want to get eartly.
So I'll have to break up patch 5 to not update the
del_singleshot_timer_sync()to atimer_shutdown_sync(), because that breaks this code.Hmm, since that is a functional change, it probably should wait till the merge window. I'll move this patch and that part of patch 5 to the second part of the series for the merge window.
Quoted 21 lines
I really would want to get just the infrastructure in to let people start doing conversions.
And then the "mindlessly obvious patches that are done by scripting and can not possibly matter".
The kinds that do not *need* review, because they are mechanical, and that just cause pointless noise for the rest of the patches that *do* want review.
Not this kind of thing that is so subtle that you have to explain it. That's not a "scripted patch for no semantic change".
So leave the
del_singleshot_timer_sync()cases alone, they are irrelevant for the new infrastructure and for the "mindless scripted conversion" patches.Quoted 2 lines
Patches 2-4 changes existing
timer_shutdown()functions used locally in ARM and some drivers to better namespace names.Quoted 7 lines
Ok, these are relevant.
Quoted 2 lines
Patch 5 implements the new
timer_shutdown()andtimer_shutdown_sync()functions that disable re-arming the timer after they are called.This is obviously what I'd want early so that people can start doign this in their trees.
But will need to remove the part that it changes
del_singleshot_timer_sync().Quoted 9 lines
Quoted 6 lines
Patches 6-28 change all the locations where there's a
kfree(),kfree_rcu(),kmem_cache_free()and onecall_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 thedel_timerand freeing of the timer.So honestly, I was literally hoping for a "this is the coccinelle script" kind of patch.
The above actual was, but I walked through them manually too, because I don't trust my conccinelle skills. All but the
call_rcu()one was caught by conccinelle. That's why I pointed out the worqueue one. I'll remove that from this series.Quoted 1 line
Quoted 6 lines
Quoted 3 lines
Now there seems to be a number of patches here that are actualyl really hard to see that they are "obviously correct" and I can't tell if they are actually scripted or not.
Yes they are. The script that found these were:
Julia,
Perhaps you can help me here. I have the following script to find places that call del_timer*() that need to be converted to timer_shutdown*() if later on in the same function the timer is being freed.
Quoted 18 lines
----------------------8<------------------------
@@
identifier ptr, timer, rfield, slab;
@@
((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);)
... ( kfree_rcu(ptr, rfield); | kmem_cache_free(slab, ptr); | kfree(ptr);
Quoted 3 lines
)
---------------------->8------------------------
Above is the code I used. But it gets more than it should, see below.
Quoted 58 lines
So any function that had a del_timer*(&obj->timer) and then that obj was freed with
kfree(),kfree_rcu()orkmem_cache_free()was updated.What I did manually was to make sure there was no exit of the routine between those two calls. I'm sure coccinelle could do that too, but I'm not good enough at it to add that feature.
The reason the patches don't look obvious is because the distance between the
del_timer()and the free may be quite far. I walked through these patches at least 3 times manually to make sure they are all OK.Quoted 5 lines
They don't *look* scripted, but I can't really tell. I looked at the patches with ten lines of context, and I didn't see the immediately following
kfree()even in that expanded patch context, so it's fairly far away.Yes, some are like a 100 lines away.
Quoted 11 lines
Others in the series were *definitely* not scripted, doing clearly manual cleanups:
(quoted diff) +1
-4- if (dch->timer.function) { - del_timer(&dch->timer); - dch->timer.function = NULL; - } + timer_shutdown(&dch->timer);so no, this does *not* make me feel "ok, this is all trivial".
Sorry, I'll remove that. It's basically open-coding the
timer_shutdown()as the way it shuts down the timer is simply by setting the timer.function to NULL.Quoted 11 lines
IOW, I'd really want *just* the infrastructure and *just* the provably trivial stuff. If it wasn't some scripted really obvious thing that cannot possibly change anything and that wasn't then edited manually for some reason, I really don't want it early.
IOW, any early conversions I'd take are literally about removing pure mindless noise. Not about doing conversions.
And I wouldn't mind it as a single conversion patch that has the coccinelle script as the explanation.
I'll need to update the coccinelle script (or ask someone to give me a fix) that catches the case of:
del_timer(&obj->timer); if (x) goto out; kfree(obj);
Quoted 3 lines
out:
return;
The above should not be converted.
Quoted 5 lines
I'm sure it's a trivial change. I'll look into it some more.
I'm guessing you don't care about the case of:
Quoted 8 lines
del_timer(&obj->timer); if (x) goto label;label:
kfree(obj);
Although the above is fine, we probably shouldn't covert it for the rc release.
I need a way to determine if something gets patched based on what happens later, not before. Could you tell me how to go about that in Coccinelle?
Thanks!
-- Steve
Quoted 15 lines
As that's a bit more complex if we avoid the first goto case? Even though the second case is obviously correct.
I believe both of these cases exist in the kernel. I manually removed the places that my script found for the first case.
Quoted 2 lines
Really just THAT kind of "100% mindless conversion".
I'll look at making the most obviously correct case, where
del_timerand kfree have no goto or returns between them. We can always add the rest in the merge window.-- Steve
Steven Rostedt
reviewerQuoted 18 lines · On Sat, 5 Nov 2022 12:36:42 -0400 Steven Rostedt <[email protected]> wrote:
----------------------8<------------------------
@@
identifier ptr, timer, rfield, slab;
@@
((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);)
... ( kfree_rcu(ptr, rfield); | kmem_cache_free(slab, ptr); | kfree(ptr);
Quoted 2 lines
)
---------------------->8------------------------
Below is the result of the above patch, but I did do the following modifications because of the one case where it it exited the function after the del_timer(). And the other case was that it doesn't handle multiple timers for the same object.
Here's the changes I made after running the script:
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); -timer_shutdown_sync (&baid_data->session_timer); +del_timer_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/microchip/wilc1000/hif.c +2 -2
@@ -1520,8 +1520,8 @@ 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);timer_shutdown_sync (&hif_drv->remain_on_ch_timer);
And below is the script plus the above changes:
Is that acceptable after adding patches 2-5 and removing the del_singleshot_timer_sync() change?
-- Steve
From: "Steven Rostedt (Google)" <[email protected]>
Subject: [PATCH] treewide: Convert del_timer*() to timer_shutdown*()
I used the coccinelle script to make the below changes:
@@
identifier ptr, timer, rfield, slab;
@@
(
- del_timer(&ptr->timer);
+ timer_shutdown(&ptr->timer);
|
- del_timer_sync(&ptr->timer);
+ timer_shutdown_sync(&ptr->timer);
)
... ( 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 | 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/isdn/hardware/mISDN/hfcmulti.c | 2 +- drivers/isdn/mISDN/l1oip_core.c | 2 +- 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 | 4 ++-- 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/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/nilfs2/segment.c | 2 +- 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/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, 82 insertions(+), 82 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 +1 -1
@@ -698,7 +698,7 @@ static int qca_close(struct hci_uart *hu)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->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/hardware/mISDN/hfcmulti.c +1 -1
@@ -4544,7 +4544,7 @@ release_port(struct hfc_multi *hc, struct dchannel *dch)spin_lock_irqsave (&hc->lock, flags);if (dch->timer.function) { -del_timer (&dch->timer); +timer_shutdown (&dch->timer); dch->timer.function =NULL ; }
drivers/isdn/mISDN/l1oip_core.c +1 -1
@@ -1237,7 +1237,7 @@ release_card(struct l1oip *hc) hc->shutdown = true;del_timer_sync (&hc->keep_tl); -del_timer_sync (&hc->timeout_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 +2 -2
@@ -2608,7 +2608,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,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->encoder_wait_timer);flush_work (&hdw->workpoll);v4l2_device_unregister (&hdw->v4l2_dev);usb_free_urb (hdw->ctl_read_urb);
@@ -2671,7 +2671,7 @@ void pvr2_hdw_destroy(struct pvr2_hdw *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->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/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 +1 -1
@@ -1726,7 +1726,7 @@ static void mos7840_port_remove(struct usb_serial_port *port)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_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 +1 -1
@@ -904,7 +904,7 @@ void mrp_uninit_applicant(struct net_device *dev, struct mrp_application *appl)* all pending messages before the applicant is gone. */ del_timer_sync (&app->join_timer); -del_timer_sync (&app->periodic_timer); +timer_shutdown_sync (&app->periodic_timer);spin_lock_bh (&app->lock);mrp_mad_event (app,MRP_EVENT_TX );
net/bridge/br_multicast.c +3 -3
@@ -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); }
@@ -671,7 +671,7 @@ static void br_multicast_destroy_port_group(struct net_bridge_mcast_gc *gc)WARN_ON (!hlist_empty (&pg->src_list));del_timer_sync (&pg->rexmit_timer); -del_timer_sync (&pg->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
Steven Rostedt
reviewerdrivers/isdn/hardware/mISDN/hfcmulti.c release_port(struct hfc_multi *hc, struct dchannel *dch) · line 4550
Quoted 11 lines · On Sat, 5 Nov 2022 14:03:56 -0400 Steven Rostedt <[email protected]> wrote:
drivers/isdn/hardware/mISDN/hfcmulti.c +1
-1@@ -4544,7 +4544,7 @@ release_port(struct hfc_multi *hc, struct dchannel *dch)spin_lock_irqsave (&hc->lock, flags);if (dch->timer.function) { -del_timer (&dch->timer); +timer_shutdown (&dch->timer); dch->timer.function =NULL ; }
I still hate the above.
-- Steve
Quoted 2 lines · Steven Rostedt
Here's the changes I made after running the script
Please. No.
What part of "I don't want extra crud" was I unclear on?
I'm not interested in converting everything. That's clearly a 6.,2 issue, possibly even longer considering how complicated the networking side has been.
I'm not AT ALL interested in "oh, I then added my own small cleanups on top to random files because I happened to notice them".
Repeat after me: "If the script didn't catch them, they weren't trivially obvious".
And it does seem that right now the script itself is a bit too generous, which is why it didn't notice that sometimes there wasn't a kfree after all because of a goto around it. So clearly that "..." doesn't really work, I think it accepts "_any_ path leads to the second situation" rather than "_all_ paths lead to the second situation".
But yeah, my coccinelle-foo is very weak too, and maybe there's no pattern for "no flow control".
I would also like the coccinelle script to notice the "timer is used afterwards", so that it does *not* modify that case that does
del_timer(&dch->timer);
dch->timer.function = NULL;since now the timer is modified in between the del_timer() and the kfree.
Again, that timer modification is then made pointless by changing the del_timer() to a "timer_shutdown()", but at that point it is no longer a "so obvious non-semantic change that it should be scripted". At that point it's a manual thing.
So I think the "..." in your script should be "no flow control, and no access to the timer", but do not know how to do that in coccinelle.
Julia?
And this thread has way too many participants, I suspect some email systems will just mark it as spam as a result. Which is partly *why* I would like to get rid of noisy changes that really don't matter - but I would like it to be truly mindlessly obvious that there are *zero* questions about it, and absolutely no manual intervention because the patch is so strict that it's just unquestionably correct.
Linus
Steven Rostedt
reviewerQuoted 7 lines · On Sat, 5 Nov 2022 11:28:33 -0700 Linus Torvalds…
Quoted 2 lines · Steven Rostedt
Here's the changes I made after running the script
Please. No.
What part of "I don't want extra crud" was I unclear on?
The first one was a false change. That is, the script *did* catch it, when it should not have. So I reverted the change. The coccinelle documentation even states to look over the changes to see if there are false positives.
The second change is that it frees three timers all for the same object. If you want, I could run the script 2 more times on the same file, and it will catch it then.
Would you be happier if I just ran it three times on that file? I can do that, and it will produce the same result.
Quoted 10 lines
I'm not interested in converting everything. That's clearly a 6.,2 issue, possibly even longer considering how complicated the networking side has been.
I'm not AT ALL interested in "oh, I then added my own small cleanups on top to random files because I happened to notice them".
Repeat after me: "If the script didn't catch them, they weren't trivially obvious".
Of the two clean ups, one was a false positive, so I had to revert it. The other, just needs me to run the script more than once. I can do that, and then I only have the false positive case to clean up.
Quoted 24 lines
And it does seem that right now the script itself is a bit too generous, which is why it didn't notice that sometimes there wasn't a kfree after all because of a goto around it. So clearly that "..." doesn't really work, I think it accepts "_any_ path leads to the second situation" rather than "_all_ paths lead to the second situation".
But yeah, my coccinelle-foo is very weak too, and maybe there's no pattern for "no flow control".
I would also like the coccinelle script to notice the "timer is used afterwards", so that it does *not* modify that case that does
del_timer(&dch->timer); dch->timer.function = NULL;since now the timer is modified in between the
del_timer()and the kfree.Again, that timer modification is then made pointless by changing the
del_timer()to a "timer_shutdown()", but at that point it is no longer a "so obvious non-semantic change that it should be scripted". At that point it's a manual thing.
Quoted 6 lines
So I think the "..." in your script should be "no flow control, and no access to the timer", but do not know how to do that in coccinelle.
Julia?
And this thread has way too many participants, I suspect some email
I was told to make sure the cover letter had all the required mailing lists :-p
I removed them for this email.
Quoted 5 lines
systems will just mark it as spam as a result. Which is partly *why* I would like to get rid of noisy changes that really don't matter - but I would like it to be truly mindlessly obvious that there are *zero* questions about it, and absolutely no manual intervention because the patch is so strict that it's just unquestionably correct.
OK, I'll wait on Julia for an answer on this.
-- Steve
Quoted 16 lines · Steven Rostedt
Quoted 7 lines · On Sat, 5 Nov 2022 11:28:33 -0700 Linus Torvalds…
Quoted 2 lines · Steven Rostedt
Here's the changes I made after running the script
Please. No.
What part of "I don't want extra crud" was I unclear on?
The first one was a false change. That is, the script *did* catch it, when it should not have. So I reverted the change. The coccinelle documentation even states to look over the changes to see if there are false positives.
Quoted 6 lines
The second change is that it frees three timers all for the same object. If you want, I could run the script 2 more times on the same file, and it will catch it then.
Would you be happier if I just ran it three times on that file? I can do that, and it will produce the same result.
Various suggestions:
1. On your ... put when strict and then on a separate line put when != ptr. The when strict will get rid of the goto problem (usually a desirable feature, but not here) and the when != ptr will be sure that ptr is not used before the free.
2. If you want to handle the initialization of the function field, then you can duplicate the rule and add the removal of that assignment in the first one. This only seems worth it if it is a very common case. Otherwise, I would agree with Linus and just take care of it by hand later.
3. Running the rule three times seems to me like a reasonable choice. Or you could duplicate the rule three times. But that would be more script to read through. If this is not a common case, though, you could probably also fix the one up later by hand.
julia
Steven Rostedt
reviewerQuoted 6 lines · On Sun, 6 Nov 2022 07:08:48 +0800 (+08) Julia Lawall <[email protected]>…
Various suggestions:
1. On your ... put when strict and then on a separate line put when != ptr. The when strict will get rid of the goto problem (usually a desirable feature, but not here) and the when != ptr will be sure that ptr is not used before the free.
You mean ptr->timer.function? because it's allowed to be touched. Only this case is weird (and I believe I covered it).
Not sure what you mean by "put when strict" I added:
... when strict
Thinking that's what you meant (examples would be easier to understand, than descriptions). And it didn't cover the return case. Does it only cover gotos?
See drivers/net/wireless/intel/iwlwifi/mvm/sta.c for the false positive case:
del_timer_sync(&baid_data->session_timer);
[..]
return 0;out_free:
kfree(baid_data);
return ret;
}That "return 0" should make the match fail.
Quoted 6 lines
2. If you want to handle the initialization of the function field, then you can duplicate the rule and add the removal of that assignment in the first one. This only seems worth it if it is a very common case. Otherwise, I would agree with Linus and just take care of it by hand later.
No, Linus wants the script to not touch the initialization case. That is, currently, the script does the conversion (which also initializes it), and the timer.function = NULL is just redundant.
What Linus wanted, was my script to do nothing in this case. But I figured this part out.
Quoted 5 lines
3. Running the rule three times seems to me like a reasonable choice. Or you could duplicate the rule three times. But that would be more script to read through. If this is not a common case, though, you could probably also fix the one up later by hand.
Yeah, that's fine.
I'm just looking for how to avoid the goto / return case.
-- Steve
Quoted 5 lines · Steven Rostedt
Quoted 2 lines · On Sun, 6 Nov 2022 07:08:48 +0800 (+08) Julia Lawall <[email protected]>…
Various suggestions:
Quoted 7 lines
Quoted 4 lines
1. On your ... put when strict and then on a separate line put when != ptr. The when strict will get rid of the goto problem (usually a desirable feature, but not here) and the when != ptr will be sure that ptr is not used before the free.
You mean
ptr->timer.function? because it's allowed to be touched. Only this case is weird (and I believe I covered it).
I thought when != ptr to be on the safe side. But you can put whatever seems appropriate. when != ptr will protect against references to ptr->timer.function too.
Quoted 4 lines
Not sure what you mean by "put when strict" I added:
... when strict
Exactly.
Quoted 3 lines
Thinking that's what you meant (examples would be easier to understand, than descriptions). And it didn't cover the return case. Does it only cover gotos?
It should cover both gotos and returns. I will check on it. Thanks for the example.
Quoted 36 lines
See
drivers/net/wireless/intel/iwlwifi/mvm/sta.cfor the false positive case:del_timer_sync(&baid_data->session_timer); [..] return 0;
out_free:kfree(baid_data); return ret; }That "return 0" should make the match fail.
Quoted 6 lines
2. If you want to handle the initialization of the function field, then you can duplicate the rule and add the removal of that assignment in the first one. This only seems worth it if it is a very common case. Otherwise, I would agree with Linus and just take care of it by hand later.
No, Linus wants the script to not touch the initialization case. That is, currently, the script does the conversion (which also initializes it), and the timer.function = NULL is just redundant.
What Linus wanted, was my script to do nothing in this case. But I figured this part out.
Quoted 5 lines
3. Running the rule three times seems to me like a reasonable choice. Or you could duplicate the rule three times. But that would be more script to read through. If this is not a common case, though, you could probably also fix the one up later by hand.
Yeah, that's fine.
I'm just looking for how to avoid the goto / return case.
Quoted 17 lines · Steven Rostedt
Quoted 6 lines · On Sun, 6 Nov 2022 07:08:48 +0800 (+08) Julia Lawall <[email protected]>…
Various suggestions:
1. On your ... put when strict and then on a separate line put when != ptr. The when strict will get rid of the goto problem (usually a desirable feature, but not here) and the when != ptr will be sure that ptr is not used before the free.
You mean
ptr->timer.function? because it's allowed to be touched. Only this case is weird (and I believe I covered it).Not sure what you mean by "put when strict" I added:
... when strict
Quoted 8 lines
Thinking that's what you meant (examples would be easier to understand, than descriptions). And it didn't cover the return case. Does it only cover gotos?
See
drivers/net/wireless/intel/iwlwifi/mvm/sta.cfor the false positive case:del_timer_sync(&baid_data->session_timer);[..]
But there is a kfree_rcu(baid_data, rcu_head); right below. So it looks fine?
julia
Quoted 35 lines
return 0;
out_free:kfree(baid_data); return ret; }That "return 0" should make the match fail.
Quoted 6 lines
2. If you want to handle the initialization of the function field, then you can duplicate the rule and add the removal of that assignment in the first one. This only seems worth it if it is a very common case. Otherwise, I would agree with Linus and just take care of it by hand later.
No, Linus wants the script to not touch the initialization case. That is, currently, the script does the conversion (which also initializes it), and the timer.function = NULL is just redundant.
What Linus wanted, was my script to do nothing in this case. But I figured this part out.
Quoted 5 lines
3. Running the rule three times seems to me like a reasonable choice. Or you could duplicate the rule three times. But that would be more script to read through. If this is not a common case, though, you could probably also fix the one up later by hand.
Yeah, that's fine.
I'm just looking for how to avoid the goto / return case.
-- Steve
Steven Rostedt
reviewerQuoted 11 lines · On Sun, 6 Nov 2022 11:05:14 +0800 (+08) Julia Lawall <[email protected]>…
Quoted 8 lines
Thinking that's what you meant (examples would be easier to understand, than descriptions). And it didn't cover the return case. Does it only cover gotos?
See
drivers/net/wireless/intel/iwlwifi/mvm/sta.cfor the false positive case:del_timer_sync(&baid_data->session_timer);[..]
But there is a
kfree_rcu(baid_data, rcu_head); right below. So it looks fine?
D'oh! I think you are correct. I didn't trust the script and it appears that it was correct all along. The free was hidden in between the code and I only noticed the kfree() in the error path. I thought that was a bug in the script. :-/
I guess there were no false positives then. To be sure, I'll write a script to find all that have a return or goto in between and see what it comes up with.
I guess my original patch doesn't need any changes from the script. I'll look more.
Thanks Julia!
-- Steve
Quoted 20 lines · Steven Rostedt
Quoted 11 lines · On Sun, 6 Nov 2022 11:05:14 +0800 (+08) Julia Lawall <[email protected]>…
Quoted 8 lines
Thinking that's what you meant (examples would be easier to understand, than descriptions). And it didn't cover the return case. Does it only cover gotos?
See
drivers/net/wireless/intel/iwlwifi/mvm/sta.cfor the false positive case:del_timer_sync(&baid_data->session_timer);[..]
But there is a
kfree_rcu(baid_data, rcu_head); right below. So it looks fine?D'oh! I think you are correct. I didn't trust the script and it appears that it was correct all along. The free was hidden in between the code and I only noticed the
kfree()in the error path. I thought that was a bug in the script. :-/
Quoted 6 lines
I guess there were no false positives then. To be sure, I'll write a script to find all that have a return or goto in between and see what it comes up with.
I guess my original patch doesn't need any changes from the script. I'll look more.
You could also consider expression ptr; rather than identifier ptr; if ptr can be eg x->y. But if you have akready found all the calls with the current script, then no need to be more general.
julia
Jason A. Donenfeld
maintainerQuoted 18 lines · Steven Rostedt
----------------------8<------------------------
@@
identifier ptr, timer, rfield, slab;
@@
((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);)
... ( kfree_rcu(ptr, rfield); | kmem_cache_free(slab, ptr); | kfree(ptr);
Quoted 2 lines
)
---------------------->8------------------------
Something that might help here is changing the ... into ... when exists or into ... when != ptr or similar. See this section of the manual:
https://coccinelle.gitlabpages.inria.fr/website/docs/main_grammar004.html
Jason
Quoted 3 lines · Jason A. Donenfeld
Something that might help here is changing the
...into... when existsor into... when != ptror similar.
I actually tried that.
You don't want "when exists", you'd want "when forall", but that seems to be the default.
And trying "when != ptr->timer" actually does the right thing in that it gets rid of the case where the timer is modified outside of the del_timer() case, *but* it also causes odd other changes to the output.
Look at what it generates for that
drivers/media/usb/pvrusb2/pvrusb2-hdw.c
file, which finds a lot of triggers with the "when != ptr->timer", but only does one without it.
So I gave up, just because I clearly don't understand the rules.
(Comparing output is also fun because the ordering of the patches is random, so consecutive runs with the same rule will give different patches. I assume that it's just because it's done in parallel, but it doesn't help the "try to see what changes when you change the script" ;)
Linus
Steven Rostedt
reviewerQuoted 11 lines · On Sat, 5 Nov 2022 14:13:14 -0700 Linus Torvalds…
And trying "when !=
ptr->timer" actually does the right thing in that it gets rid of the case where the timer is modified outside of thedel_timer()case, *but* it also causes odd other changes to the output.Look at what it generates for that
drivers/media/usb/pvrusb2/pvrusb2-hdw.cfile, which finds a lot of triggers with the "when !=
ptr->timer", but only does one without it.
I added an expression, and it appears to work:
At least for this case.
@@
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 != ptr->timer.function = E;
(
kfree_rcu(ptr, rfield);
|
kmem_cache_free(slab, ptr);
|
kfree(ptr);)
Now I need to add return and goto cases here.
-- Steve
Steven Rostedt
reviewerQuoted 5 lines · On Sat, 5 Nov 2022 14:13:14 -0700 Linus Torvalds…
(Comparing output is also fun because the ordering of the patches is random, so consecutive runs with the same rule will give different patches. I assume that it's just because it's done in parallel, but it doesn't help the "try to see what changes when you change the script" ;)
What I do to compare is:
patch -p1 < cocci1.patch
git commit -a
git show | patch -p1 -R
patch -p1 < cocci2.patch
git diff
Then I see how things changed. This is how I was able to show you the tweaks I made.
-- Steve
Steven Rostedt
reviewerQuoted 10 lines · On Sat, 5 Nov 2022 08:59:36 -0700 Linus Torvalds…
Others in the series were *definitely* not scripted, doing clearly manual cleanups:
(quoted diff) +1
-4- if (dch->timer.function) { - del_timer(&dch->timer); - dch->timer.function = NULL; - } + timer_shutdown(&dch->timer);so no, this does *not* make me feel "ok, this is all trivial".
I just ran the script and the above code turned to:
drivers/isdn/hardware/mISDN/hfcmulti.c +1 -1
@@ -4544,7 +4544,7 @@ release_port(struct hfc_multi *hc, struct dchannel *dch)spin_lock_irqsave (&hc->lock, flags);if (dch->timer.function) { -del_timer (&dch->timer); +timer_shutdown (&dch->timer); dch->timer.function =NULL ; }
Which is silly. Because timer_shutdown() makes timer.function = NULL.
That's why I changed it. And it really shouldn't be touching timer.function anyway.
-- Steve
Quoted 8 lines · Steven Rostedt
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.
Quoted 9 lines
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.
For the series, as far as my testbed goes:
Build results:
total: 152 pass: 152 fail: 0 Qemu test results: total: 500 pass: 500 fail: 0
No runtime crashes or warnings observed.
Guenter