mptcp_v0.93: switch base to v4.9.123

[matttbe]

Merge tag 'v4.9.123' into mptcp_v0.93

This is the 4.9.123 stable release

Conflicts:

• net/ipv4/tcp_input.c
• net/ipv4/tcp_ipv4.c
• net/ipv4/tcp_output.c
• net/ipv6/tcp_ipv6.c

This is still under validation on my side but if someone else wants to review / try this, enjoy ;-) cc: @cpaasch

[matttbe]

@cpaasch : I just saw that in the log and I didn't investigate that

[    8.010033]  <IRQ> [    8.010195]  [<ffffffff811c9935>] dump_stack+0x63/0x8e
[    8.010636]  [<ffffffff81046d27>] __warn+0xc7/0xf0
[    8.011039]  [<ffffffff81046e08>] warn_slowpath_null+0x18/0x20
[    8.011503]  [<ffffffff8104a686>] __local_bh_enable_ip+0x66/0x80
[    8.012044]  [<ffffffff814f8d55>] _raw_spin_unlock_bh+0x15/0x20
[    8.012515]  [<ffffffff8146ee87>] jtcp_rcv_established+0x227/0x2b0
[    8.013050]  [<ffffffff81444963>] tcp_v4_do_rcv+0x163/0x1f0
[    8.013493]  [<ffffffff81447b25>] tcp_v4_rcv+0xe85/0x10a0
[    8.013957]  [<ffffffff8146b23c>] ? nf_nat_ipv4_fn+0x19c/0x1e0
[    8.014431]  [<ffffffff8146e8b0>] ? iptable_nat_ipv4_fn+0x20/0x20
[    8.015013]  [<ffffffff8141fa8f>] ip_local_deliver_finish+0x9f/0x140
[    8.015517]  [<ffffffff81420090>] ip_local_deliver+0xc0/0xd0
[    8.016027]  [<ffffffff8141f9f0>] ? inet_del_offload+0x40/0x40
[    8.016490]  [<ffffffff8141fccb>] ip_rcv_finish+0x19b/0x350
[    8.017028]  [<ffffffff81420353>] ip_rcv+0x2b3/0x460
[    8.017425]  [<ffffffff8141fb30>] ? ip_local_deliver_finish+0x140/0x140
[    8.017990]  [<ffffffff813b5bde>] __netif_receive_skb_core+0x47e/0x840
[    8.018508]  [<ffffffff8144cff1>] ? tcp4_gro_receive+0x131/0x1b0
[    8.019029]  [<ffffffff8145c2b1>] ? inet_gro_receive+0x231/0x2a0
[    8.019507]  [<ffffffff813b8258>] __netif_receive_skb+0x18/0x60
[    8.020053]  [<ffffffff813b82c8>] netif_receive_skb_internal+0x28/0x90
[    8.020570]  [<ffffffff813b8b48>] napi_gro_receive+0x78/0xa0
[    8.021064]  [<ffffffff81332c28>] virtnet_receive+0x1f8/0x890
[    8.021520]  [<ffffffff813333b8>] virtnet_poll+0x18/0x80
[    8.021986]  [<ffffffff813b9cc6>] net_rx_action+0xf6/0x2c0
[    8.022422]  [<ffffffff8104a44c>] __do_softirq+0xcc/0x1e0
[    8.022874]  [<ffffffff8104a767>] irq_exit+0x67/0x70
[    8.023290]  [<ffffffff81019be1>] do_IRQ+0x51/0xe0
[    8.023695]  [<ffffffff814f99d6>] common_interrupt+0x96/0x96
[    8.024189]  <EOI> [    8.024351]  [<ffffffff814f8b30>] ? __sched_text_end+0x3/0x3
[    8.024830]  [<ffffffff814f8bc6>] ? native_safe_halt+0x6/0x10
[    8.025307]  [<ffffffff814f8b39>] default_idle+0x9/0x10
[    8.025742]  [<ffffffff81021210>] arch_cpu_idle+0x10/0x20
[    8.026190]  [<ffffffff814f8c4e>] default_idle_call+0x1e/0x30
[    8.026813]  [<ffffffff81077621>] cpu_startup_entry+0xe1/0x1d0
[    8.027397]  [<ffffffff814f453d>] rest_init+0x6d/0x70
[    8.027832]  [<ffffffff8188f0dc>] start_kernel+0x4d0/0x4dd
[    8.028360]  [<ffffffff8188e9fa>] ? set_init_arg+0x55/0x55
[    8.028821]  [<ffffffff8188e120>] ? early_idt_handler_array+0x120/0x120
[    8.029372]  [<ffffffff8188e599>] x86_64_start_reservations+0x2a/0x2c
[    8.029910]  [<ffffffff8188e681>] x86_64_start_kernel+0xe6/0xf3
[    8.030412] ---[ end trace 5826c2ad94ee574a ]---

Did you not change something related to bottom half lock in recent kernel? This remembers me something but I don't see this change.

[matttbe]

@cpaasch sorry, just found the commit I was thinking: 1cb94de23fc3619c3c49711aeb8babcd64beefd0 It is not linked to that :)

[cpaasch]

@mattbe - FYI: https://lkml.org/lkml/2017/2/20/660 Seems like a known issue. And probably nobody really cares because tcp_probe got removed :)

[matttbe]

@cpaasch thank you! I didn't even take time to google the call trace :) Thank you for that! :-)

It seems the commit has been reverted soon after: https://patchwork.ozlabs.org/patch/730560/ But the revert is not in v4.9. I will investigate that tomorrow :-)