From patchwork Thu May 17 23:15:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 10407847 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D3EB160155 for ; Thu, 17 May 2018 23:17:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C01B628446 for ; Thu, 17 May 2018 23:17:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B468C287EA; Thu, 17 May 2018 23:17:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 36EA6287E9 for ; Thu, 17 May 2018 23:17:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=F6Y8CxtRP2jFmDkVsnA8EXzgjtajpUvd80UjTSKREeU=; b=PKSHav32ihLIiV VouMNiHu93wV8/26CMbkrcU5I/LoExAG7fiCNpITyAZTK3EOYllcbHieL0xcNUlcNmkmTlESO+ju+ Yn0VRhtJvMzVCceQfTw58VBVGPrBF0mtdGXq9mo/DRASaWoxmlVpny/hNL9KZ2Aous8uCjNnS1ve6 3v+MSe6Ybuv92semAAtd2zsrtg6O8Jb4ZZZf408Rj92OK8BJs7eE1n17pXiFD95Q+SeaP4oTyZpU9 t+Hg1QKl95pngC9CvWplYSuXu9k7W5Egfn6RGa082f7CvZTPE1gErPRh9Z+/vb9y0JXS9RTj80NL0 /kNvL2LqVdFhHZ/peD7Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJS8n-0003j1-QE; Thu, 17 May 2018 23:16:57 +0000 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJS8j-0003fl-ST for ath10k@lists.infradead.org; Thu, 17 May 2018 23:16:55 +0000 Received: by mail-lf0-x241.google.com with SMTP id i11-v6so5914183lfb.7 for ; Thu, 17 May 2018 16:16:41 -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:mime-version :content-transfer-encoding; bh=HdvvtESh+yvsSPQ4QveyGIOTUYIWh2882DKh6TLqDLA=; b=Zvqc4ZnxH3QJ/VSueKxR7nLxCn2joT8IMZ98a7H13etf2DsX22ohUBknzI/qwLwGe6 EwhpovGcrOrjZ4hjL+zZrifhMOomqfzInIPHbCeTut+jTuVWiAJSz1qXI7gZlPvD7u2L rFobYbxxjZ2ed+/SWItgKeCThKQ2BkvZlcyYc= 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:mime-version :content-transfer-encoding; bh=HdvvtESh+yvsSPQ4QveyGIOTUYIWh2882DKh6TLqDLA=; b=UJCVMjtck83CuKTD+rMh/aX5d82xXer7yJN03ZiG20ydSSXNlFml1EGCmZBCVZCauw eIt1jmq1nQIP2eNAbZzP9QLWL/rFY7oEhuCWYoizb7RTuFS9p18bGrPCeHVCbPlnP5nU AEv09MYmWLeBDA06ZX1kh1GFEBoESj7rDTYuikykU8hlYk/SGSkCWuxvR/FAPKF2aEmK lcKDqaw/iNip17Y2xkC7jwTbKG/mlk8sfnnaaDnM0aK90YBkiXoLEgh0rswjXn7A6ykS +biK4KCzUvt3z8VfHXa9TiLc1zPEMs6t5D0p6yznukhLh8I+YvXBatBNahKqqjqi0YSD i6Qg== X-Gm-Message-State: ALKqPwcYvRASG13f0sndUFGPizdgAySiDvWhz0k2q82haVJpqWWwEoBk UHg8trRq2s5jCVvzWkb9Dzrmmw== X-Google-Smtp-Source: AB8JxZrEqHfWoSwsaKL6WQZq1U0CvyDf7uaB5LD1n67pLJqaLBaSIaUElTZLcX/cKBvRCXM8tqcviA== X-Received: by 2002:a19:7007:: with SMTP id h7-v6mr18388070lfc.123.1526599000273; Thu, 17 May 2018 16:16:40 -0700 (PDT) Received: from localhost.lan (h-229-118.A785.priv.bahnhof.se. [5.150.229.118]) by smtp.gmail.com with ESMTPSA id t8-v6sm735172lfk.69.2018.05.17.16.16.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 May 2018 16:16:39 -0700 (PDT) From: Niklas Cassel To: Kalle Valo , "David S. Miller" Subject: [PATCH] ath10k: transmit queued frames after waking queues Date: Fri, 18 May 2018 01:15:12 +0200 Message-Id: <20180517231512.13085-1-niklas.cassel@linaro.org> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180517_161653_921344_67E0888B X-CRM114-Status: GOOD ( 10.74 ) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Niklas Cassel , netdev@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, ath10k@lists.infradead.org Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The following problem was observed when running iperf: [ 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. In order to avoid trying to flush the queue every time we free a frame, only do this when there are 3 or less frames pending, and while we actually have frames in the queue. This logic was copied from mt76_txq_schedule (mt76), one of few other drivers that are actually using wake_tx_queue. Suggested-by: Toke Høiland-Jørgensen Signed-off-by: Niklas Cassel --- drivers/net/wireless/ath/ath10k/txrx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c index cda164f6e9f6..1d3b2d2c3fee 100644 --- a/drivers/net/wireless/ath/ath10k/txrx.c +++ b/drivers/net/wireless/ath/ath10k/txrx.c @@ -95,6 +95,9 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt, wake_up(&htt->empty_tx_wq); spin_unlock_bh(&htt->tx_lock); + if (htt->num_pending_tx <= 3 && !list_empty(&ar->txqs)) + ath10k_mac_tx_push_pending(ar); + dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); ath10k_report_offchan_tx(htt->ar, msdu);