From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Eric Dumazet <eric.dumazet@gmail.com>,
Hannes Frederic Sowa <hannes@stressinduktion.org>,
Christoph Paasch <cpaasch@apple.com>,
Eric Dumazet <edumazet@google.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH 4.0 14/55] tcp: Do not call tcp_fastopen_reset_cipher from interrupt context
Date: Wed, 8 Jul 2015 00:34:49 -0700 [thread overview]
Message-ID: <20150708073239.666394806@linuxfoundation.org> (raw)
In-Reply-To: <20150708073238.785749886@linuxfoundation.org>
4.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Paasch <cpaasch@apple.com>
[ Upstream commit dfea2aa654243f70dc53b8648d0bbdeec55a7df1 ]
tcp_fastopen_reset_cipher really cannot be called from interrupt
context. It allocates the tcp_fastopen_context with GFP_KERNEL and
calls crypto_alloc_cipher, which allocates all kind of stuff with
GFP_KERNEL.
Thus, we might sleep when the key-generation is triggered by an
incoming TFO cookie-request which would then happen in interrupt-
context, as shown by enabling CONFIG_DEBUG_ATOMIC_SLEEP:
[ 36.001813] BUG: sleeping function called from invalid context at mm/slub.c:1266
[ 36.003624] in_atomic(): 1, irqs_disabled(): 0, pid: 1016, name: packetdrill
[ 36.004859] CPU: 1 PID: 1016 Comm: packetdrill Not tainted 4.1.0-rc7 #14
[ 36.006085] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.7.5-0-ge51488c-20140602_164612-nilsson.home.kraxel.org 04/01/2014
[ 36.008250] 00000000000004f2 ffff88007f8838a8 ffffffff8171d53a ffff880075a084a8
[ 36.009630] ffff880075a08000 ffff88007f8838c8 ffffffff810967d3 ffff88007f883928
[ 36.011076] 0000000000000000 ffff88007f8838f8 ffffffff81096892 ffff88007f89be00
[ 36.012494] Call Trace:
[ 36.012953] <IRQ> [<ffffffff8171d53a>] dump_stack+0x4f/0x6d
[ 36.014085] [<ffffffff810967d3>] ___might_sleep+0x103/0x170
[ 36.015117] [<ffffffff81096892>] __might_sleep+0x52/0x90
[ 36.016117] [<ffffffff8118e887>] kmem_cache_alloc_trace+0x47/0x190
[ 36.017266] [<ffffffff81680d82>] ? tcp_fastopen_reset_cipher+0x42/0x130
[ 36.018485] [<ffffffff81680d82>] tcp_fastopen_reset_cipher+0x42/0x130
[ 36.019679] [<ffffffff81680f01>] tcp_fastopen_init_key_once+0x61/0x70
[ 36.020884] [<ffffffff81680f2c>] __tcp_fastopen_cookie_gen+0x1c/0x60
[ 36.022058] [<ffffffff816814ff>] tcp_try_fastopen+0x58f/0x730
[ 36.023118] [<ffffffff81671788>] tcp_conn_request+0x3e8/0x7b0
[ 36.024185] [<ffffffff810e3872>] ? __module_text_address+0x12/0x60
[ 36.025327] [<ffffffff8167b2e1>] tcp_v4_conn_request+0x51/0x60
[ 36.026410] [<ffffffff816727e0>] tcp_rcv_state_process+0x190/0xda0
[ 36.027556] [<ffffffff81661f97>] ? __inet_lookup_established+0x47/0x170
[ 36.028784] [<ffffffff8167c2ad>] tcp_v4_do_rcv+0x16d/0x3d0
[ 36.029832] [<ffffffff812e6806>] ? security_sock_rcv_skb+0x16/0x20
[ 36.030936] [<ffffffff8167cc8a>] tcp_v4_rcv+0x77a/0x7b0
[ 36.031875] [<ffffffff816af8c3>] ? iptable_filter_hook+0x33/0x70
[ 36.032953] [<ffffffff81657d22>] ip_local_deliver_finish+0x92/0x1f0
[ 36.034065] [<ffffffff81657f1a>] ip_local_deliver+0x9a/0xb0
[ 36.035069] [<ffffffff81657c90>] ? ip_rcv+0x3d0/0x3d0
[ 36.035963] [<ffffffff81657569>] ip_rcv_finish+0x119/0x330
[ 36.036950] [<ffffffff81657ba7>] ip_rcv+0x2e7/0x3d0
[ 36.037847] [<ffffffff81610652>] __netif_receive_skb_core+0x552/0x930
[ 36.038994] [<ffffffff81610a57>] __netif_receive_skb+0x27/0x70
[ 36.040033] [<ffffffff81610b72>] process_backlog+0xd2/0x1f0
[ 36.041025] [<ffffffff81611482>] net_rx_action+0x122/0x310
[ 36.042007] [<ffffffff81076743>] __do_softirq+0x103/0x2f0
[ 36.042978] [<ffffffff81723e3c>] do_softirq_own_stack+0x1c/0x30
This patch moves the call to tcp_fastopen_init_key_once to the places
where a listener socket creates its TFO-state, which always happens in
user-context (either from the setsockopt, or implicitly during the
listen()-call)
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Fixes: 222e83d2e0ae ("tcp: switch tcp_fastopen key generation to net_get_random_once")
Signed-off-by: Christoph Paasch <cpaasch@apple.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/ipv4/af_inet.c | 2 ++
net/ipv4/tcp.c | 7 +++++--
net/ipv4/tcp_fastopen.c | 2 --
3 files changed, 7 insertions(+), 4 deletions(-)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -228,6 +228,8 @@ int inet_listen(struct socket *sock, int
err = 0;
if (err)
goto out;
+
+ tcp_fastopen_init_key_once(true);
}
err = inet_csk_listen_start(sk, backlog);
if (err)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2541,10 +2541,13 @@ static int do_tcp_setsockopt(struct sock
case TCP_FASTOPEN:
if (val >= 0 && ((1 << sk->sk_state) & (TCPF_CLOSE |
- TCPF_LISTEN)))
+ TCPF_LISTEN))) {
+ tcp_fastopen_init_key_once(true);
+
err = fastopen_init_queue(sk, val);
- else
+ } else {
err = -EINVAL;
+ }
break;
case TCP_TIMESTAMP:
if (!tp->repair)
--- a/net/ipv4/tcp_fastopen.c
+++ b/net/ipv4/tcp_fastopen.c
@@ -78,8 +78,6 @@ static bool __tcp_fastopen_cookie_gen(co
struct tcp_fastopen_context *ctx;
bool ok = false;
- tcp_fastopen_init_key_once(true);
-
rcu_read_lock();
ctx = rcu_dereference(tcp_fastopen_ctx);
if (ctx) {
next prev parent reply other threads:[~2015-07-08 7:35 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-08 7:34 [PATCH 4.0 00/55] 4.0.8-stable review Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 01/55] config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 02/55] netfilter: nft_rbtree: fix locking Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 03/55] ARM: clk-imx6q: refine satas parent Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 04/55] KVM: nSVM: Check for NRIPS support before updating control field Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 05/55] sparc: Use GFP_ATOMIC in ldc_alloc_exp_dring() as it can be called in softirq context Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 06/55] bridge: fix multicast router rlist endless loop Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 07/55] net: igb: fix the start time for periodic output signals Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 08/55] net: dont wait for order-3 page allocation Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 09/55] sctp: fix ASCONF list handling Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 10/55] bridge: fix br_stp_set_bridge_priority race conditions Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 11/55] packet: read num_members once in packet_rcv_fanout() Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 12/55] packet: avoid out of bounds read in round robin fanout Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 13/55] neigh: do not modify unlinked entries Greg Kroah-Hartman
2015-07-08 7:34 ` Greg Kroah-Hartman [this message]
2015-07-08 7:34 ` [PATCH 4.0 15/55] ip: report the original address of ICMP messages Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 16/55] net/mlx4_en: Release TX QP when destroying TX ring Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 17/55] net/mlx4_en: Wake TX queues only when theres enough room Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 18/55] net/mlx4_en: Fix wrong csum complete report when rxvlan offload is disabled Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 19/55] mlx4: Disable HA for SRIOV PF RoCE devices Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 20/55] net: phy: fix phy link up when limiting speed via device tree Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 21/55] bnx2x: fix lockdep splat Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 22/55] sctp: Fix race between OOTB responce and route removal Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 23/55] amd-xgbe: Add the __GFP_NOWARN flag to Rx buffer allocation Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 24/55] net: mvneta: introduce compatible string "marvell, armada-xp-neta" Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 25/55] ARM: mvebu: update Ethernet compatible string for Armada XP Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 26/55] net: mvneta: disable IP checksum with jumbo frames for Armada 370 Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 27/55] usb: gadget: f_fs: fix check in read operation Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 28/55] usb: gadget: f_fs: add extra check before unregister_gadget_item Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 29/55] crypto: talitos - avoid memleak in talitos_alg_alloc() Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 30/55] Revert "crypto: talitos - convert to use be16_add_cpu()" Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 31/55] iommu/arm-smmu: Fix broken ATOS check Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 32/55] iommu/amd: Handle large pages correctly in free_pagetable Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 33/55] mmc: sdhci: fix low memory corruption Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 34/55] intel_pstate: set BYT MSR with wrmsrl_on_cpu() Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 35/55] selinux: fix setting of security labels on NFS Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 36/55] arm: KVM: force execution of HCPTR access on VM exit Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 37/55] ARM: kvm: psci: fix handling of unimplemented functions Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 38/55] ARM: tegra20: Store CPU "resettable" status in IRAM Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 39/55] ARM: mvebu: fix suspend to RAM on big-endian configurations Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 40/55] tick/idle/powerpc: Do not register idle states with CPUIDLE_FLAG_TIMER_STOP set in periodic mode Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 41/55] powerpc/perf: Fix book3s kernel to userspace backtraces Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 42/55] x86/PCI: Use host bridge _CRS info on systems with >32 bit addressing Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 43/55] x86/PCI: Use host bridge _CRS info on Foxconn K8M890-8237A Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 44/55] KVM: mips: use id_to_memslot correctly Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 45/55] MIPS: Fix KVM guest fixmap address Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 46/55] KVM: s390: fix external call injection without sigp interpretation Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 47/55] s390/kdump: fix REGSET_VX_LOW vector register ELF notes Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 48/55] KVM: s390: virtio-ccw: dont overwrite config space values Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 51/55] fs: Fix S_NOSEC handling Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 52/55] fs/ufs: revert "ufs: fix deadlocks introduced by sb mutex merge" Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 53/55] fs/ufs: restore s_lock mutex Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 54/55] vfs: Remove incorrect debugging WARN in prepend_path Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 55/55] vfs: Ignore unlocked mounts in fs_fully_visible Greg Kroah-Hartman
2015-07-08 14:09 ` [PATCH 4.0 00/55] 4.0.8-stable review Guenter Roeck
2015-07-08 16:34 ` Shuah Khan
2015-07-09 4:21 ` Sudip Mukherjee
2015-07-10 17:31 ` Greg Kroah-Hartman
2015-07-11 9:47 ` Sudip Mukherjee
2015-07-11 11:03 ` Sudip Mukherjee
2015-07-11 12:51 ` Sudip Mukherjee
2015-07-11 14:39 ` Greg Kroah-Hartman
2015-07-10 16:05 ` Kevin Hilman
2015-07-10 17:34 ` Greg Kroah-Hartman
2015-07-10 18:53 ` Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150708073239.666394806@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=cpaasch@apple.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eric.dumazet@gmail.com \
--cc=hannes@stressinduktion.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).