From patchwork Wed Oct 9 16:49:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 13828812 X-Patchwork-Delegate: miriam.rachel.korenblit@intel.com Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 77F322CA5 for ; Wed, 9 Oct 2024 16:49:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.129.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728492587; cv=none; b=K5y8LaxnpxhH/G83eNNC1MKIXv2HD5BXlND7hRyOAWLpv58nzfOzSQU/ujFuWUI3droeVTp+h7+x3K6bKqLnIeVNuRXXtXO4j1+Lukh6xrc9WJ04cynpLaGl+jYPUw2hwAHUS66kDJevmSlDD9DV7154ggdt8085uToiadpxLEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728492587; c=relaxed/simple; bh=jFkS9zEsUx1UGQQugMKF13irAodjNzOZi2z0xsp6ThQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=fT08cVTGaF/tzCVM82rVYljO0LDCol1wqDc29VfEmyks0R80oD3p+voxXBQkqG2oCnUr227FxJ3BDwfrHRKNvO9IOL2o5NerN2CFr6EpsotjnuZH+nD0EPb0g5/iO931OT874PNtEoIebxVvCpmeMaQhOWcD+IkaVqZdOkHB/jw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=candelatech.com; spf=pass smtp.mailfrom=candelatech.com; dkim=pass (1024-bit key) header.d=candelatech.com header.i=@candelatech.com header.b=aM/7H1WY; arc=none smtp.client-ip=148.163.129.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=candelatech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=candelatech.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=candelatech.com header.i=@candelatech.com header.b="aM/7H1WY" Received: from dispatch1-us1.ppe-hosted.com (ip6-localhost [127.0.0.1]) by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id E20CC2C5F96 for ; Wed, 9 Oct 2024 16:49:44 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mail3.candelatech.com (mail.candelatech.com [208.74.158.173]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 36D4BB00064 for ; Wed, 9 Oct 2024 16:49:09 +0000 (UTC) Received: from ben-dt5.candelatech.com (unknown [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id BF13613C2B0; Wed, 9 Oct 2024 09:49:08 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com BF13613C2B0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1728492548; bh=jFkS9zEsUx1UGQQugMKF13irAodjNzOZi2z0xsp6ThQ=; h=From:To:Cc:Subject:Date:From; b=aM/7H1WY+tNdoH3/Uv4fqsaf6QDjpQCKIX9QfjrlVQgfMkMFqG7bcBUC1FK+Fuk13 Bc4HH/CfqXi0WkvRpb6jJG0FLms6f834hJfc9eYSEiKlSS1N4MMKlQGCLcdFHllnGJ pcmyIzduttL2vJyVH940qBlCrt9i5n97Pb0OiKOg= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH v3 1/2] wifi: iwlwifi: Report link-id for transmitted frames. Date: Wed, 9 Oct 2024 09:49:03 -0700 Message-ID: <20241009164904.3906438-1-greearb@candelatech.com> X-Mailer: git-send-email 2.42.0 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MDID: 1728492578-cb-u5sSezVLs X-MDID-O: us5;ut7;1728492578;cb-u5sSezVLs;;f7146c1849a4b08a52804beb1c1cdf45 X-PPE-TRUSTED: V=1;DIR=OUT; From: Ben Greear This will let upper stack properly record stats per link. Signed-off-by: Ben Greear --- v2: Fix rcu locking v3: Fix missing v2 change text Fix long lines Fix |= that should have been '=' assignment in replace_bits logic. drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c index ca026b5256ce..f5b469647a35 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c @@ -1709,6 +1709,14 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm, u8 lq_color; u16 next_reclaimed, seq_ctl; bool is_ndp = false; + struct ieee80211_link_sta *link_sta; + int link_sta_id = -1; + + rcu_read_lock(); + link_sta = rcu_dereference(mvm->fw_id_to_link_sta[sta_id]); + if (link_sta) + link_sta_id = link_sta->link_id; + rcu_read_unlock(); __skb_queue_head_init(&skbs); @@ -1732,6 +1740,10 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm, memset(&info->status, 0, sizeof(info->status)); info->flags &= ~(IEEE80211_TX_STAT_ACK | IEEE80211_TX_STAT_TX_FILTERED); + if (link_sta_id != -1) + info->control.flags = u32_replace_bits(info->control.flags, + link_sta_id, + IEEE80211_TX_CTRL_MLO_LINK); /* inform mac80211 about what happened with the frame */ switch (status & TX_STATUS_MSK) { @@ -2048,6 +2060,7 @@ static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid, struct iwl_mvm_sta *mvmsta = NULL; struct sk_buff *skb; int freed; + struct ieee80211_link_sta *link_sta; if (WARN_ONCE(sta_id >= mvm->fw->ucode_capa.num_stations || tid > IWL_MAX_TID_COUNT, @@ -2064,6 +2077,8 @@ static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid, return; } + link_sta = rcu_dereference(mvm->fw_id_to_link_sta[sta_id]); + __skb_queue_head_init(&reclaimed_skbs); /* @@ -2087,6 +2102,11 @@ static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid, info->flags |= IEEE80211_TX_STAT_ACK; else info->flags &= ~IEEE80211_TX_STAT_ACK; + + if (link_sta) + info->control.flags = u32_replace_bits(info->control.flags, + link_sta->link_id, + IEEE80211_TX_CTRL_MLO_LINK); } /* From patchwork Wed Oct 9 16:49:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 13828811 X-Patchwork-Delegate: johannes@sipsolutions.net Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28CC4143C6C for ; Wed, 9 Oct 2024 16:49:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.154.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728492586; cv=none; b=ufENAoi/jLKKiTChkm85ojE4fO25LohcGUWNQvMvNH26piO5yMo+EJaIyg55g+o6VoEPPwb7WGyLqdxUm190BTH9Mlv1zrHQtTFUXDo9mU2MbcyLa7JgzqsEK8nDJR07kZcsImN9EmLbaIP4k+qJbq9wAUFaYapxYRIRgG9FGbE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728492586; c=relaxed/simple; bh=3er8MqM8DkzxsfXLN0Q3W6+rE+yUUuQoMMphPG0uJ3s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bJfX37tPxELB1W4xX4zXD9gCrTnCOI94iYy3AWo/7OQBmBrrWFiwz7DTA1xAn9fIvQMfJynoyP38fRvk8A1NfZ6z91dDH8g3QRvYamPqcC5Z43pvUJoA9WsO3acp2p2UETdb8Gk97KYfI9OCtJ2nvcxXnttCUaZaJU2x0JUtOWQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=candelatech.com; spf=pass smtp.mailfrom=candelatech.com; dkim=pass (1024-bit key) header.d=candelatech.com header.i=@candelatech.com header.b=C7FfJ/p6; arc=none smtp.client-ip=67.231.154.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=candelatech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=candelatech.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=candelatech.com header.i=@candelatech.com header.b="C7FfJ/p6" X-Virus-Scanned: Proofpoint Essentials engine Received: from mail3.candelatech.com (mail.candelatech.com [208.74.158.173]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id E36BA940079 for ; Wed, 9 Oct 2024 16:49:10 +0000 (UTC) Received: from ben-dt5.candelatech.com (unknown [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id 411CE13C2B0; Wed, 9 Oct 2024 09:49:10 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com 411CE13C2B0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1728492550; bh=3er8MqM8DkzxsfXLN0Q3W6+rE+yUUuQoMMphPG0uJ3s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C7FfJ/p6x8t7cG7DIPtinmNv6YjiKtU4+kUkGeQ7QBTi79j5uYKUE2tdC+1ySxPtK 3CDpDyoSot3N7uDLaqcMWGYP/u+dWpXwWEBcP2291ruw7x1dj+Y8kt3uJCT8rNo5z2 uQV7rZDdnmur+pxhZFrAofcAEzEUJLeJaQF193RU= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH v3 2/2] wifi: mac80211: Assign tx-stats to the proper link. Date: Wed, 9 Oct 2024 09:49:04 -0700 Message-ID: <20241009164904.3906438-2-greearb@candelatech.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20241009164904.3906438-1-greearb@candelatech.com> References: <20241009164904.3906438-1-greearb@candelatech.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MDID: 1728492583-OVQjzhW_BbLh X-MDID-O: us5;at1;1728492583;OVQjzhW_BbLh;;f7146c1849a4b08a52804beb1c1cdf45 X-PPE-TRUSTED: V=1;DIR=OUT; From: Ben Greear For drivers that can report the tx link-id, account tx stats against that link. If we cannot determine tx link, then use deflink. Signed-off-by: Ben Greear --- v3: Rename link_sta_info variable to link_sta to match other code. net/mac80211/status.c | 74 +++++++++++++++++++++++++++++++------------ 1 file changed, 53 insertions(+), 21 deletions(-) diff --git a/net/mac80211/status.c b/net/mac80211/status.c index b41b867f43b2..28bf3f8a2fb4 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -41,6 +41,26 @@ void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw, } EXPORT_SYMBOL(ieee80211_tx_status_irqsafe); +static struct link_sta_info* +ieee80211_get_tx_link_sta(struct sta_info *sta, struct ieee80211_tx_info *info) +{ + u8 link_id = IEEE80211_LINK_UNSPECIFIED; + struct link_sta_info *link_sta; + + if (!sta) + return NULL; + + if (info) + link_id = u32_get_bits(info->control.flags, IEEE80211_TX_CTRL_MLO_LINK); + + if (link_id != IEEE80211_LINK_UNSPECIFIED) { + link_sta = rcu_access_pointer(sta->link[link_id]); + if (link_sta) + return link_sta; + } + return &sta->deflink; +} + static void ieee80211_handle_filtered_frame(struct ieee80211_local *local, struct sta_info *sta, struct sk_buff *skb) @@ -48,6 +68,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local, struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_hdr *hdr = (void *)skb->data; int ac; + struct link_sta_info *link_sta = ieee80211_get_tx_link_sta(sta, info); if (info->flags & (IEEE80211_TX_CTL_NO_PS_BUFFER | IEEE80211_TX_CTL_AMPDU | @@ -72,7 +93,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local, info->flags |= IEEE80211_TX_INTFL_RETRANSMISSION; info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS; - sta->deflink.status_stats.filtered++; + link_sta->status_stats.filtered++; /* * Clear more-data bit on filtered frames, it might be set @@ -826,6 +847,7 @@ static void ieee80211_lost_packet(struct sta_info *sta, { unsigned long pkt_time = STA_LOST_PKT_TIME; unsigned int pkt_thr = STA_LOST_PKT_THRESHOLD; + struct link_sta_info *link_sta; /* If driver relies on its own algorithm for station kickout, skip * mac80211 packet loss mechanism. @@ -838,7 +860,8 @@ static void ieee80211_lost_packet(struct sta_info *sta, !(info->flags & IEEE80211_TX_STAT_AMPDU)) return; - sta->deflink.status_stats.lost_packets++; + link_sta = ieee80211_get_tx_link_sta(sta, info); + link_sta->status_stats.lost_packets++; if (sta->sta.tdls) { pkt_time = STA_LOST_TDLS_PKT_TIME; pkt_thr = STA_LOST_PKT_THRESHOLD; @@ -851,14 +874,14 @@ static void ieee80211_lost_packet(struct sta_info *sta, * mechanism. * For non-TDLS, use STA_LOST_PKT_THRESHOLD and STA_LOST_PKT_TIME */ - if (sta->deflink.status_stats.lost_packets < pkt_thr || - !time_after(jiffies, sta->deflink.status_stats.last_pkt_time + pkt_time)) + if (link_sta->status_stats.lost_packets < pkt_thr || + !time_after(jiffies, link_sta->status_stats.last_pkt_time + pkt_time)) return; cfg80211_cqm_pktloss_notify(sta->sdata->dev, sta->sta.addr, - sta->deflink.status_stats.lost_packets, + link_sta->status_stats.lost_packets, GFP_ATOMIC); - sta->deflink.status_stats.lost_packets = 0; + link_sta->status_stats.lost_packets = 0; } static int ieee80211_tx_get_rates(struct ieee80211_hw *hw, @@ -970,8 +993,12 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw, fc = hdr->frame_control; if (status->sta) { + struct link_sta_info *link_sta; + sta = container_of(status->sta, struct sta_info, sta); + link_sta = ieee80211_get_tx_link_sta(sta, info); + if (info->flags & IEEE80211_TX_STATUS_EOSP) clear_sta_flag(sta, WLAN_STA_SP); @@ -988,7 +1015,7 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw, if (ieee80211_hw_check(&local->hw, HAS_RATE_CONTROL) && (ieee80211_is_data(hdr->frame_control)) && (rates_idx != -1)) - sta->deflink.tx_stats.last_rate = + link_sta->tx_stats.last_rate = info->status.rates[rates_idx]; if ((info->flags & IEEE80211_TX_STAT_AMPDU_NO_BACK) && @@ -1034,9 +1061,9 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw, return; } else if (ieee80211_is_data_present(fc)) { if (!acked && !noack_success) - sta->deflink.status_stats.msdu_failed[tid]++; + link_sta->status_stats.msdu_failed[tid]++; - sta->deflink.status_stats.msdu_retries[tid] += + link_sta->status_stats.msdu_retries[tid] += retry_count; } @@ -1144,12 +1171,15 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw, int rates_idx, retry_count; bool acked, noack_success, ack_signal_valid; u16 tx_time_est; + struct link_sta_info *link_sta; if (pubsta) { sta = container_of(pubsta, struct sta_info, sta); + link_sta = ieee80211_get_tx_link_sta(sta, info); + if (status->n_rates) - sta->deflink.tx_stats.last_rate_info = + link_sta->tx_stats.last_rate_info = status->rates[status->n_rates - 1].rate_idx; } @@ -1179,8 +1209,8 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw, struct ieee80211_sub_if_data *sdata = sta->sdata; if (!acked && !noack_success) - sta->deflink.status_stats.retry_failed++; - sta->deflink.status_stats.retry_count += retry_count; + link_sta->status_stats.retry_failed++; + link_sta->status_stats.retry_count += retry_count; if (ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS)) { if (sdata->vif.type == NL80211_IFTYPE_STATION && @@ -1189,13 +1219,12 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw, acked, info->status.tx_time); if (acked) { - sta->deflink.status_stats.last_ack = jiffies; + link_sta->status_stats.last_ack = jiffies; - if (sta->deflink.status_stats.lost_packets) - sta->deflink.status_stats.lost_packets = 0; + link_sta->status_stats.lost_packets = 0; /* Track when last packet was ACKed */ - sta->deflink.status_stats.last_pkt_time = jiffies; + link_sta->status_stats.last_pkt_time = jiffies; /* Reset connection monitor */ if (sdata->vif.type == NL80211_IFTYPE_STATION && @@ -1203,10 +1232,10 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw, sdata->u.mgd.probe_send_count = 0; if (ack_signal_valid) { - sta->deflink.status_stats.last_ack_signal = + link_sta->status_stats.last_ack_signal = (s8)info->status.ack_signal; - sta->deflink.status_stats.ack_signal_filled = true; - ewma_avg_signal_add(&sta->deflink.status_stats.avg_ack_signal, + link_sta->status_stats.ack_signal_filled = true; + ewma_avg_signal_add(&link_sta->status_stats.avg_ack_signal, -info->status.ack_signal); } } else if (test_sta_flag(sta, WLAN_STA_PS_STA)) { @@ -1270,8 +1299,11 @@ void ieee80211_tx_rate_update(struct ieee80211_hw *hw, rate_control_tx_status(local, &status); - if (ieee80211_hw_check(&local->hw, HAS_RATE_CONTROL)) - sta->deflink.tx_stats.last_rate = info->status.rates[0]; + if (ieee80211_hw_check(&local->hw, HAS_RATE_CONTROL)) { + struct link_sta_info *link_sta = ieee80211_get_tx_link_sta(sta, info); + + link_sta->tx_stats.last_rate = info->status.rates[0]; + } } EXPORT_SYMBOL(ieee80211_tx_rate_update);