From patchwork Mon May 21 20:43:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 10416321 X-Patchwork-Delegate: kvalo@adurom.com 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 3130160365 for ; Mon, 21 May 2018 20:44:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2234528A41 for ; Mon, 21 May 2018 20:44:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16FEE28A43; Mon, 21 May 2018 20:44:25 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC6F528A41 for ; Mon, 21 May 2018 20:44:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751202AbeEUUoL (ORCPT ); Mon, 21 May 2018 16:44:11 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:37247 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751027AbeEUUoJ (ORCPT ); Mon, 21 May 2018 16:44:09 -0400 Received: by mail-lf0-f65.google.com with SMTP id r2-v6so25863174lff.4 for ; Mon, 21 May 2018 13:44:09 -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=bHVcNdmFIIAIu2uug9YIcw/g+DLQaXmXVrR7NA4ECEI=; b=K5ZlMja1d4ix1f9Ms5TP+C75Fv6VRcATpSJn9+g+NdV2PjgMJIPOiZ0PwfIi43e/kb feju90siko7rtrS/qd3ovMAFrT5mzXhbY8FOHu/rHPHsuTs0cRYcH3qQ+ZH9Wy5Ovzs4 WK5h5dJFAOsiFycOdSNFv+2xQQ3QPq47BnOfU= 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=bHVcNdmFIIAIu2uug9YIcw/g+DLQaXmXVrR7NA4ECEI=; b=UKPjdX6N/l7xumnR1kGYkxPcbDP7I6h78MG1lO3H8xLeWxJSEmJ/giWhOOsBBX3hkp hLcdgIq+rIXInlY40FG2YM7gDG+zVz2kDnSbU0mWrXW6CPiCpJYaRuRhaTkZJZzkUMca EcHxVgTiHXAgxW7N4iwZMyzuCNkrEf76BpXRh31W5mw2vOjc0mTZ0HfSSI08r8wjgMxq USBQrK5dVzQGY2by/pu1Cu/JyTuX+1YjvS85/P4pME4rWN/W1osE2sLDCGo4VCh9dPd9 v3sBZ3zuaU6gyq23f2R3aEgvyS8ng8L7vrhUyQhPwFJSEB3NLD4PupHe7AIDiE4nUu33 Q2Hw== X-Gm-Message-State: ALKqPwcd2Ud/3JeFRe9FsUZHqjF5sRdYF/9Ygpmcw52ijYl+2Gt4v3Zq ZlOiG2d7eAHzcrc0cEYN5aYmzoD+t1A= X-Google-Smtp-Source: AB8JxZqqtIUz1ea8la+a6XJ6k6ZjmKv17rE6Qa3FKmV3lCntypPctNzIgFOhewC8SW4jr6Xx6x65hg== X-Received: by 2002:a2e:8993:: with SMTP id c19-v6mr13549272lji.123.1526935448310; Mon, 21 May 2018 13:44:08 -0700 (PDT) Received: from localhost.lan (h-229-118.A785.priv.bahnhof.se. [5.150.229.118]) by smtp.gmail.com with ESMTPSA id a21-v6sm3630660lfl.84.2018.05.21.13.44.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 May 2018 13:44:07 -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 v2] ath10k: transmit queued frames after waking queues Date: Mon, 21 May 2018 22:43:59 +0200 Message-Id: <20180521204359.23884-1-niklas.cassel@linaro.org> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.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 --- Changes since V1: use READ_ONCE() to disallow the compiler optimizing things in undesirable ways. 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..264cf0bd5c00 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 (READ_ONCE(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);