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: 915854 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="Zvqc4Znx"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40n6dN2QCyz9s37 for ; Fri, 18 May 2018 09:16:56 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752030AbeEQXQn (ORCPT ); Thu, 17 May 2018 19:16:43 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:33872 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751958AbeEQXQl (ORCPT ); Thu, 17 May 2018 19:16:41 -0400 Received: by mail-lf0-f65.google.com with SMTP id r25-v6so11208766lfd.1 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=gG2byKHRhFA6WIpV1iySAdFFG1ALqURnxOOYbK2p/FEjK30TxPCVUoEZbaHUwaXHhS rfNPMDOCHLF9zprlmmBU3cebbAIuFSbO6yTCZdih5G1kxhRnhYN90SLlIQjVmETfzRz/ dXZo/K4kjZ0UBLHGGjIK8AAX1dubqUo8efVVbgUdzXKxg8U0DSvrvaeCMpL/JE1oVQpx Bs9FF2K6MKXWBrr1Ar7Z2XqQvXOH5xxTnrFhndrZBGN/hzIzMdlFPAHGdUrLEaQT5Jd2 j80OyQZtxcLiKrMxD1j3Nj2RMgLBRUUhJStT+tgiQfS7lbnAzWxUuF1l+geeOFYZJ+oB gx3Q== X-Gm-Message-State: ALKqPwdH5aFPCvrWnkolTIGtysQLIYr42pYyFaGC7ZNKA8x3+DOJKHxG R0vCVNpEZvGyHcZVu2mto4+JgQ== 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" Cc: Niklas Cassel , ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org 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 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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);