Revert "net: avoid double accounting for pure zerocopy skbs"
This reverts commit
f1a456f8f3fc5828d8abcad941860380ae147b1d.
WARNING: CPU: 1 PID: 6819 at net/core/skbuff.c:5429 skb_try_coalesce+0x78b/0x7e0
CPU: 1 PID: 6819 Comm: xxxxxxx Kdump: loaded Tainted: G S
5.15.0-04194-gd852503f7711 #16
RIP: 0010:skb_try_coalesce+0x78b/0x7e0
Code: e8 2a bf 41 ff 44 8b b3 bc 00 00 00 48 8b 7c 24 30 e8 19 c0 41 ff 44 89 f0 48 03 83 c0 00 00 00 48 89 44 24 40 e9 47 fb ff ff <0f> 0b e9 ca fc ff ff 4c 8d 70 ff 48 83 c0 07 48 89 44 24 38 e9 61
RSP: 0018:
ffff88881f449688 EFLAGS:
00010282
RAX:
00000000fffffe96 RBX:
ffff8881566e4460 RCX:
ffffffff82079f7e
RDX:
0000000000000003 RSI:
dffffc0000000000 RDI:
ffff8881566e47b0
RBP:
ffff8881566e46e0 R08:
ffffed102619235d R09:
ffffed102619235d
R10:
ffff888130c91ae3 R11:
ffffed102619235c R12:
ffff88881f4498a0
R13:
0000000000000056 R14:
0000000000000009 R15:
ffff888130c91ac0
FS:
00007fec2cbb9700(0000) GS:
ffff88881f440000(0000) knlGS:
0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0:
0000000080050033
CR2:
00007fec1b060d80 CR3:
00000003acf94005 CR4:
00000000003706e0
DR0:
0000000000000000 DR1:
0000000000000000 DR2:
0000000000000000
DR3:
0000000000000000 DR6:
00000000fffe0ff0 DR7:
0000000000000400
Call Trace:
<IRQ>
tcp_try_coalesce+0xeb/0x290
? tcp_parse_options+0x610/0x610
? mark_held_locks+0x79/0xa0
tcp_queue_rcv+0x69/0x2f0
tcp_rcv_established+0xa49/0xd40
? tcp_data_queue+0x18a0/0x18a0
tcp_v6_do_rcv+0x1c9/0x880
? rt6_mtu_change_route+0x100/0x100
tcp_v6_rcv+0x1624/0x1830
Signed-off-by: Jakub Kicinski <kuba@kernel.org>