Renato Westphal
e2e8009ff7
tcp: remove improper preemption check in tcp_xmit_probe_skb()
Commit e520af48c7e5a introduced the following bug when setting the
TCP_REPAIR sockoption:
[ 2860.657036] BUG: using __this_cpu_add() in preemptible [00000000] code: daemon/12164
[ 2860.657045] caller is __this_cpu_preempt_check+0x13/0x20
[ 2860.657049] CPU: 1 PID: 12164 Comm: daemon Not tainted 4.2.3 #1
[ 2860.657051] Hardware name: Dell Inc. PowerEdge R210 II/0JP7TR, BIOS 2.0.5 03/13/2012
[ 2860.657054] ffffffff81c7f071 ffff880231e9fdf8 ffffffff8185d765 0000000000000002
[ 2860.657058] 0000000000000001 ffff880231e9fe28 ffffffff8146ed91 ffff880231e9fe18
[ 2860.657062] ffffffff81cd1a5d ffff88023534f200 ffff8800b9811000 ffff880231e9fe38
[ 2860.657065] Call Trace:
[ 2860.657072] [<ffffffff8185d765>] dump_stack+0x4f/0x7b
[ 2860.657075] [<ffffffff8146ed91>] check_preemption_disabled+0xe1/0xf0
[ 2860.657078] [<ffffffff8146edd3>] __this_cpu_preempt_check+0x13/0x20
[ 2860.657082] [<ffffffff817e0bc7>] tcp_xmit_probe_skb+0xc7/0x100
[ 2860.657085] [<ffffffff817e1e2d>] tcp_send_window_probe+0x2d/0x30
[ 2860.657089] [<ffffffff817d1d8c>] do_tcp_setsockopt.isra.29+0x74c/0x830
[ 2860.657093] [<ffffffff817d1e9c>] tcp_setsockopt+0x2c/0x30
[ 2860.657097] [<ffffffff81767b74>] sock_common_setsockopt+0x14/0x20
[ 2860.657100] [<ffffffff817669e1>] SyS_setsockopt+0x71/0xc0
[ 2860.657104] [<ffffffff81865172>] entry_SYSCALL_64_fastpath+0x16/0x75
Since tcp_xmit_probe_skb() can be called from process context, use
NET_INC_STATS() instead of NET_INC_STATS_BH().
Fixes: e520af48c7e5 ("tcp: add TCPWinProbe and TCPKeepAlive SNMP counters")
Signed-off-by: Renato Westphal <renatow@taghos.com.br>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-21 19:29:26 -07:00
..
2015-10-12 17:27:48 +02:00
2015-09-01 14:32:44 -07:00
2015-08-25 13:38:50 -07:00
2015-10-05 04:05:15 -07:00
2015-04-03 12:11:15 -04:00
2015-07-29 22:44:04 -07:00
2015-07-28 23:38:13 -07:00
2015-05-28 11:23:20 +08:00
2015-09-29 21:52:32 -07:00
2015-07-24 22:46:11 -07:00
2015-09-09 14:19:50 -07:00
2015-09-01 14:32:44 -07:00
2015-09-17 16:36:34 -07:00
2015-08-29 13:07:54 -07:00
2015-08-10 14:03:54 -07:00
2015-04-03 12:11:15 -04:00
2015-09-25 21:44:02 -07:00
2015-08-28 13:28:47 -07:00
2015-10-05 04:04:09 -07:00
2015-07-10 23:25:24 -07:00
2015-07-26 21:00:15 -07:00
2015-07-23 00:41:16 -07:00
2013-12-29 16:34:25 -05:00
2015-09-21 16:32:29 -07:00
2015-08-28 13:32:36 -07:00
2015-05-25 00:08:48 -04:00
2015-08-28 13:32:36 -07:00
2015-08-29 13:07:54 -07:00
2015-07-21 10:39:05 -07:00
2015-04-03 12:11:15 -04:00
2015-08-13 22:43:21 -07:00
2015-06-24 02:58:51 -07:00
2015-09-24 14:31:37 -07:00
2015-08-10 14:03:54 -07:00
2015-05-28 06:23:32 +02:00
2015-04-03 12:11:15 -04:00
2015-08-12 16:40:22 -07:00
2015-08-10 14:03:54 -07:00
2015-09-09 14:19:50 -07:00
2015-08-27 15:42:48 -07:00
2015-08-27 15:42:48 -07:00
2015-06-16 14:12:34 -04:00
2015-07-09 21:09:10 -07:00
2015-07-21 22:36:33 -07:00
2014-09-19 17:15:31 -04:00
2015-04-13 18:18:05 -04:00
2015-09-29 21:52:32 -07:00
2015-06-07 15:19:52 -07:00
2015-08-28 13:28:47 -07:00
2015-07-09 14:22:52 -07:00
2015-07-09 14:22:52 -07:00
2015-08-31 12:34:00 -07:00
2015-09-17 22:35:07 -07:00
2015-06-10 23:28:33 -07:00
2015-06-15 19:49:22 -07:00
2015-06-23 02:38:10 -07:00
2015-07-09 14:22:52 -07:00
2015-07-09 14:22:52 -07:00
2015-07-09 14:22:52 -07:00
2015-07-09 14:22:52 -07:00
2015-08-31 12:34:00 -07:00
2015-08-13 16:23:11 -07:00
2014-05-03 19:23:07 -04:00
2015-02-12 18:54:10 -08:00
2015-08-28 13:32:36 -07:00
2015-09-21 16:32:29 -07:00
2015-06-11 16:33:10 -07:00
2015-10-21 19:29:26 -07:00
2014-09-01 18:12:45 -07:00
2015-07-09 14:22:52 -07:00
2015-07-09 21:44:38 -07:00
2015-07-09 14:22:52 -07:00
2015-04-29 17:10:38 -04:00
2015-07-09 14:22:52 -07:00
2015-05-05 19:50:09 -04:00
2015-01-28 22:18:37 -08:00
2015-08-25 11:22:50 -07:00
2012-03-11 23:42:51 -07:00
2015-06-15 19:49:22 -07:00
2015-03-02 13:06:31 -05:00
2015-04-03 12:11:15 -04:00
2015-08-27 15:42:47 -07:00
2015-09-17 16:36:34 -07:00
2014-05-23 16:28:53 -04:00
2015-04-07 15:25:55 -04:00
2013-12-26 13:43:21 -05:00
2015-03-25 14:07:04 -04:00
2015-04-07 15:25:55 -04:00
2015-09-17 16:36:34 -07:00
2014-06-30 07:49:47 +02:00
2013-12-18 16:58:20 -05:00
2013-05-31 17:19:05 -07:00