| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 12 Apr 2012 18:42:11 +0200
From: Florian Fainelli <florian@...nwrt.org>
To: greearb@...delatech.com
CC: linux-wireless@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH 4/5] mac80211: Add more ethtools stats: survey, rates,
etc
Hi,
Le 04/12/12 18:32, greearb@...delatech.com a écrit :
> From: Ben Greear<greearb@...delatech.com>
>
> The signal and noise are forced to be positive since ethtool
> deals in unsigned 64-bit values and this number should be human
> readable. This gives easy access to some of the data formerly
> exposed in the deprecated /proc/net/wireless file.
Uh, that's misleading, the signal and noise values are typically
negative, so one needs to think about mentally adding a minus sign if
he/she wants to understand it. Does not ethtool know about 32-bits
signed integers?
>
> Signed-off-by: Ben Greear<greearb@...delatech.com>
> ---
> :100644 100644 b37fb0d... 99e3597... M net/mac80211/cfg.c
> net/mac80211/cfg.c | 155 ++++++++++++++++++++++++++++++++++++++--------------
> 1 files changed, 114 insertions(+), 41 deletions(-)
>
> diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
> index b37fb0d..99e3597 100644
> --- a/net/mac80211/cfg.c
> +++ b/net/mac80211/cfg.c
> @@ -117,7 +117,9 @@ static const char ieee80211_gstrings_sta_stats[][ETH_GSTRING_LEN] = {
> "rx_duplicates", "rx_fragments", "rx_dropped",
> "tx_packets", "tx_bytes", "tx_fragments",
> "tx_filtered", "tx_retry_failed", "tx_retries",
> - "beacon_loss"
> + "beacon_loss", "txrate", "rxrate", "signal",
> + "channel", "noise", "ch_time", "ch_time_busy",
> + "ch_time_ext_busy", "ch_time_rx", "ch_time_tx"
> };
> #define STA_STATS_LEN ARRAY_SIZE(ieee80211_gstrings_sta_stats)
>
> @@ -138,46 +140,6 @@ static int ieee80211_get_et_sset_count(struct wiphy *wiphy,
> return rv;
> }
>
> -static void ieee80211_get_et_stats(struct wiphy *wiphy,
> - struct net_device *dev,
> - struct ethtool_stats *stats,
> - u64 *data)
> -{
> - struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
> - struct sta_info *sta;
> - struct ieee80211_local *local = sdata->local;
> -
> - memset(data, 0, sizeof(u64) * STA_STATS_LEN);
> -
> - rcu_read_lock();
> - list_for_each_entry_rcu(sta,&local->sta_list, list) {
> - int i = 0;
> -
> - /* Make sure this station belongs to the proper dev */
> - if (sta->sdata->dev != dev)
> - continue;
> -
> - data[i++] += sta->rx_packets;
> - data[i++] += sta->rx_bytes;
> - data[i++] += sta->wep_weak_iv_count;
> - data[i++] += sta->num_duplicates;
> - data[i++] += sta->rx_fragments;
> - data[i++] += sta->rx_dropped;
> -
> - data[i++] += sta->tx_packets;
> - data[i++] += sta->tx_bytes;
> - data[i++] += sta->tx_fragments;
> - data[i++] += sta->tx_filtered_count;
> - data[i++] += sta->tx_retry_failed;
> - data[i++] += sta->tx_retry_count;
> - data[i++] += sta->beacon_loss_count;
> - BUG_ON(i != STA_STATS_LEN);
> - }
> - rcu_read_unlock();
> -
> - drv_get_et_stats(sdata, stats,&(data[STA_STATS_LEN]));
> -}
> -
> static void ieee80211_get_et_strings(struct wiphy *wiphy,
> struct net_device *dev,
> u32 sset, u8 *data)
> @@ -531,6 +493,117 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
> sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_TDLS_PEER);
> }
>
> +static void ieee80211_get_et_stats(struct wiphy *wiphy,
> + struct net_device *dev,
> + struct ethtool_stats *stats,
> + u64 *data)
> +{
> + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
> + struct sta_info *sta;
> + struct ieee80211_local *local = sdata->local;
> + struct station_info sinfo;
> + struct survey_info survey;
> + bool do_once = true;
> + int i;
> +#define STA_STATS_SURVEY_LEN 7
> +
> + memset(data, 0, sizeof(u64) * STA_STATS_LEN);
> +
> + rcu_read_lock();
> + list_for_each_entry_rcu(sta,&local->sta_list, list) {
> + i = 0;
> +
> + /* Make sure this station belongs to the proper dev */
> + if (sta->sdata->dev != dev)
> + continue;
> +
> + data[i++] += sta->rx_packets;
> + data[i++] += sta->rx_bytes;
> + data[i++] += sta->wep_weak_iv_count;
> + data[i++] += sta->num_duplicates;
> + data[i++] += sta->rx_fragments;
> + data[i++] += sta->rx_dropped;
> +
> + data[i++] += sta->tx_packets;
> + data[i++] += sta->tx_bytes;
> + data[i++] += sta->tx_fragments;
> + data[i++] += sta->tx_filtered_count;
> + data[i++] += sta->tx_retry_failed;
> + data[i++] += sta->tx_retry_count;
> + data[i++] += sta->beacon_loss_count;
> +
> + if (!do_once) {
> + i += 3;
> + goto after_once;
> + }
> +
> + do_once = false;
> + sinfo.filled = 0;
> + sta_set_sinfo(sta,&sinfo);
> +
> + if (sinfo.filled | STATION_INFO_TX_BITRATE)
> + data[i] = 100000 *
> + cfg80211_calculate_bitrate(&sinfo.txrate);
> + i++;
> + if (sinfo.filled | STATION_INFO_RX_BITRATE)
> + data[i] = 100000 *
> + cfg80211_calculate_bitrate(&sinfo.rxrate);
> + i++;
> +
> + if (sinfo.filled | STATION_INFO_SIGNAL_AVG)
> + data[i] = abs(sinfo.signal_avg);
> + i++;
> +
> +after_once:
> + if (WARN_ON(i != (STA_STATS_LEN - STA_STATS_SURVEY_LEN))) {
> + rcu_read_unlock();
> + return;
> + }
> + }
> +
> + i = STA_STATS_LEN - STA_STATS_SURVEY_LEN;
> + /* Get survey stats for current channel only */
> + survey.filled = 0;
> + if (drv_get_survey(local, 0,&survey) != 0) {
> + survey.filled = 0;
> + data[i++] = 0;
> + } else {
> + data[i++] = survey.channel->center_freq;
> + }
> +
> + if (survey.filled& SURVEY_INFO_NOISE_DBM)
> + data[i++] = abs(survey.noise);
> + else
> + data[i++] = -1LL;
> + if (survey.filled& SURVEY_INFO_CHANNEL_TIME)
> + data[i++] = survey.channel_time;
> + else
> + data[i++] = -1LL;
> + if (survey.filled& SURVEY_INFO_CHANNEL_TIME_BUSY)
> + data[i++] = survey.channel_time_busy;
> + else
> + data[i++] = -1LL;
> + if (survey.filled& SURVEY_INFO_CHANNEL_TIME_EXT_BUSY)
> + data[i++] = survey.channel_time_ext_busy;
> + else
> + data[i++] = -1LL;
> + if (survey.filled& SURVEY_INFO_CHANNEL_TIME_RX)
> + data[i++] = survey.channel_time_rx;
> + else
> + data[i++] = -1LL;
> + if (survey.filled& SURVEY_INFO_CHANNEL_TIME_TX)
> + data[i++] = survey.channel_time_tx;
> + else
> + data[i++] = -1LL;
> +
> + rcu_read_unlock();
> +
> + if (WARN_ON(i != STA_STATS_LEN))
> + return;
> +
> + drv_get_et_stats(sdata, stats,&(data[STA_STATS_LEN]));
> +}
> +
>
> static int ieee80211_dump_station(struct wiphy *wiphy, struct net_device *dev,
> int idx, u8 *mac, struct station_info *sinfo)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists