diff mbox

Revert "net/sch_generic: Shut up noise"

Message ID 20180529071522.31147-1-daniel.vetter@ffwll.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Vetter May 29, 2018, 7:15 a.m. UTC
This reverts commit c5cab0d5fc9aa1cf14c7bc7ea88c80155e46e22f.

Jani believes the noise is gone, so let's see whether it's really
gone, before we drop this hack.

Cc: "Saarinen, Jani" <jani.saarinen@intel.com>
Cc: Martin Peres <martin.peres@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 net/sched/sch_generic.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Daniel Vetter June 25, 2018, 4:07 p.m. UTC | #1
On Tue, May 29, 2018 at 09:15:22AM +0200, Daniel Vetter wrote:
> This reverts commit c5cab0d5fc9aa1cf14c7bc7ea88c80155e46e22f.
> 
> Jani believes the noise is gone, so let's see whether it's really
> gone, before we drop this hack.
> 
> Cc: "Saarinen, Jani" <jani.saarinen@intel.com>
> Cc: Martin Peres <martin.peres@linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Totally forgot about this. Finally pushed it out.
-Daniel

> ---
>  net/sched/sch_generic.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
> index aef2582badc5..39c144b6ff98 100644
> --- a/net/sched/sch_generic.c
> +++ b/net/sched/sch_generic.c
> @@ -468,12 +468,7 @@ static void dev_watchdog(struct timer_list *t)
>  				}
>  			}
>  
> -			/* The noise is pissing off our CI and upstream doesn't
> -			 * move on the bug report:
> -			 *
> -			 * https://bugzilla.kernel.org/show_bug.cgi?id=196399
> -			 */
> -			if (some_queue_timedout && 0) {
> +			if (some_queue_timedout) {
>  				WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n",
>  				       dev->name, netdev_drivername(dev), i);
>  				dev->netdev_ops->ndo_tx_timeout(dev);
> -- 
> 2.17.0
>
Chris Wilson June 25, 2018, 8:34 p.m. UTC | #2
Quoting Daniel Vetter (2018-06-25 17:07:54)
> On Tue, May 29, 2018 at 09:15:22AM +0200, Daniel Vetter wrote:
> > This reverts commit c5cab0d5fc9aa1cf14c7bc7ea88c80155e46e22f.
> > 
> > Jani believes the noise is gone, so let's see whether it's really
> > gone, before we drop this hack.
> > 
> > Cc: "Saarinen, Jani" <jani.saarinen@intel.com>
> > Cc: Martin Peres <martin.peres@linux.intel.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> 
> Totally forgot about this. Finally pushed it out.

You did push this back then, and I had to quite quickly undo it.

[  224.739686] ------------[ cut here ]------------
[  224.739712] WARNING: CPU: 3 PID: 2982 at net/sched/sch_generic.c:461 dev_watchdog+0x1fd/0x210
[  224.739714] Modules linked in: vgem snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_intel snd_hda_codec snd_hwdep snd_hda_core x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_pcm i915 asix usbnet mii mei_me mei prime_numbers i2c_hid pinctrl_sunrisepoint pinctrl_intel btusb btrtl btbcm btintel bluetooth ecdh_generic
[  224.739775] CPU: 3 PID: 2982 Comm: gem_exec_suspen Tainted: G     U  W         4.18.0-rc2-CI-Patchwork_9414+ #1
[  224.739777] Hardware name: Dell Inc. XPS 13 9350/, BIOS 1.4.12 11/30/2016
[  224.739780] RIP: 0010:dev_watchdog+0x1fd/0x210
[  224.739781] Code: 49 63 4c 24 f0 eb 92 4c 89 ef c6 05 21 46 ad 00 01 e8 77 ee fc ff 89 d9 48 89 c2 4c 89 ee 48 c7 c7 88 4c 14 82 e8 a3 fe 84 ff <0f> 0b eb be 0f 1f 44 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 c7 47 
[  224.739866] RSP: 0018:ffff88027dd83e40 EFLAGS: 00010286
[  224.739869] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000102
[  224.739871] RDX: 0000000080000102 RSI: ffffffff820c8c6c RDI: 00000000ffffffff
[  224.739873] RBP: ffff8802644c1540 R08: 0000000071be9b33 R09: 0000000000000000
[  224.739874] R10: ffff88027dd83dc0 R11: 0000000000000000 R12: ffff8802644c1588
[  224.739876] R13: ffff8802644c1160 R14: 0000000000000001 R15: ffff88026a5dc728
[  224.739878] FS:  00007f18f4887980(0000) GS:ffff88027dd80000(0000) knlGS:0000000000000000
[  224.739880] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[  224.739881] CR2: 00007f4c627ae548 CR3: 000000022ca1a002 CR4: 00000000003606e0
[  224.739883] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[  224.739885] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[  224.739886] Call Trace:
[  224.739888]  <IRQ>
[  224.739892]  ? qdisc_reset+0xe0/0xe0
[  224.739894]  ? qdisc_reset+0xe0/0xe0
[  224.739897]  call_timer_fn+0x93/0x360
[  224.739903]  expire_timers+0xc1/0x1d0
[  224.739908]  run_timer_softirq+0xc7/0x170
[  224.739916]  __do_softirq+0xd9/0x505
[  224.739923]  irq_exit+0xa9/0xc0
[  224.739926]  smp_apic_timer_interrupt+0x9c/0x2d0
[  224.739929]  apic_timer_interrupt+0xf/0x20
[  224.739931]  </IRQ>
[  224.739934] RIP: 0010:delay_tsc+0x2e/0xb0
[  224.739936] Code: 49 89 fc 55 53 bf 01 00 00 00 e8 6d 2c 78 ff e8 88 9d b6 ff 41 89 c5 0f ae e8 0f 31 48 c1 e2 20 48 09 c2 48 89 d5 eb 16 f3 90 <bf> 01 00 00 00 e8 48 2c 78 ff e8 63 9d b6 ff 44 39 e8 75 36 0f ae 
[  224.740021] RSP: 0018:ffffc900002f7d48 EFLAGS: 00000286 ORIG_RAX: ffffffffffffff13
[  224.740024] RAX: 0000000080000000 RBX: 0000000649565ca9 RCX: 0000000000000001
[  224.740026] RDX: 0000000080000001 RSI: ffffffff820c8c6c RDI: 00000000ffffffff
[  224.740027] RBP: 00000006493ea9ce R08: 000000005e81e2ee R09: 0000000000000000
[  224.740029] R10: 0000000000000120 R11: 0000000000000000 R12: 00000000002ad8d6
[  224.740030] R13: 0000000000000003 R14: 0000000000000004 R15: ffff88025caf5408
[  224.740040]  ? delay_tsc+0x66/0xb0
[  224.740045]  hibernation_debug_sleep+0x1c/0x30
[  224.740048]  hibernation_snapshot+0x2c1/0x690
[  224.740053]  hibernate+0x142/0x2a4
[  224.740057]  state_store+0xd0/0xe0
[  224.740063]  kernfs_fop_write+0x104/0x190
[  224.740068]  __vfs_write+0x31/0x180
[  224.740072]  ? rcu_read_lock_sched_held+0x6f/0x80
[  224.740075]  ? rcu_sync_lockdep_assert+0x29/0x50
[  224.740078]  ? __sb_start_write+0x152/0x1f0
[  224.740080]  ? __sb_start_write+0x168/0x1f0
[  224.740084]  vfs_write+0xbd/0x1a0
[  224.740088]  ksys_write+0x50/0xc0
[  224.740094]  do_syscall_64+0x55/0x190
[  224.740097]  entry_SYSCALL_64_after_hwframe+0x49/0xbe
[  224.740099] RIP: 0033:0x7f18f400a281
[  224.740100] Code: c3 0f 1f 84 00 00 00 00 00 48 8b 05 59 8d 20 00 c3 0f 1f 84 00 00 00 00 00 8b 05 8a d1 20 00 85 c0 75 16 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 57 f3 c3 0f 1f 44 00 00 41 54 55 49 89 d4 53 
[  224.740186] RSP: 002b:00007fffd1f4fec8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
[  224.740189] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f18f400a281
[  224.740190] RDX: 0000000000000004 RSI: 00007f18f448069a RDI: 0000000000000006
[  224.740192] RBP: 00007fffd1f4fef0 R08: 0000000000000000 R09: 0000000000000000
[  224.740194] R10: 0000000000000000 R11: 0000000000000246 R12: 000055e795d03400
[  224.740195] R13: 00007fffd1f50500 R14: 0000000000000000 R15: 0000000000000000
[  224.740205] irq event stamp: 1582591
[  224.740207] hardirqs last  enabled at (1582590): [<ffffffff810f9f9c>] vprintk_emit+0x4bc/0x4d0
[  224.740210] hardirqs last disabled at (1582591): [<ffffffff81a0111c>] error_entry+0x7c/0x100
[  224.740212] softirqs last  enabled at (1582568): [<ffffffff81c0034f>] __do_softirq+0x34f/0x505
[  224.740215] softirqs last disabled at (1582571): [<ffffffff8108c959>] irq_exit+0xa9/0xc0
[  224.740218] WARNING: CPU: 3 PID: 2982 at net/sched/sch_generic.c:461 dev_watchdog+0x1fd/0x210
[  224.740219] ---[ end trace 6e41d690e611c338 ]---

is now back again in BAT /o\
-Chris
Daniel Vetter June 26, 2018, 8:06 a.m. UTC | #3
On Mon, Jun 25, 2018 at 10:34 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Quoting Daniel Vetter (2018-06-25 17:07:54)
>> On Tue, May 29, 2018 at 09:15:22AM +0200, Daniel Vetter wrote:
>> > This reverts commit c5cab0d5fc9aa1cf14c7bc7ea88c80155e46e22f.
>> >
>> > Jani believes the noise is gone, so let's see whether it's really
>> > gone, before we drop this hack.
>> >
>> > Cc: "Saarinen, Jani" <jani.saarinen@intel.com>
>> > Cc: Martin Peres <martin.peres@linux.intel.com>
>> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
>>
>> Totally forgot about this. Finally pushed it out.
>
> You did push this back then, and I had to quite quickly undo it.
>
> [  224.739686] ------------[ cut here ]------------
> [  224.739712] WARNING: CPU: 3 PID: 2982 at net/sched/sch_generic.c:461 dev_watchdog+0x1fd/0x210
> [  224.739714] Modules linked in: vgem snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_intel snd_hda_codec snd_hwdep snd_hda_core x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_pcm i915 asix usbnet mii mei_me mei prime_numbers i2c_hid pinctrl_sunrisepoint pinctrl_intel btusb btrtl btbcm btintel bluetooth ecdh_generic
> [  224.739775] CPU: 3 PID: 2982 Comm: gem_exec_suspen Tainted: G     U  W         4.18.0-rc2-CI-Patchwork_9414+ #1
> [  224.739777] Hardware name: Dell Inc. XPS 13 9350/, BIOS 1.4.12 11/30/2016
> [  224.739780] RIP: 0010:dev_watchdog+0x1fd/0x210
> [  224.739781] Code: 49 63 4c 24 f0 eb 92 4c 89 ef c6 05 21 46 ad 00 01 e8 77 ee fc ff 89 d9 48 89 c2 4c 89 ee 48 c7 c7 88 4c 14 82 e8 a3 fe 84 ff <0f> 0b eb be 0f 1f 44 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 c7 47
> [  224.739866] RSP: 0018:ffff88027dd83e40 EFLAGS: 00010286
> [  224.739869] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000102
> [  224.739871] RDX: 0000000080000102 RSI: ffffffff820c8c6c RDI: 00000000ffffffff
> [  224.739873] RBP: ffff8802644c1540 R08: 0000000071be9b33 R09: 0000000000000000
> [  224.739874] R10: ffff88027dd83dc0 R11: 0000000000000000 R12: ffff8802644c1588
> [  224.739876] R13: ffff8802644c1160 R14: 0000000000000001 R15: ffff88026a5dc728
> [  224.739878] FS:  00007f18f4887980(0000) GS:ffff88027dd80000(0000) knlGS:0000000000000000
> [  224.739880] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [  224.739881] CR2: 00007f4c627ae548 CR3: 000000022ca1a002 CR4: 00000000003606e0
> [  224.739883] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> [  224.739885] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
> [  224.739886] Call Trace:
> [  224.739888]  <IRQ>
> [  224.739892]  ? qdisc_reset+0xe0/0xe0
> [  224.739894]  ? qdisc_reset+0xe0/0xe0
> [  224.739897]  call_timer_fn+0x93/0x360
> [  224.739903]  expire_timers+0xc1/0x1d0
> [  224.739908]  run_timer_softirq+0xc7/0x170
> [  224.739916]  __do_softirq+0xd9/0x505
> [  224.739923]  irq_exit+0xa9/0xc0
> [  224.739926]  smp_apic_timer_interrupt+0x9c/0x2d0
> [  224.739929]  apic_timer_interrupt+0xf/0x20
> [  224.739931]  </IRQ>
> [  224.739934] RIP: 0010:delay_tsc+0x2e/0xb0
> [  224.739936] Code: 49 89 fc 55 53 bf 01 00 00 00 e8 6d 2c 78 ff e8 88 9d b6 ff 41 89 c5 0f ae e8 0f 31 48 c1 e2 20 48 09 c2 48 89 d5 eb 16 f3 90 <bf> 01 00 00 00 e8 48 2c 78 ff e8 63 9d b6 ff 44 39 e8 75 36 0f ae
> [  224.740021] RSP: 0018:ffffc900002f7d48 EFLAGS: 00000286 ORIG_RAX: ffffffffffffff13
> [  224.740024] RAX: 0000000080000000 RBX: 0000000649565ca9 RCX: 0000000000000001
> [  224.740026] RDX: 0000000080000001 RSI: ffffffff820c8c6c RDI: 00000000ffffffff
> [  224.740027] RBP: 00000006493ea9ce R08: 000000005e81e2ee R09: 0000000000000000
> [  224.740029] R10: 0000000000000120 R11: 0000000000000000 R12: 00000000002ad8d6
> [  224.740030] R13: 0000000000000003 R14: 0000000000000004 R15: ffff88025caf5408
> [  224.740040]  ? delay_tsc+0x66/0xb0
> [  224.740045]  hibernation_debug_sleep+0x1c/0x30
> [  224.740048]  hibernation_snapshot+0x2c1/0x690
> [  224.740053]  hibernate+0x142/0x2a4
> [  224.740057]  state_store+0xd0/0xe0
> [  224.740063]  kernfs_fop_write+0x104/0x190
> [  224.740068]  __vfs_write+0x31/0x180
> [  224.740072]  ? rcu_read_lock_sched_held+0x6f/0x80
> [  224.740075]  ? rcu_sync_lockdep_assert+0x29/0x50
> [  224.740078]  ? __sb_start_write+0x152/0x1f0
> [  224.740080]  ? __sb_start_write+0x168/0x1f0
> [  224.740084]  vfs_write+0xbd/0x1a0
> [  224.740088]  ksys_write+0x50/0xc0
> [  224.740094]  do_syscall_64+0x55/0x190
> [  224.740097]  entry_SYSCALL_64_after_hwframe+0x49/0xbe
> [  224.740099] RIP: 0033:0x7f18f400a281
> [  224.740100] Code: c3 0f 1f 84 00 00 00 00 00 48 8b 05 59 8d 20 00 c3 0f 1f 84 00 00 00 00 00 8b 05 8a d1 20 00 85 c0 75 16 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 57 f3 c3 0f 1f 44 00 00 41 54 55 49 89 d4 53
> [  224.740186] RSP: 002b:00007fffd1f4fec8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
> [  224.740189] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f18f400a281
> [  224.740190] RDX: 0000000000000004 RSI: 00007f18f448069a RDI: 0000000000000006
> [  224.740192] RBP: 00007fffd1f4fef0 R08: 0000000000000000 R09: 0000000000000000
> [  224.740194] R10: 0000000000000000 R11: 0000000000000246 R12: 000055e795d03400
> [  224.740195] R13: 00007fffd1f50500 R14: 0000000000000000 R15: 0000000000000000
> [  224.740205] irq event stamp: 1582591
> [  224.740207] hardirqs last  enabled at (1582590): [<ffffffff810f9f9c>] vprintk_emit+0x4bc/0x4d0
> [  224.740210] hardirqs last disabled at (1582591): [<ffffffff81a0111c>] error_entry+0x7c/0x100
> [  224.740212] softirqs last  enabled at (1582568): [<ffffffff81c0034f>] __do_softirq+0x34f/0x505
> [  224.740215] softirqs last disabled at (1582571): [<ffffffff8108c959>] irq_exit+0xa9/0xc0
> [  224.740218] WARNING: CPU: 3 PID: 2982 at net/sched/sch_generic.c:461 dev_watchdog+0x1fd/0x210
> [  224.740219] ---[ end trace 6e41d690e611c338 ]---
>
> is now back again in BAT /o\

Next time around please don't re-add a patch without any note
anywhere, I can't read minds, nor does that silly time machine work.

Readded, with a note in the patch.
-Daniel
Chris Wilson June 26, 2018, 8:15 a.m. UTC | #4
Quoting Daniel Vetter (2018-06-26 09:06:48)
> On Mon, Jun 25, 2018 at 10:34 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > Quoting Daniel Vetter (2018-06-25 17:07:54)
> >> On Tue, May 29, 2018 at 09:15:22AM +0200, Daniel Vetter wrote:
> >> > This reverts commit c5cab0d5fc9aa1cf14c7bc7ea88c80155e46e22f.
> >> >
> >> > Jani believes the noise is gone, so let's see whether it's really
> >> > gone, before we drop this hack.
> >> >
> >> > Cc: "Saarinen, Jani" <jani.saarinen@intel.com>
> >> > Cc: Martin Peres <martin.peres@linux.intel.com>
> >> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> >>
> >> Totally forgot about this. Finally pushed it out.
> >
> > You did push this back then, and I had to quite quickly undo it.
> >
> > [  224.739686] ------------[ cut here ]------------
> > [  224.739712] WARNING: CPU: 3 PID: 2982 at net/sched/sch_generic.c:461 dev_watchdog+0x1fd/0x210
> > [  224.739714] Modules linked in: vgem snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_intel snd_hda_codec snd_hwdep snd_hda_core x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_pcm i915 asix usbnet mii mei_me mei prime_numbers i2c_hid pinctrl_sunrisepoint pinctrl_intel btusb btrtl btbcm btintel bluetooth ecdh_generic
> > [  224.739775] CPU: 3 PID: 2982 Comm: gem_exec_suspen Tainted: G     U  W         4.18.0-rc2-CI-Patchwork_9414+ #1
> > [  224.739777] Hardware name: Dell Inc. XPS 13 9350/, BIOS 1.4.12 11/30/2016
> > [  224.739780] RIP: 0010:dev_watchdog+0x1fd/0x210
> > [  224.739781] Code: 49 63 4c 24 f0 eb 92 4c 89 ef c6 05 21 46 ad 00 01 e8 77 ee fc ff 89 d9 48 89 c2 4c 89 ee 48 c7 c7 88 4c 14 82 e8 a3 fe 84 ff <0f> 0b eb be 0f 1f 44 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 c7 47
> > [  224.739866] RSP: 0018:ffff88027dd83e40 EFLAGS: 00010286
> > [  224.739869] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000102
> > [  224.739871] RDX: 0000000080000102 RSI: ffffffff820c8c6c RDI: 00000000ffffffff
> > [  224.739873] RBP: ffff8802644c1540 R08: 0000000071be9b33 R09: 0000000000000000
> > [  224.739874] R10: ffff88027dd83dc0 R11: 0000000000000000 R12: ffff8802644c1588
> > [  224.739876] R13: ffff8802644c1160 R14: 0000000000000001 R15: ffff88026a5dc728
> > [  224.739878] FS:  00007f18f4887980(0000) GS:ffff88027dd80000(0000) knlGS:0000000000000000
> > [  224.739880] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> > [  224.739881] CR2: 00007f4c627ae548 CR3: 000000022ca1a002 CR4: 00000000003606e0
> > [  224.739883] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> > [  224.739885] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
> > [  224.739886] Call Trace:
> > [  224.739888]  <IRQ>
> > [  224.739892]  ? qdisc_reset+0xe0/0xe0
> > [  224.739894]  ? qdisc_reset+0xe0/0xe0
> > [  224.739897]  call_timer_fn+0x93/0x360
> > [  224.739903]  expire_timers+0xc1/0x1d0
> > [  224.739908]  run_timer_softirq+0xc7/0x170
> > [  224.739916]  __do_softirq+0xd9/0x505
> > [  224.739923]  irq_exit+0xa9/0xc0
> > [  224.739926]  smp_apic_timer_interrupt+0x9c/0x2d0
> > [  224.739929]  apic_timer_interrupt+0xf/0x20
> > [  224.739931]  </IRQ>
> > [  224.739934] RIP: 0010:delay_tsc+0x2e/0xb0
> > [  224.739936] Code: 49 89 fc 55 53 bf 01 00 00 00 e8 6d 2c 78 ff e8 88 9d b6 ff 41 89 c5 0f ae e8 0f 31 48 c1 e2 20 48 09 c2 48 89 d5 eb 16 f3 90 <bf> 01 00 00 00 e8 48 2c 78 ff e8 63 9d b6 ff 44 39 e8 75 36 0f ae
> > [  224.740021] RSP: 0018:ffffc900002f7d48 EFLAGS: 00000286 ORIG_RAX: ffffffffffffff13
> > [  224.740024] RAX: 0000000080000000 RBX: 0000000649565ca9 RCX: 0000000000000001
> > [  224.740026] RDX: 0000000080000001 RSI: ffffffff820c8c6c RDI: 00000000ffffffff
> > [  224.740027] RBP: 00000006493ea9ce R08: 000000005e81e2ee R09: 0000000000000000
> > [  224.740029] R10: 0000000000000120 R11: 0000000000000000 R12: 00000000002ad8d6
> > [  224.740030] R13: 0000000000000003 R14: 0000000000000004 R15: ffff88025caf5408
> > [  224.740040]  ? delay_tsc+0x66/0xb0
> > [  224.740045]  hibernation_debug_sleep+0x1c/0x30
> > [  224.740048]  hibernation_snapshot+0x2c1/0x690
> > [  224.740053]  hibernate+0x142/0x2a4
> > [  224.740057]  state_store+0xd0/0xe0
> > [  224.740063]  kernfs_fop_write+0x104/0x190
> > [  224.740068]  __vfs_write+0x31/0x180
> > [  224.740072]  ? rcu_read_lock_sched_held+0x6f/0x80
> > [  224.740075]  ? rcu_sync_lockdep_assert+0x29/0x50
> > [  224.740078]  ? __sb_start_write+0x152/0x1f0
> > [  224.740080]  ? __sb_start_write+0x168/0x1f0
> > [  224.740084]  vfs_write+0xbd/0x1a0
> > [  224.740088]  ksys_write+0x50/0xc0
> > [  224.740094]  do_syscall_64+0x55/0x190
> > [  224.740097]  entry_SYSCALL_64_after_hwframe+0x49/0xbe
> > [  224.740099] RIP: 0033:0x7f18f400a281
> > [  224.740100] Code: c3 0f 1f 84 00 00 00 00 00 48 8b 05 59 8d 20 00 c3 0f 1f 84 00 00 00 00 00 8b 05 8a d1 20 00 85 c0 75 16 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 57 f3 c3 0f 1f 44 00 00 41 54 55 49 89 d4 53
> > [  224.740186] RSP: 002b:00007fffd1f4fec8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
> > [  224.740189] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f18f400a281
> > [  224.740190] RDX: 0000000000000004 RSI: 00007f18f448069a RDI: 0000000000000006
> > [  224.740192] RBP: 00007fffd1f4fef0 R08: 0000000000000000 R09: 0000000000000000
> > [  224.740194] R10: 0000000000000000 R11: 0000000000000246 R12: 000055e795d03400
> > [  224.740195] R13: 00007fffd1f50500 R14: 0000000000000000 R15: 0000000000000000
> > [  224.740205] irq event stamp: 1582591
> > [  224.740207] hardirqs last  enabled at (1582590): [<ffffffff810f9f9c>] vprintk_emit+0x4bc/0x4d0
> > [  224.740210] hardirqs last disabled at (1582591): [<ffffffff81a0111c>] error_entry+0x7c/0x100
> > [  224.740212] softirqs last  enabled at (1582568): [<ffffffff81c0034f>] __do_softirq+0x34f/0x505
> > [  224.740215] softirqs last disabled at (1582571): [<ffffffff8108c959>] irq_exit+0xa9/0xc0
> > [  224.740218] WARNING: CPU: 3 PID: 2982 at net/sched/sch_generic.c:461 dev_watchdog+0x1fd/0x210
> > [  224.740219] ---[ end trace 6e41d690e611c338 ]---
> >
> > is now back again in BAT /o\
> 
> Next time around please don't re-add a patch without any note
> anywhere, I can't read minds, nor does that silly time machine work.

There wasn't a note to append a note to :-p
-Chris
diff mbox

Patch

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index aef2582badc5..39c144b6ff98 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -468,12 +468,7 @@  static void dev_watchdog(struct timer_list *t)
 				}
 			}
 
-			/* The noise is pissing off our CI and upstream doesn't
-			 * move on the bug report:
-			 *
-			 * https://bugzilla.kernel.org/show_bug.cgi?id=196399
-			 */
-			if (some_queue_timedout && 0) {
+			if (some_queue_timedout) {
 				WARN_ONCE(1, KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n",
 				       dev->name, netdev_drivername(dev), i);
 				dev->netdev_ops->ndo_tx_timeout(dev);