From patchwork Tue Feb 21 14:21:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 730560 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vSN405NFJz9ryj for ; Wed, 22 Feb 2017 01:22:08 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="A4edfdbR"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753326AbdBUOWH (ORCPT ); Tue, 21 Feb 2017 09:22:07 -0500 Received: from mail-pg0-f41.google.com ([74.125.83.41]:36337 "EHLO mail-pg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752842AbdBUOWC (ORCPT ); Tue, 21 Feb 2017 09:22:02 -0500 Received: by mail-pg0-f41.google.com with SMTP id s67so25494471pgb.3 for ; Tue, 21 Feb 2017 06:22:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=nGd4PT6EYiSkLzUjsQMj7uKLrI/oe6d5HyfMMmxF9bw=; b=A4edfdbRxp0aTgVZ97jOZ6MxGMJe2j4PAF2+dnxhCxNnfQo22229smAPwNT+3sTYyz 6ZQNnWCxBvktbdRtS57N02LMa7aHpY7GIWunICrPf9aNlstHBOUQXVh+4IG3Ln/qogCd /INl6jczJNghEgC5U9vwkCl/dMGrgel3EibC7dUMfqIp6960s7T9iPck4xLb9DOHMz1L aMf1JHX+rdBz85gOvEoJDLU4QxycQfIeMy9eJ84FIezovPdo2AYH/xdaVyLi09Z3zfUj oC7rt8tW28ZyhjxNpV/DSrxRP38Iv8UubQbAp++9dIboZg7uOO97tzT1RXB8cRzly/r+ yAgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=nGd4PT6EYiSkLzUjsQMj7uKLrI/oe6d5HyfMMmxF9bw=; b=bOCsrCee9VhTDF22n4xzD6CMzunXUbhCv0Vc7TvO0I1DJHZwnOwYdrigdWgim3lOo5 m8vlNNy/4QunPjd6soTCPv/GauPq6YT7gzzcoeq7GPRzUnE+xDDNV+YlNWaMq3MnMES+ prV2qdix9jXNntSy7ZVWMTOw7NTmcFGM0z59zdvG/c4wmmnMsS7TQJQGteslOw6fohFl /dcOoRV13/6xGtTo5JFexB5EyfBIQ++BmIs5HqDXY7gnAqQgbh154WFnXC9qoS1ASihu hPF9I19rBUpw3wH6XdVFcS+YdKH8gBP8/b+mXSDgoSATq0xFvFM1XUwGYXDj8ObcDXmm VrFg== X-Gm-Message-State: AMke39nKdIQVuSqpVYbKJxGtD3P1fRqyuiA/+XG5dk9JU3TIvyAkqgnWdip5+nLVoXNHvKw7 X-Received: by 10.98.88.133 with SMTP id m127mr33563716pfb.155.1487686921852; Tue, 21 Feb 2017 06:22:01 -0800 (PST) Received: from localhost ([2620:0:1000:3002:ec82:94c8:5826:b698]) by smtp.gmail.com with ESMTPSA id x2sm41460824pfa.71.2017.02.21.06.22.00 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 21 Feb 2017 06:22:00 -0800 (PST) From: Eric Dumazet To: "David S . Miller" Cc: netdev , Ricardo Nabinger Sanchez , Eric Dumazet Subject: [PATCH net-next] tcp: Revert "tcp: tcp_probe: use spin_lock_bh()" Date: Tue, 21 Feb 2017 06:21:47 -0800 Message-Id: <20170221142147.19154-1-edumazet@google.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit e70ac171658679ecf6bea4bbd9e9325cd6079d2b. jtcp_rcv_established() is in fact called with hard irq being disabled. Initial bug report from Ricardo Nabinger Sanchez [1] still needs to be investigated, but does not look like a TCP bug. [1] https://www.spinics.net/lists/netdev/msg420960.html Signed-off-by: Eric Dumazet Reported-by: kernel test robot Cc: Ricardo Nabinger Sanchez --- net/ipv4/tcp_probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c index 3d063eb3784828b142874c92fd2db026bea0f3b3..f6c50af24a64737672f7ede2ff41158bfed5f1b4 100644 --- a/net/ipv4/tcp_probe.c +++ b/net/ipv4/tcp_probe.c @@ -117,7 +117,7 @@ static void jtcp_rcv_established(struct sock *sk, struct sk_buff *skb, (fwmark > 0 && skb->mark == fwmark)) && (full || tp->snd_cwnd != tcp_probe.lastcwnd)) { - spin_lock_bh(&tcp_probe.lock); + spin_lock(&tcp_probe.lock); /* If log fills, just silently drop */ if (tcp_probe_avail() > 1) { struct tcp_log *p = tcp_probe.log + tcp_probe.head; @@ -157,7 +157,7 @@ static void jtcp_rcv_established(struct sock *sk, struct sk_buff *skb, tcp_probe.head = (tcp_probe.head + 1) & (bufsize - 1); } tcp_probe.lastcwnd = tp->snd_cwnd; - spin_unlock_bh(&tcp_probe.lock); + spin_unlock(&tcp_probe.lock); wake_up(&tcp_probe.wait); }