renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 01:04:08 +08:00
Code

mac80211: Read rx_stats with perCPU pointers

Browse Source 
Use perCPU pointers to get rx_stats in sta_set_sinfo
when RSS is enabled

Signed-off-by: Seevalamuthu Mariappan <seevalam@codeaurora.org>
Link: https://lore.kernel.org/r/1584526555-25960-1-git-send-email-seevalam@codeaurora.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Seevalamuthu Mariappan 2020-03-18 15:45:55 +05:30 committed by Johannes Berg
parent dd063ffae0
commit b255b72bc0
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
net/mac80211/sta_info.c
View File

@ -2150,19 +2150,41 @@ static int sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo)
return 0; return 0;
} }
static inline u64 sta_get_tidstats_msdu(struct ieee80211_sta_rx_stats *rxstats,
int tid)
{
unsigned int start;
u64 value;
do {
start = u64_stats_fetch_begin(&rxstats->syncp);
value = rxstats->msdu[tid];
} while (u64_stats_fetch_retry(&rxstats->syncp, start));
return value;
}
static void sta_set_tidstats(struct sta_info *sta, static void sta_set_tidstats(struct sta_info *sta,
struct cfg80211_tid_stats *tidstats, struct cfg80211_tid_stats *tidstats,
int tid) int tid)
{ {
struct ieee80211_local *local = sta->local; struct ieee80211_local *local = sta->local;
int cpu;
if (!(tidstats->filled & BIT(NL80211_TID_STATS_RX_MSDU))) { if (!(tidstats->filled & BIT(NL80211_TID_STATS_RX_MSDU))) {
unsigned int start; if (!ieee80211_hw_check(&local->hw, USES_RSS))
tidstats->rx_msdu +=
sta_get_tidstats_msdu(&sta->rx_stats, tid);
do { if (sta->pcpu_rx_stats) {
start = u64_stats_fetch_begin(&sta->rx_stats.syncp); for_each_possible_cpu(cpu) {
tidstats->rx_msdu = sta->rx_stats.msdu[tid]; struct ieee80211_sta_rx_stats *cpurxs;
} while (u64_stats_fetch_retry(&sta->rx_stats.syncp, start));
cpurxs = per_cpu_ptr(sta->pcpu_rx_stats, cpu);
tidstats->rx_msdu +=
sta_get_tidstats_msdu(cpurxs, tid);
}
}
tidstats->filled |= BIT(NL80211_TID_STATS_RX_MSDU); tidstats->filled |= BIT(NL80211_TID_STATS_RX_MSDU);
} }
@ -2266,7 +2288,8 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
if (!(sinfo->filled & (BIT_ULL(NL80211_STA_INFO_RX_BYTES64) | if (!(sinfo->filled & (BIT_ULL(NL80211_STA_INFO_RX_BYTES64) |
BIT_ULL(NL80211_STA_INFO_RX_BYTES)))) { BIT_ULL(NL80211_STA_INFO_RX_BYTES)))) {
sinfo->rx_bytes += sta_get_stats_bytes(&sta->rx_stats); if (!ieee80211_hw_check(&local->hw, USES_RSS))
sinfo->rx_bytes += sta_get_stats_bytes(&sta->rx_stats);
if (sta->pcpu_rx_stats) { if (sta->pcpu_rx_stats) {
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {