From patchwork Wed May 23 22:15:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 919414 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="CyUg+w1b"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rmzz2qKJz9s0W for ; Thu, 24 May 2018 08:15:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934675AbeEWWP3 (ORCPT ); Wed, 23 May 2018 18:15:29 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:46193 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934486AbeEWWP1 (ORCPT ); Wed, 23 May 2018 18:15:27 -0400 Received: by mail-wr0-f193.google.com with SMTP id x9-v6so26345335wrl.13 for ; Wed, 23 May 2018 15:15:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=9h0EFRWo8VAjkvQnIbf8nuzTYFUQ3nt1sGIqh05z5r4=; b=CyUg+w1b3cVCIHVVTb3q1c+angWE02VPYNG3+98oK04jLkMo0sEb/YEb2UMhD3v53z fEidMvtyz6QQK4uxkoaLa5vT3uCdBtfUH8bjq6DJe4Zpy8Ruf6J32TecfdLNUHA321QI PQYPAgVWXFvqlsQlWC9rzPqW3NGU4g2jKYats= 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=9h0EFRWo8VAjkvQnIbf8nuzTYFUQ3nt1sGIqh05z5r4=; b=MKwm403VN9Qvbt7OxbPO8Fbk2RM8JRYMIXqLrqk1x+TzIqglBM4U4EaqZU5G5VvOjW a59sMhPSzMaOmGB3fBC78jjXZMlfNXd1V6NDZKkaXrXqVAWCTNfzz3f9q1l2KNyPmFpz XtlJkrY5dfcP3B0sH2V0yfIXCOjTHHt/qrtJljUxM453mZn9RI+/fBhiuPxwBsB0D8IC Ti5ozh2n62IUB+L3sPihLc1/0Jz1+ZnbOnyrDA/bnM+WNOI7J3JdLtMdoYc/j5xwB8of XrSczG85YLTjBecQBmiyWbyaAhO3F/1ignH0pZi7XsNn69iwrC4lhCduyjse66Ck0uXt ykdg== X-Gm-Message-State: ALKqPwdJgHYhd0HGE1nGyD+j5UFSQR7D1ARv2AhkO8KJdixCMJijr59l OjZY2Chkd6MM39T30hUXQEcWcw== X-Google-Smtp-Source: AB8JxZryQ/eX76JTUh0Fbg4H4Ffqy4thCG+Hv5qH7JAsdZEh7SEP/toucIr82kZS2QRDRvIOtjlfhw== X-Received: by 2002:a19:9f8e:: with SMTP id i136-v6mr2693369lfe.5.1527113726427; Wed, 23 May 2018 15:15:26 -0700 (PDT) Received: from localhost.lan (h-229-118.A785.priv.bahnhof.se. [5.150.229.118]) by smtp.gmail.com with ESMTPSA id a19-v6sm4705949lfi.86.2018.05.23.15.15.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 15:15:25 -0700 (PDT) From: Niklas Cassel To: Kalle Valo , "David S. Miller" Cc: Niklas Cassel , ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] ath10k: transmit queued frames after processing rx packets Date: Thu, 24 May 2018 00:15:08 +0200 Message-Id: <20180523221508.26391-1-niklas.cassel@linaro.org> X-Mailer: git-send-email 2.17.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When running iperf on ath10k SDIO, TX can stop working: iperf -c 192.168.1.1 -i 1 -t 20 -w 10K [ 3] 0.0- 1.0 sec 2.00 MBytes 16.8 Mbits/sec [ 3] 1.0- 2.0 sec 3.12 MBytes 26.2 Mbits/sec [ 3] 2.0- 3.0 sec 3.25 MBytes 27.3 Mbits/sec [ 3] 3.0- 4.0 sec 655 KBytes 5.36 Mbits/sec [ 3] 4.0- 5.0 sec 0.00 Bytes 0.00 bits/sec [ 3] 5.0- 6.0 sec 0.00 Bytes 0.00 bits/sec [ 3] 6.0- 7.0 sec 0.00 Bytes 0.00 bits/sec [ 3] 7.0- 8.0 sec 0.00 Bytes 0.00 bits/sec [ 3] 8.0- 9.0 sec 0.00 Bytes 0.00 bits/sec [ 3] 9.0-10.0 sec 0.00 Bytes 0.00 bits/sec [ 3] 0.0-10.3 sec 9.01 MBytes 7.32 Mbits/sec There are frames in the ieee80211_txq and there are frames that have been removed from from this queue, but haven't yet been sent on the wire (num_pending_tx). When num_pending_tx reaches max_num_pending_tx, we will stop the queues by calling ieee80211_stop_queues(). As frames that have previously been sent for transmission (num_pending_tx) are completed, we will decrease num_pending_tx and wake the queues by calling ieee80211_wake_queue(). ieee80211_wake_queue() does not call wake_tx_queue, so we might still have frames in the queue at this point. While the queues were stopped, the socket buffer might have filled up, and in order for user space to write more, we need to free the frames in the queue, since they are accounted to the socket. In order to free them, we first need to transmit them. This problem cannot be reproduced on low-latency devices, e.g. pci, since they call ath10k_mac_tx_push_pending() from ath10k_htt_txrx_compl_task(). ath10k_htt_txrx_compl_task() is not called on high-latency devices. Fix the problem by calling ath10k_mac_tx_push_pending(), after processing rx packets, just like for low-latency devices, also in the SDIO case. Since we are calling ath10k_mac_tx_push_pending() directly, we also need to export it. Signed-off-by: Niklas Cassel --- Changes since V2: Moved ath10k_mac_tx_push_pending() call to ath10k_sdio_irq_handler(). drivers/net/wireless/ath/ath10k/mac.c | 1 + drivers/net/wireless/ath/ath10k/sdio.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 487a7a7380fd..bfcd9705ed54 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -4038,6 +4038,7 @@ void ath10k_mac_tx_push_pending(struct ath10k *ar) rcu_read_unlock(); spin_unlock_bh(&ar->txqs_lock); } +EXPORT_SYMBOL(ath10k_mac_tx_push_pending); /************/ /* Scanning */ diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c index d612ce8c9cff..2856c75f9011 100644 --- a/drivers/net/wireless/ath/ath10k/sdio.c +++ b/drivers/net/wireless/ath/ath10k/sdio.c @@ -30,6 +30,7 @@ #include "debug.h" #include "hif.h" #include "htc.h" +#include "mac.h" #include "targaddrs.h" #include "trace.h" #include "sdio.h" @@ -1342,6 +1343,8 @@ static void ath10k_sdio_irq_handler(struct sdio_func *func) break; } while (time_before(jiffies, timeout) && !done); + ath10k_mac_tx_push_pending(ar); + sdio_claim_host(ar_sdio->func); if (ret && ret != -ECANCELED)