From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 7F5E03CB38 for ; Mon, 11 Feb 2019 04:24:53 -0500 (EST) Received: by smtp.codeaurora.org (Postfix, from userid 1000) id E0A5D60EE2; Mon, 11 Feb 2019 09:24:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1549877092; bh=BL5oGR8D0K+EvnZkNQdbxQFOEqEFrLSQmK/j5HkHtQc=; h=Subject:From:In-Reply-To:References:To:Cc:Date:From; b=D5egk4/LTxgHEPHt03wV6izxYaaaLwpPJpR4YtBAtpGtg+E1AjgPvzHIHko/RkM8E 4g2xFgsU/+edTCS2kCybcttR/4zce/pR7m00t1N0j9FXoTFg2RGZqOnV0oqyRbV/Xv slJR8D3CnF/61cVQScPGt8+c+5btXpL65khJ8iGg= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MISSING_DATE,MISSING_MID autolearn=no autolearn_force=no version=3.4.0 Received: from potku.adurom.net (88-114-240-156.elisa-laajakaista.fi [88.114.240.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: kvalo@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 9743A60E74; Mon, 11 Feb 2019 09:24:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1549877089; bh=BL5oGR8D0K+EvnZkNQdbxQFOEqEFrLSQmK/j5HkHtQc=; h=Subject:From:In-Reply-To:References:To:Cc:From; b=hVvTnfXat69ziQDiiNd7TeTiWalZ/J+GPSgouQfERx+1tMlRe9pspiKeOTSvYAitD 986C5ulSuF682Ah4hhd9kXxdLfK9V01C9+9ijMyrq/hop76opCwoWV0E/U8lU17x4w oovADa0aGWOYyvqlhhu26P8JN+ux9tosLyBiQj+I= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 9743A60E74 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=kvalo@codeaurora.org Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Kalle Valo In-Reply-To: <20190122142019.21417-5-toke@redhat.com> References: <20190122142019.21417-5-toke@redhat.com> To: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= Cc: linux-wireless@vger.kernel.org, Kan Yan , Rajkumar Manoharan , ath10k@lists.infradead.org, make-wifi-fast@lists.bufferbloat.net, =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= User-Agent: pwcli/0.0.0-git (https://github.com/kvalo/pwcli/) Python/2.7.12 Message-Id: <20190211092451.E0A5D60EE2@smtp.codeaurora.org> Date: Mon, 11 Feb 2019 09:24:50 +0000 (UTC) Subject: Re: [Make-wifi-fast] [PATCH v6 4/4] ath10k: reporting estimated tx airtime for fairness X-BeenThere: make-wifi-fast@lists.bufferbloat.net X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Feb 2019 09:24:53 -0000 Toke Høiland-Jørgensen wrote: > The airtime of a transmitted frame will be estimated from last used tx rate > which the firmware reports with the peer stats feature > (WMI_SERVICE_PEER_STATS). The airtime is computed on the tx path and it > will be reported to mac80211 upon tx completion. > > This change is based on Kan's orginal commit in Chromium tree > ("CHROMIUM: ath10k: Implementing airtime fairness based TX scheduler") > ref: https://chromium-review.googlesource.com/588190 > > Tested on QCA4019 with firmware version 10.4-3.2.1.1-00015 > Tested on QCA9984 with firmware version 10.4-3.9.0.1-00005 > > Signed-off-by: Kan Yan > [rmanohar@codeaurora.org: ported only the airtime computation] > Signed-off-by: Rajkumar Manoharan > [toke@redhat.com: Rebase to mac80211-next, add test note] > Signed-off-by: Toke Høiland-Jørgensen > Signed-off-by: Kalle Valo There was a trivial conflict, please check my resolution in the pending branch. I also reworded the commit log a bit. $ git am -s --reject 10775551.mbox Applying: ath10k: reporting estimated tx airtime for fairness Checking patch drivers/net/wireless/ath/ath10k/core.h... Checking patch drivers/net/wireless/ath/ath10k/htt_rx.c... Hunk #1 succeeded at 3080 (offset 2 lines). Checking patch drivers/net/wireless/ath/ath10k/mac.c... Hunk #1 succeeded at 3566 (offset 22 lines). Hunk #2 succeeded at 3583 (offset 22 lines). Hunk #3 succeeded at 3971 (offset 22 lines). Hunk #4 succeeded at 4029 (offset 22 lines). Hunk #5 succeeded at 4047 (offset 22 lines). Hunk #6 succeeded at 4315 (offset 22 lines). Hunk #7 succeeded at 8671 (offset 20 lines). Checking patch drivers/net/wireless/ath/ath10k/txrx.c... error: while searching for: wake_up(&htt->empty_tx_wq); spin_unlock_bh(&htt->tx_lock); if (ar->dev_type != ATH10K_DEV_TYPE_HL) dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); error: patch failed: drivers/net/wireless/ath/ath10k/txrx.c:95 Applied patch drivers/net/wireless/ath/ath10k/core.h cleanly. Applied patch drivers/net/wireless/ath/ath10k/htt_rx.c cleanly. Applied patch drivers/net/wireless/ath/ath10k/mac.c cleanly. Applying patch drivers/net/wireless/ath/ath10k/txrx.c with 1 reject... Rejected hunk #1. Patch failed at 0001 ath10k: reporting estimated tx airtime for fairness -- https://patchwork.kernel.org/patch/10775551/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches