From patchwork Sat Oct 19 11:37:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 11200141 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 45040913 for ; Sat, 19 Oct 2019 11:37:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1FF0E21D7C for ; Sat, 19 Oct 2019 11:37:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rkA/7+3i"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fGW28cXe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1FF0E21D7C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org 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:To:From: Subject: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=3x7gy9kWUXs+L+S+zS7oTmp8T4KQ5MqBQ/C588xv2I8=; b=rkA/7+3idD8jay OO/R5Q7CpTBOKnyun6feQsU30Zc1m6QZEaV3lkS+SisOoESN1+Du6RZU9B8jXxWX0Vhq1rXPbScPr yzIxtNi5/fg+ljcKrN/DdQ2oqMmIzGj9UZO+zOXEf5aia+lBziBdo347cAyh+cbWoDUePF2mXhDtb 3iR2bPDpt6VUbmsk5Gk05pDGD/EvVNzf6at16sseHKoS5ARj9SENRwD089hBsbZxCDOy8X0zZZMuM KSfMZ1nG89MjREueho/UE7QEfXzydFEY59E0ilqW7XpPNOmrfF8tcHsO8Ks/v4fxQUjnHOi2DuJwq jBfwul0lY98mM/8vBRww==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iLn2z-0003u6-Sj; Sat, 19 Oct 2019 11:37:25 +0000 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120] helo=us-smtp-1.mimecast.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iLn2w-0003sy-Ux for ath10k@lists.infradead.org; Sat, 19 Oct 2019 11:37:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571485041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=muExcf0yCS6wTiOGyHLKDSUQbgUBrcGix+0WiNdqPFM=; b=fGW28cXeYXtxne8RKNOjSO6Ds4++egU+1ACFGN92+ssbxVmP75pf4MNJRmi0Z5iTBqjKSw OSwZKFAn2GKr0dIQGwollXHu8RxY4O0dc0Rrqtk7eaCt44MDqTNXdAxh/xE5Rz0TFhNY3c X2phSXgzMihIkEhnmEmNJi4eE6TAzVI= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-243-Ha3JI0bLMNKIy6GK46-rnA-1; Sat, 19 Oct 2019 07:37:17 -0400 Received: by mail-lf1-f71.google.com with SMTP id o2so600797lfb.12 for ; Sat, 19 Oct 2019 04:37:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:user-agent :mime-version:content-transfer-encoding; bh=qR0qPuNr+iUroIduE98U31BmbYV0VOc1XPfPgGkQcq8=; b=liSPGuLbEIDqBPrTuqgcnLnPmL6VvyqhrB2RvYLBQR1DjObYeAmZpjcsYiZtYEM1jM YFKDRNLsw55ny0J0zbJE8Id09hapI2UKYFiuDpNl3Tmxbum/GsJPfUnKwu/KMhOgZzw4 O0jkaSYL7nDGTH+y6xGE+UtDmO5iA4vO/h0P4F+U3c4HRBjt8t6VfYlIOUfP1rHMAb+C Ol5RhUySP0GVeIXj+Woe5rViBlGRk8kWDiAz5LHGEtn3B1zDJM5zpKYCY+rIRR4xgHde hYR0oUfUOCw/frE0MpptyzNA5WDgGzFhhllERUEmp/NjkcRaWX1ntPmsBVMG4QrkOBU6 PGYA== X-Gm-Message-State: APjAAAV/kbQ3RgYbxCwpodD0Mt5n7t7zxd32WswmtyZykJr25lOtmt5j z1Vznc5e/1DXktsi6MDSg6sst5eY9r6UbO6FFamBoRqFTXQZ3GM/DwOxqNRqr95eWfCPijmnGnB EnN0Uls77a5N00zxh0nGE/g== X-Received: by 2002:a19:ad4c:: with SMTP id s12mr9451090lfd.49.1571485035935; Sat, 19 Oct 2019 04:37:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqwgYpL1rydi5XQWs/yj8s7rfZ6wHgMQtlj+W+mhe/lrCRacyZBa1z3mpBfKXWwigRyz+9hsrA== X-Received: by 2002:a19:ad4c:: with SMTP id s12mr9451070lfd.49.1571485035712; Sat, 19 Oct 2019 04:37:15 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a00:7660:6da:443::2]) by smtp.gmail.com with ESMTPSA id 3sm6388408ljs.20.2019.10.19.04.37.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 04:37:14 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 42A901804C8; Sat, 19 Oct 2019 13:37:14 +0200 (CEST) Subject: [PATCH v4 0/4] Add Airtime Queue Limits (AQL) to mac80211 From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Johannes Berg Date: Sat, 19 Oct 2019 13:37:14 +0200 Message-ID: <157148503415.2989444.7391437309981941226.stgit@toke.dk> User-Agent: StGit/0.20 MIME-Version: 1.0 X-MC-Unique: Ha3JI0bLMNKIy6GK46-rnA-1 X-Mimecast-Spam-Score: 0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191019_043723_082729_0F265328 X-CRM114-Status: GOOD ( 12.01 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [207.211.31.120 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kan Yan , Rajkumar Manoharan , Kevin Hayes , make-wifi-fast@lists.bufferbloat.net, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, John Crispin , Lorenzo Bianconi , Felix Fietkau Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org This series is a first attempt at porting the Airtime Queue Limits concept from the out-of-tree ath10k implementation[0] to mac80211. This version takes Kan's patch to do the throttling in mac80211, and replaces the driver API with the mechanism from the previous version of my series, which instead calculated the expected airtime at dequeue time inside mac80211, storing it in the SKB cb field. This series also imports Felix' airtime calculation code from mt76 into mac80211, adjusting the API so it can be used from TX dequeue, by extracting the latest TX rate from the tx_stats structure kept for each station. As before, I've only compile tested this (lacking the proper hardware to do more testing). So I'm hoping someone with a proper testing setup can take the whole thing for a spin... :) The series is also available in my git repo here: https://git.kernel.org/pub/scm/linux/kernel/git/toke/linux.git/log/?h=mac80211-aql-02 Changelog: v4: - Fix calculation that clamps the maximum airtime to fit into 10 bits - Incorporate Rich Brown's nits for the commit message in Kan's patch - Add fewer local variables to ieee80211_tx_dequeue() v3: - Move the tx_time_est field so it's shared with ack_frame_id, and use units of 4us for the value stored in it. - Move the addition of the Ethernet header size into ieee80211_calc_expected_tx_airtime() v2: - Integrate Kan's approach to airtime throttling. - Hopefully fix the cb struct alignment on big-endian architectures. --- Kan Yan (1): mac80211: Implement Airtime-based Queue Limit (AQL) Toke Høiland-Jørgensen (3): mac80211: Shrink the size of ack_frame_id to make room for tx_time_est mac80211: Import airtime calculation code from mt76 mac80211: Use Airtime-based Queue Limits (AQL) on packet dequeue include/net/cfg80211.h | 7 + include/net/mac80211.h | 30 +++- net/mac80211/Makefile | 3 net/mac80211/airtime.c | 377 ++++++++++++++++++++++++++++++++++++++++++++ net/mac80211/cfg.c | 2 net/mac80211/debugfs.c | 78 +++++++++ net/mac80211/debugfs_sta.c | 43 ++++- net/mac80211/ieee80211_i.h | 8 + net/mac80211/main.c | 9 + net/mac80211/sta_info.c | 32 ++++ net/mac80211/sta_info.h | 8 + net/mac80211/status.c | 38 ++++ net/mac80211/tx.c | 69 ++++++++ 13 files changed, 686 insertions(+), 18 deletions(-) create mode 100644 net/mac80211/airtime.c