mac80211: Read rx_stats with perCPU pointers (b255b72b) · Commits · 戴 / test

net/mac80211/sta_info.c

+29 −6

Original line number	Diff line number	Diff line
		@@ -2150,19 +2150,41 @@ static int sta_set_rate_info_rx(struct sta_info sta, struct rate_info rinfo)
		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,
		struct cfg80211_tid_stats *tidstats,
		int tid)
		{
		struct ieee80211_local *local = sta->local;
		int cpu;

		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 {
		start = u64_stats_fetch_begin(&sta->rx_stats.syncp);
		tidstats->rx_msdu = sta->rx_stats.msdu[tid];
		} while (u64_stats_fetch_retry(&sta->rx_stats.syncp, start));
		if (sta->pcpu_rx_stats) {
		for_each_possible_cpu(cpu) {
		struct ieee80211_sta_rx_stats *cpurxs;

		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);
		}
		@@ -2266,6 +2288,7 @@ void sta_set_sinfo(struct sta_info sta, struct station_info sinfo,

		if (!(sinfo->filled & (BIT_ULL(NL80211_STA_INFO_RX_BYTES64) \|
		BIT_ULL(NL80211_STA_INFO_RX_BYTES)))) {
		if (!ieee80211_hw_check(&local->hw, USES_RSS))
		sinfo->rx_bytes += sta_get_stats_bytes(&sta->rx_stats);

		if (sta->pcpu_rx_stats) {