From patchwork Wed Jun 13 10:45:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamizh chelvam X-Patchwork-Id: 10462007 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 E914360329 for ; Wed, 13 Jun 2018 10:46:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9E29285B5 for ; Wed, 13 Jun 2018 10:46:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC663288ED; Wed, 13 Jun 2018 10:46:39 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, 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 4778F285B5 for ; Wed, 13 Jun 2018 10:46:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935251AbeFMKqi (ORCPT ); Wed, 13 Jun 2018 06:46:38 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:47618 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933498AbeFMKqS (ORCPT ); Wed, 13 Jun 2018 06:46:18 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 66EE1607E4; Wed, 13 Jun 2018 10:46:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1528886777; bh=pwCt4sG3MksnSFu3yDX2xydPO/Z34+zpH9JCuTofOto=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lvlk7/4929AOiWLxVTHAyoZgTeuUu81crE0iANprjUk/ZX8TopDEFVKMm9VU6c0aD oqDRESdGOwNtMx1p3TKkE7eb88AJkiE/f/Vq+8MKB6sT9HbNfQMzwo1tCCVNyk02h0 Eze0LzGcaAnFvTieUPklorfebCHlMVyZMWNL9Mw8= Received: from cheath10p342229-lin.qca.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: tamizhr@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id F2EFD602FC; Wed, 13 Jun 2018 10:46:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1528886776; bh=pwCt4sG3MksnSFu3yDX2xydPO/Z34+zpH9JCuTofOto=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AcAJRIEGTaD1CwID0nKxH8srJCfAav/D+MOeLJVl1Q3A0IrqDM1kUtmoodWP+CyWG d2UKtLHlBZ0J94Et3s64nZ78xkUI+qQTWvnsFskBGs5n6sIWTpcn+wMAQrMlGFUgIg ySstgc9EUERwVE/yB/OrG6lmqwgZDk0tOMJ/lWSg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org F2EFD602FC 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: [PATCH 4/7] cfg80211: Add support to notify station's rssi level crossing Date: Wed, 13 Jun 2018 16:15:44 +0530 Message-Id: <1528886747-26342-5-git-send-email-tamizhr@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1528886747-26342-1-git-send-email-tamizhr@codeaurora.org> References: <1528886747-26342-1-git-send-email-tamizhr@codeaurora.org> 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 Add cfg80211_sta_mon_rssi_notify api to update user space upon crossing the configured rssi threshold of a station. NL80211_CMD_NOTIFY_STA_MON introduced to send this event to userspace along with NL80211_ATTR_STA_MON_RSSI_THRESHOLD_EVENT, NL80211_ATTR_MAC and NL80211_ATTR_STA_MON_RSSI_LEVEL info. Userspace application can make a decision depends on this notification. Signed-off-by: Tamizh chelvam --- include/net/cfg80211.h | 16 +++++++ include/uapi/linux/nl80211.h | 1 + net/wireless/nl80211.c | 98 ++++++++++++++++++++++++++++++++++++++++++ net/wireless/trace.h | 22 ++++++++++ 4 files changed, 137 insertions(+) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 584697b..7dcf9b9 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -5916,6 +5916,22 @@ void cfg80211_cqm_txe_notify(struct net_device *dev, const u8 *peer, void cfg80211_cqm_beacon_loss_notify(struct net_device *dev, gfp_t gfp); /** + * cfg80211_sta_mon_rssi_notify - Station's rssi out of range event + * @dev: network device + * @peer: Station's mac address + * @rssi_event: the triggered RSSI event + * @rssi_level: new RSSI level value or 0 if not available + * @gfp: context flags + * + * This function is called when a configured rssi threshold reached event + * occurs for a station. + */ +void +cfg80211_sta_mon_rssi_notify(struct net_device *dev, const u8 *peer, + enum nl80211_sta_mon_rssi_threshold_event rssi_event, + s32 rssi_level, gfp_t gfp); + +/** * cfg80211_radar_event - radar detection event * @wiphy: the wiphy * @chandef: chandef for the current channel diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index f13ad07..9d47ee6 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -1249,6 +1249,7 @@ enum nl80211_commands { NL80211_CMD_CONTROL_PORT_FRAME, NL80211_CMD_SET_STA_MON, + NL80211_CMD_NOTIFY_STA_MON, /* add new commands above here */ diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 587a5cb1..021e55a 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -15364,6 +15364,104 @@ void cfg80211_pmksa_candidate_notify(struct net_device *dev, int index, } EXPORT_SYMBOL(cfg80211_pmksa_candidate_notify); +static struct sk_buff *cfg80211_prepare_sta_mon(struct net_device *dev, + const char *mac, gfp_t gfp) +{ + struct wireless_dev *wdev = dev->ieee80211_ptr; + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy); + struct sk_buff *msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp); + void **cb; + + if (!msg) + return NULL; + + cb = (void **)msg->cb; + + cb[0] = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_NOTIFY_STA_MON); + if (!cb[0]) { + nlmsg_free(msg); + return NULL; + } + + if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) || + nla_put_u32(msg, NL80211_ATTR_IFINDEX, dev->ifindex)) + goto nla_put_failure; + + if (nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, mac)) + goto nla_put_failure; + + cb[1] = nla_nest_start(msg, NL80211_ATTR_STA_MON); + if (!cb[1]) + goto nla_put_failure; + + cb[2] = rdev; + + return msg; +nla_put_failure: + nlmsg_free(msg); + return NULL; +} + +static void cfg80211_send_sta_mon(struct sk_buff *msg, gfp_t gfp) +{ + void **cb = (void **)msg->cb; + struct cfg80211_registered_device *rdev = cb[2]; + + nla_nest_end(msg, cb[1]); + genlmsg_end(msg, cb[0]); + + memset(msg->cb, 0, sizeof(msg->cb)); + + genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0, + NL80211_MCGRP_MLME, gfp); +} + +void cfg80211_sta_mon_rssi_notify(struct net_device *dev, const u8 *peer, + enum nl80211_sta_mon_rssi_threshold_event rssi_event, + s32 rssi_level, gfp_t gfp) +{ + struct sk_buff *msg; + struct wireless_dev *wdev = dev->ieee80211_ptr; + struct cfg80211_rssi_config *rssi_config; + + if (WARN_ON(!peer)) + return; + + if (WARN_ON(rssi_event != NL80211_STA_MON_RSSI_THRESHOLD_EVENT_LOW && + rssi_event != NL80211_STA_MON_RSSI_THRESHOLD_EVENT_HIGH)) + return; + + trace_cfg80211_sta_mon_rssi_notify(dev, peer, rssi_event, rssi_level); + + list_for_each_entry(rssi_config, &wdev->rssi_config_list, list) { + if (!memcmp(rssi_config->addr, peer, ETH_ALEN)) { + wdev->rssi_config = rssi_config; + wdev->rssi_config->last_rssi_event_value = rssi_level; + break; + } + } + + msg = cfg80211_prepare_sta_mon(dev, peer, gfp); + if (!msg) + return; + + if (nla_put_u32(msg, NL80211_ATTR_STA_MON_RSSI_THRESHOLD_EVENT, + rssi_event)) + goto nla_put_failure; + + if (rssi_level && nla_put_s32(msg, NL80211_ATTR_STA_MON_RSSI_LEVEL, + rssi_level)) + goto nla_put_failure; + + cfg80211_send_sta_mon(msg, gfp); + + return; + +nla_put_failure: + nlmsg_free(msg); +} +EXPORT_SYMBOL(cfg80211_sta_mon_rssi_notify); + static void nl80211_ch_switch_notify(struct cfg80211_registered_device *rdev, struct net_device *netdev, struct cfg80211_chan_def *chandef, diff --git a/net/wireless/trace.h b/net/wireless/trace.h index 361ec08..5454c57 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h @@ -3282,6 +3282,28 @@ WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer), __entry->rssi_thold, __entry->rssi_hyst) ); +TRACE_EVENT(cfg80211_sta_mon_rssi_notify, + TP_PROTO(struct net_device *netdev, const u8 *peer, + enum nl80211_sta_mon_rssi_threshold_event rssi_event, + s32 rssi_level), + TP_ARGS(netdev, peer, rssi_event, rssi_level), + TP_STRUCT__entry( + NETDEV_ENTRY + MAC_ENTRY(peer) + __field(enum nl80211_sta_mon_rssi_threshold_event, rssi_event) + __field(s32, rssi_level) + ), + TP_fast_assign( + NETDEV_ASSIGN; + MAC_ASSIGN(peer, peer); + __entry->rssi_event = rssi_event; + __entry->rssi_level = rssi_level; + ), + TP_printk(NETDEV_PR_FMT ", peer: " MAC_PR_FMT + ", rssi event: %d, rssi : %d", + NETDEV_PR_ARG, MAC_PR_ARG(peer), + __entry->rssi_event, __entry->rssi_level) +); #endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */ #undef TRACE_INCLUDE_PATH