From patchwork Tue Feb 13 09:23:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamizh chelvam X-Patchwork-Id: 10215415 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E662160467 for ; Tue, 13 Feb 2018 09:22:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E261E28A2E for ; Tue, 13 Feb 2018 09:22:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D6C4D28E50; Tue, 13 Feb 2018 09:22:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6EB4228A2E for ; Tue, 13 Feb 2018 09:22:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934574AbeBMJWP (ORCPT ); Tue, 13 Feb 2018 04:22:15 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:34638 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933494AbeBMJWN (ORCPT ); Tue, 13 Feb 2018 04:22:13 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 6846A60790; Tue, 13 Feb 2018 09:22:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1518513733; bh=udgh0x69clLm77EigV30Sy+l16CVhFMSo7A86WblhD0=; h=From:To:Cc:Subject:Date:From; b=BdhVN6I4ZiBa1XN4VUtpXQXLs93nKaJOH5A4YavX7U2KUe774sncO2UMmc3H2Yf/t 5TmYEnOmSSpp4F6nHhIWsbIPcbc5F5TF5Hd0NiyBh5Q7JhwizaNbgFcSoGWiG7PtSv NRWn7gbThlP0UIMOkGHQSFxhZYs4grozWBHI0PcE= Received: from che-swdbs-01.qca.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: tamizhr@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id C90706072E; Tue, 13 Feb 2018 09:22:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1518513733; bh=udgh0x69clLm77EigV30Sy+l16CVhFMSo7A86WblhD0=; h=From:To:Cc:Subject:Date:From; b=BdhVN6I4ZiBa1XN4VUtpXQXLs93nKaJOH5A4YavX7U2KUe774sncO2UMmc3H2Yf/t 5TmYEnOmSSpp4F6nHhIWsbIPcbc5F5TF5Hd0NiyBh5Q7JhwizaNbgFcSoGWiG7PtSv NRWn7gbThlP0UIMOkGHQSFxhZYs4grozWBHI0PcE= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org C90706072E Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=tamizhr@codeaurora.org From: Tamizh chelvam To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Tamizh chelvam Subject: [PATCHv2 3/3] mac80211: implement cqm rssi check using rx data signal Date: Tue, 13 Feb 2018 14:53:35 +0530 Message-Id: <1518513815-22417-1-git-send-email-tamizhr@codeaurora.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tamizh chelvam Triggers cfg80211_ap_sta_cqm_rssi_notify with the corresponding event when station signal goes lower than the configured rssi threshold. And notify back to user space once the station signal becomes greater than the configured value. It uses rx data signal and compare with rssi value given by user. This rssi threshold is bss specific and it is common for all the stations. Signed-off-by: Tamizh chelvam --- include/net/mac80211.h | 7 +++++++ net/mac80211/rx.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- net/mac80211/sta_info.h | 3 +++ 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 906e902..8fbf633 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -799,6 +799,13 @@ enum mac80211_rate_control_flags { }; +/* + * How many frames need to have been used in average station's + * signal strength before checking against the threshold + */ +#define IEEE80211_STA_SIGNAL_AVE_MIN_COUNT 4 + + /* there are 40 bytes if you don't need the rateset to be kept */ #define IEEE80211_TX_INFO_DRIVER_DATA_SIZE 40 diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index e755f93..0a385a1 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1534,6 +1534,47 @@ void ieee80211_sta_uapsd_trigger(struct ieee80211_sta *pubsta, u8 tid) return RX_CONTINUE; } +static void ieee80211_sta_rx_signal_thold_check(struct ieee80211_rx_data *rx) +{ + struct sta_info *sta = rx->sta; + struct ieee80211_bss_conf *bss_conf = + &rx->sdata->vif.bss_conf; + int sig, last_event, thold; + + if (!wiphy_ext_feature_isset(rx->local->hw.wiphy, + NL80211_EXT_FEATURE_AP_STA_CQM_RSSI_CONFIG)) + return; + + sta->count_rx_signal++; + if (sta->count_rx_signal < IEEE80211_STA_SIGNAL_AVE_MIN_COUNT) + return; + + if (!bss_conf->cqm_rssi_thold || !bss_conf->enable_beacon) { + sta->count_rx_signal = 0; + return; + } + + sig = -ewma_signal_read(&sta->rx_stats_avg.signal); + last_event = sta->last_cqm_event_signal; + thold = bss_conf->cqm_rssi_thold; + + if (sig < thold && last_event == 0) { + sta->last_cqm_event_signal = sig; + cfg80211_ap_sta_cqm_rssi_notify( + rx->sdata->dev, sta->addr, + NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW, + sig, GFP_ATOMIC); + sta->count_rx_signal = 0; + } else if (last_event && sig > thold) { + sta->last_cqm_event_signal = 0; + cfg80211_ap_sta_cqm_rssi_notify( + rx->sdata->dev, sta->addr, + NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH, + sig, GFP_ATOMIC); + sta->count_rx_signal = 0; + } +} + static ieee80211_rx_result debug_noinline ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx) { @@ -1589,6 +1630,7 @@ void ieee80211_sta_uapsd_trigger(struct ieee80211_sta *pubsta, u8 tid) if (!(status->flag & RX_FLAG_NO_SIGNAL_VAL)) { sta->rx_stats.last_signal = status->signal; ewma_signal_add(&sta->rx_stats_avg.signal, -status->signal); + ieee80211_sta_rx_signal_thold_check(rx); } if (status->chains) { @@ -3981,9 +4023,11 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx, if (!(status->flag & RX_FLAG_NO_SIGNAL_VAL)) { stats->last_signal = status->signal; - if (!fast_rx->uses_rss) + if (!fast_rx->uses_rss) { ewma_signal_add(&sta->rx_stats_avg.signal, -status->signal); + ieee80211_sta_rx_signal_thold_check(rx); + } } if (status->chains) { diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index cd53619..76e8877 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -579,6 +579,9 @@ struct sta_info { struct cfg80211_chan_def tdls_chandef; + int last_cqm_event_signal; + unsigned int count_rx_signal; + /* keep last! */ struct ieee80211_sta sta; };