From patchwork Wed Mar 30 21:04:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: per.forlin@gmail.com X-Patchwork-Id: 8705231 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 05E969F44D for ; Wed, 30 Mar 2016 21:05:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 115EE20389 for ; Wed, 30 Mar 2016 21:05:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 08F592037E for ; Wed, 30 Mar 2016 21:05:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752085AbcC3VFJ (ORCPT ); Wed, 30 Mar 2016 17:05:09 -0400 Received: from mail-lb0-f172.google.com ([209.85.217.172]:32861 "EHLO mail-lb0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751156AbcC3VFH (ORCPT ); Wed, 30 Mar 2016 17:05:07 -0400 Received: by mail-lb0-f172.google.com with SMTP id u8so39940508lbk.0 for ; Wed, 30 Mar 2016 14:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=UJ1QSTpPsCEG004R4Eg2AhVrVSLev1djk+V1/TrLhoA=; b=Cs5bLJvRHzZEk2VLXpgTExJyFgtPIMb4MbXhB0zkbATfdSUV5Y6n2N14Nyano0XJUA uIXn0eun28FNF65Vjw8LaSnHaf9C8pyNsz38hW5LlJ7+xpA/X/Kpsqbxw8wdh5CeGnv+ CpG2IL7ssfb8BIDNUqHkoJsj5dGlnhg7R0lbf+CJMFLQtkG0BiddvgQ6Fz+pIzvnTDfc b44s2bQplilO7i7ZWvysPZ+B7+LJ+19JTuPB6R+AwDpHqLyGXFGOl/BbFleC0l7qQwUj N7ucTLQxtJ+A0kykwT/hEKn/FTeGYhYriELsZ569QyRQQoXtFa0SBdVR3Y9/doCDxXKB 9HjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=UJ1QSTpPsCEG004R4Eg2AhVrVSLev1djk+V1/TrLhoA=; b=i7knrpBXHldZPYyf0XbHB67kYIFcdnNTSYHfhuYyCaBujfXg38/DhqIEY+VLs7Syi3 ofT5DIOAtl/n+mfd7IMxNCLoEKOxiUtF9WIzT2P71fPxyDRsFANeu37U647owdhLNvtO Sg6zGPEiLXklEabTt6GSVTNnpAR5CXrZhJ0DWyxeLIKuSqFirTbnIE8cdxY+EFAV+EDy 3QImNLBZfeEmspUGJvuzCgqp9/1nGsBbbj08ECMzNUMO3lrhLeXtBP03XK5Qe42bOZaI ArrX9RUq24W39t9erlE3aK9XdDLVMtt9IHiPW1Jd5dpy2wTfFtb5H3ij3TPXyJJrVput MTmg== X-Gm-Message-State: AD7BkJK6rv3RQupP3+RUDAcRnD+cADCuyL7dF2icVi3J0ftZWY/ULy/PUMFyKhiTGCjQDw== X-Received: by 10.112.198.65 with SMTP id ja1mr4869960lbc.123.1459371906240; Wed, 30 Mar 2016 14:05:06 -0700 (PDT) Received: from localhost.localdomain (109-104-20-244.customers.ownit.se. [109.104.20.244]) by smtp.gmail.com with ESMTPSA id hw7sm849011lbb.40.2016.03.30.14.05.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 14:05:05 -0700 (PDT) From: per.forlin@gmail.com To: linux-wireless@vger.kernel.org Cc: arend@broadcom.com, zajec5@gmail.com, Per Forlin Subject: [PATCH] brcmfmac: Don't increase 8021x_cnt for dropped packets Date: Wed, 30 Mar 2016 23:04:33 +0200 Message-Id: <1459371873-3939-1-git-send-email-per.forlin@gmail.com> X-Mailer: git-send-email 2.1.4 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Per Forlin The pend_8021x_cnt gets into a state where it's not being decreased. When the brcmf_netdev_wait_pend8021x is called it will timeout because there are no pending packets to be consumed. There is no easy way of getting out of this state once it has happened. Preventing the counter from being increased in case of dropped packets seem like a reasonable solution. Log showing overflow txq and increased cnt: // Extra debug prints brcmfmac: [brcmf_netdev_wait_pend8021x] pend_8021x_cnt == 0 brcmfmac: [brcmf_netdev_start_xmit] pend_8021x_cnt == 1 brcmfmac: [brcmf_netdev_start_xmit] pend_8021x_cnt == 2 brcmfmac: brcmf_sdio_bus_txdata: out of bus->txq !!! brcmfmac: brcmf_sdio_bus_txdata: out of bus->txq !!! brcmfmac: brcmf_sdio_bus_txdata: out of bus->txq !!! brcmfmac: brcmf_sdio_bus_txdata: out of bus->txq !!! brcmfmac: brcmf_sdio_bus_txdata: out of bus->txq !!! brcmfmac: brcmf_sdio_bus_txdata: out of bus->txq !!! brcmfmac: brcmf_sdio_bus_txdata: out of bus->txq !!! brcmfmac: brcmf_sdio_bus_txdata: out of bus->txq !!! brcmfmac: brcmf_sdio_bus_txdata: out of bus->txq !!! brcmfmac: brcmf_sdio_bus_txdata: out of bus->txq !!! // Extra debug prints brcmfmac: [brcmf_netdev_start_xmit] pend_8021x_cnt == 3 brcmfmac: [brcmf_netdev_start_xmit] pend_8021x_cnt == 4 brcmfmac: [brcmf_netdev_wait_pend8021x] pend_8021x_cnt == 4 WARNING: at .../brcmfmac/core.c:1289 brcmf_netdev_wait_pend8021x (warn_slowpath_common) (warn_slowpath_null) (brcmf_netdev_wait_pend8021x [brcmfmac]) (send_key_to_dongle [brcmfmac]) (brcmf_cfg80211_del_key [brcmfmac]) (nl80211_del_key [cfg80211]) (genl_rcv_msg) (netlink_rcv_skb) (genl_rcv) (netlink_unicast) (netlink_sendmsg) (sock_sendmsg) (___sys_sendmsg) (__sys_sendmsg) (SyS_sendmsg) Signed-off-by: Per Forlin --- I came across this bug in an older kernel but it seems relevant for the latest kernel as well. I'm not familiar with the code but I can reproduce the issue and verify a fix for it. This patch seems to work for my use case but I need to run some more tests to know for sure. drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 2 ++ 1 file changed, 2 insertions(+) 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c index ed9998b..8b1e30c 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c @@ -241,7 +241,8 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, done: if (ret) { ifp->stats.tx_dropped++; + if (eh->h_proto == htons(ETH_P_PAE)) + atomic_dec(&ifp->pend_8021x_cnt); } else { ifp->stats.tx_packets++; ifp->stats.tx_bytes += skb->len; --