From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 587603CB4F for ; Sat, 16 Nov 2019 06:57:24 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573905443; 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: in-reply-to:in-reply-to:references:references; bh=YXoS2W5BbZsp09HQfFBXWaQ8N7PlWsSs7THfUeKuQyo=; b=Rk/Ofw01ilidAHxDEbF3CVU5u1j47aBhV9BPoWiB/TuUDJpToPSeH+r8JL4r5OS/orRu4r 3+y1nDwm0C1rbTB7O9TMeIzKHOrkJmc112sXUkMdpXbJLkhmWhsm8A8MDCQCvyjYcfjq40 uNBvcn/j599rKWosYV2HdsmOZ5l3PZk= 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-304-EZ_Gu7KxOEuyK8O9uORzbA-1; Sat, 16 Nov 2019 06:57:22 -0500 Received: by mail-lf1-f71.google.com with SMTP id q1so3975443lfp.16 for ; Sat, 16 Nov 2019 03:57:22 -0800 (PST) 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:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=x+t/BOQM8F7dbfpj4lBhXe72lJwS1NOF599JEwP8bYk=; b=ny4XX93Am2fzHm0NVsCCPaKXMKu/L2zSarbxT09Hib6jVK1AoFRvwYBdufGfgvvN9g 4m6PXzBhFeTjUtXvGOpoh3wDO9weCpl43wmgORbPHkxkMCziKR/RKrXK531FH1FIDv6P k+/s+Pmhg0paznHYF4WKRYGWOzJuMi9e2vsPWEIlSK3y8/8x6EydXlZ8FiENjTN72ps6 7i5wA6GCw9xXwMk244yOmyOtuZTGrNGJGNsGY7s8J75lwevkflPSAWqvtuC1cDZSR+Kz szh+kPhJ/nsixYFyw0G98nPHlO9SzxnlZJ6ntGEeCd7uM0zCl1Vc2Jc4v+2JRDLaVPXa wv0A== X-Gm-Message-State: APjAAAV5vJ+y0dwIO6LFno0gOjLJpq0qjjjGMDgUlDbLRTRmNebFmHze Xm8fHeylsRk+IXGxuJwpQlhTVKGtf+M2N6s+dONeohQ/t+20SCqkomPtHC/otrXJSF8DbGixSYY MHKWsCGblSVCAvnS3X/7aQLvufsekH9ewME4= X-Received: by 2002:a2e:9156:: with SMTP id q22mr10462790ljg.166.1573905440930; Sat, 16 Nov 2019 03:57:20 -0800 (PST) X-Google-Smtp-Source: APXvYqz0L+POcRH+ZCGceuYnd9tkUS+fm0ri2a2QHKWHz6GQdx5Ehz43kLACA3daj8P4f0JD6MpnUA== X-Received: by 2002:a2e:9156:: with SMTP id q22mr10462771ljg.166.1573905440761; Sat, 16 Nov 2019 03:57:20 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([2a00:7660:6da:443::2]) by smtp.gmail.com with ESMTPSA id s28sm6071884lfp.92.2019.11.16.03.57.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Nov 2019 03:57:18 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 1483C181911; Sat, 16 Nov 2019 12:57:18 +0100 (CET) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Johannes Berg Cc: linux-wireless@vger.kernel.org, make-wifi-fast@lists.bufferbloat.net, ath10k@lists.infradead.org, John Crispin , Lorenzo Bianconi , Felix Fietkau , Kan Yan , Rajkumar Manoharan , Kevin Hayes Date: Sat, 16 Nov 2019 12:57:18 +0100 Message-ID: <157390543799.662247.14225450732789555896.stgit@toke.dk> In-Reply-To: <157390543688.662247.3735146484299260207.stgit@toke.dk> References: <157390543688.662247.3735146484299260207.stgit@toke.dk> User-Agent: StGit/0.21 MIME-Version: 1.0 X-MC-Unique: EZ_Gu7KxOEuyK8O9uORzbA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Make-wifi-fast] [PATCH v10 1/4] mac80211: Add new sta_info getter by sta/vif addrs 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: Sat, 16 Nov 2019 11:57:24 -0000 From: Toke H=C3=B8iland-J=C3=B8rgensen In ieee80211_tx_status() we don't have an sdata struct when looking up the destination sta. Instead, we just do a lookup by the vif addr that is the source of the packet being completed. Factor this out into a new sta_info getter helper, since we need to use it for accounting AQL as well. Signed-off-by: Toke H=C3=B8iland-J=C3=B8rgensen --- net/mac80211/sta_info.c | 20 ++++++++++++++++++++ net/mac80211/sta_info.h | 3 +++ net/mac80211/status.c | 10 ++-------- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index bd11fef2139f..465d83b13582 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -210,6 +210,26 @@ struct sta_info *sta_info_get_bss(struct ieee80211_sub= _if_data *sdata, =09return NULL; } =20 +struct sta_info *sta_info_get_by_addrs(struct ieee80211_local *local, +=09=09=09=09 const u8 *sta_addr, const u8 *vif_addr) +{ +=09struct rhlist_head *tmp; +=09struct sta_info *sta; + +=09rcu_read_lock(); +=09for_each_sta_info(local, sta_addr, sta, tmp) { +=09=09if (ether_addr_equal(vif_addr, sta->sdata->vif.addr)) { +=09=09=09rcu_read_unlock(); +=09=09=09/* this is safe as the caller must already hold +=09=09=09 * another rcu read section or the mutex +=09=09=09 */ +=09=09=09return sta; +=09=09} +=09} +=09rcu_read_unlock(); +=09return NULL; +} + struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata, =09=09=09=09 int idx) { diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 369c2dddce52..80e76569144e 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -725,6 +725,9 @@ struct sta_info *sta_info_get(struct ieee80211_sub_if_d= ata *sdata, struct sta_info *sta_info_get_bss(struct ieee80211_sub_if_data *sdata, =09=09=09=09 const u8 *addr); =20 +struct sta_info *sta_info_get_by_addrs(struct ieee80211_local *local, +=09=09=09=09 const u8 *sta_addr, const u8 *vif_addr); + #define for_each_sta_info(local, _addr, _sta, _tmp)=09=09=09\ =09rhl_for_each_entry_rcu(_sta, _tmp,=09=09=09=09\ =09=09=09 sta_info_hash_lookup(local, _addr), hash_node) diff --git a/net/mac80211/status.c b/net/mac80211/status.c index ab8ba5835ca0..0e51def35b8a 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -1073,19 +1073,13 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, s= truct sk_buff *skb) =09=09.skb =3D skb, =09=09.info =3D IEEE80211_SKB_CB(skb), =09}; -=09struct rhlist_head *tmp; =09struct sta_info *sta; =20 =09rcu_read_lock(); =20 -=09for_each_sta_info(local, hdr->addr1, sta, tmp) { -=09=09/* skip wrong virtual interface */ -=09=09if (!ether_addr_equal(hdr->addr2, sta->sdata->vif.addr)) -=09=09=09continue; - +=09sta =3D sta_info_get_by_addrs(local, hdr->addr1, hdr->addr2); +=09if (sta) =09=09status.sta =3D &sta->sta; -=09=09break; -=09} =20 =09__ieee80211_tx_status(hw, &status); =09rcu_read_unlock();