lkml.org 
[lkml]   [2021]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 110/215] mac80211: consider per-CPU statistics if present
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    [ Upstream commit d656a4c6ead6c3f252b2f2532bc9735598f7e317 ]

    If we have been keeping per-CPU statistics, consider them
    regardless of USES_RSS, because we may not actually fill
    those, for example in non-fast-RX cases when the connection
    is not compatible with fast-RX. If we didn't fill them, the
    additional data will be zero and not affect anything, and
    if we did fill them then it's more correct to consider them.

    This fixes an issue in mesh mode where some statistics are
    not updated due to USES_RSS being set, but fast-RX isn't
    used.

    Reported-by: Thiraviyam Mariyappan <tmariyap@codeaurora.org>
    Link: https://lore.kernel.org/r/20210610220814.13b35f5797c5.I511e9b33c5694e0d6cef4b6ae755c873d7c22124@changeid
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/mac80211/sta_info.c | 11 +++--------
    1 file changed, 3 insertions(+), 8 deletions(-)

    diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
    index 13250cadb420..e18c3855f616 100644
    --- a/net/mac80211/sta_info.c
    +++ b/net/mac80211/sta_info.c
    @@ -2088,10 +2088,9 @@ static struct ieee80211_sta_rx_stats *
    sta_get_last_rx_stats(struct sta_info *sta)
    {
    struct ieee80211_sta_rx_stats *stats = &sta->rx_stats;
    - struct ieee80211_local *local = sta->local;
    int cpu;

    - if (!ieee80211_hw_check(&local->hw, USES_RSS))
    + if (!sta->pcpu_rx_stats)
    return stats;

    for_each_possible_cpu(cpu) {
    @@ -2191,9 +2190,7 @@ static void sta_set_tidstats(struct sta_info *sta,
    int cpu;

    if (!(tidstats->filled & BIT(NL80211_TID_STATS_RX_MSDU))) {
    - if (!ieee80211_hw_check(&local->hw, USES_RSS))
    - tidstats->rx_msdu +=
    - sta_get_tidstats_msdu(&sta->rx_stats, tid);
    + tidstats->rx_msdu += sta_get_tidstats_msdu(&sta->rx_stats, tid);

    if (sta->pcpu_rx_stats) {
    for_each_possible_cpu(cpu) {
    @@ -2272,7 +2269,6 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
    sinfo->rx_beacon = sdata->u.mgd.count_beacon_signal;

    drv_sta_statistics(local, sdata, &sta->sta, sinfo);
    -
    sinfo->filled |= BIT_ULL(NL80211_STA_INFO_INACTIVE_TIME) |
    BIT_ULL(NL80211_STA_INFO_STA_FLAGS) |
    BIT_ULL(NL80211_STA_INFO_BSS_PARAM) |
    @@ -2307,8 +2303,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);
    + sinfo->rx_bytes += sta_get_stats_bytes(&sta->rx_stats);

    if (sta->pcpu_rx_stats) {
    for_each_possible_cpu(cpu) {
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-15 21:10    [W:4.344 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site