Re: [PATCH v3 5/5] mac80211_hwsim: add hwsim_tx_rate_flags to netlink attributes

[Johannes Berg]

On Wed, 2018-01-10 at 17:42 +0100, Benjamin Beichler wrote:
> For correct interpretation of a tx rate, the corresponding rate flags are
> needed (e.g. whether a HT-MCS rate or a legacy rate) and moreover for more
> correct simulation the other infos of the flags are important (like
> short-GI). Keeping compatibility, the flags are not integrated into the
> existing hwsim_tx_rate, but transmitted as an additional netlink attribute.

Also applied.

johannes

[PATCH v3 5/5] mac80211_hwsim: add hwsim_tx_rate_flags to netlink attributes

[Benjamin Beichler]

For correct interpretation of a tx rate, the corresponding rate flags are
needed (e.g. whether a HT-MCS rate or a legacy rate) and moreover for more
correct simulation the other infos of the flags are important (like
short-GI). Keeping compatibility, the flags are not integrated into the
existing hwsim_tx_rate, but transmitted as an additional netlink attribute.

Signed-off-by: Benjamin Beichler 
---
 drivers/net/wireless/mac80211_hwsim.c | 41 -
 drivers/net/wireless/mac80211_hwsim.h | 68 ++-
 2 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/mac80211_hwsim.c 
b/drivers/net/wireless/mac80211_hwsim.c
index 1e0d651c43fc..226fa98f16a6 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -1026,6 +1026,36 @@ static int hwsim_unicast_netgroup(struct 
mac80211_hwsim_data *data,
return res;
 }
 
+static inline u16 trans_tx_rate_flags_ieee2hwsim(struct ieee80211_tx_rate 
*rate)
+{
+   u16 result = 0;
+
+   if (rate->flags & IEEE80211_TX_RC_USE_RTS_CTS)
+   result |= MAC80211_HWSIM_TX_RC_USE_RTS_CTS;
+   if (rate->flags & IEEE80211_TX_RC_USE_CTS_PROTECT)
+   result |= MAC80211_HWSIM_TX_RC_USE_CTS_PROTECT;
+   if (rate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
+   result |= MAC80211_HWSIM_TX_RC_USE_SHORT_PREAMBLE;
+   if (rate->flags & IEEE80211_TX_RC_MCS)
+   result |= MAC80211_HWSIM_TX_RC_MCS;
+   if (rate->flags & IEEE80211_TX_RC_GREEN_FIELD)
+   result |= MAC80211_HWSIM_TX_RC_GREEN_FIELD;
+   if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
+   result |= MAC80211_HWSIM_TX_RC_40_MHZ_WIDTH;
+   if (rate->flags & IEEE80211_TX_RC_DUP_DATA)
+   result |= MAC80211_HWSIM_TX_RC_DUP_DATA;
+   if (rate->flags & IEEE80211_TX_RC_SHORT_GI)
+   result |= MAC80211_HWSIM_TX_RC_SHORT_GI;
+   if (rate->flags & IEEE80211_TX_RC_VHT_MCS)
+   result |= MAC80211_HWSIM_TX_RC_VHT_MCS;
+   if (rate->flags & IEEE80211_TX_RC_80_MHZ_WIDTH)
+   result |= MAC80211_HWSIM_TX_RC_80_MHZ_WIDTH;
+   if (rate->flags & IEEE80211_TX_RC_160_MHZ_WIDTH)
+   result |= MAC80211_HWSIM_TX_RC_160_MHZ_WIDTH;
+
+   return result;
+}
+
 static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
   struct sk_buff *my_skb,
   int dst_portid)
@@ -1038,6 +1068,7 @@ static void mac80211_hwsim_tx_frame_nl(struct 
ieee80211_hw *hw,
unsigned int hwsim_flags = 0;
int i;
struct hwsim_tx_rate tx_attempts[IEEE80211_TX_MAX_RATES];
+   struct hwsim_tx_rate_flag tx_attempts_flags[IEEE80211_TX_MAX_RATES];
uintptr_t cookie;
 
if (data->ps != PS_DISABLED)
@@ -1089,7 +1120,11 @@ static void mac80211_hwsim_tx_frame_nl(struct 
ieee80211_hw *hw,
 
for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
tx_attempts[i].idx = info->status.rates[i].idx;
+   tx_attempts_flags[i].idx = info->status.rates[i].idx;
tx_attempts[i].count = info->status.rates[i].count;
+   tx_attempts_flags[i].flags =
+   trans_tx_rate_flags_ieee2hwsim(
+   >status.rates[i]);
}
 
if (nla_put(skb, HWSIM_ATTR_TX_INFO,
@@ -1097,6 +1132,11 @@ static void mac80211_hwsim_tx_frame_nl(struct 
ieee80211_hw *hw,
tx_attempts))
goto nla_put_failure;
 
+   if (nla_put(skb, HWSIM_ATTR_TX_INFO_FLAGS,
+   sizeof(struct hwsim_tx_rate_flag) * IEEE80211_TX_MAX_RATES,
+   tx_attempts_flags))
+   goto nla_put_failure;
+
/* We create a cookie to identify this skb */
data->pending_cookie++;
cookie = data->pending_cookie;
@@ -3003,7 +3043,6 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff 
*skb_2,
for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
txi->status.rates[i].idx = tx_attempts[i].idx;
txi->status.rates[i].count = tx_attempts[i].count;
-   /*txi->status.rates[i].flags = 0;*/
}
 
txi->status.ack_signal = nla_get_u32(info->attrs[HWSIM_ATTR_SIGNAL]);
diff --git a/drivers/net/wireless/mac80211_hwsim.h 
b/drivers/net/wireless/mac80211_hwsim.h
index e2592b596090..b304dfb70036 100644
--- a/drivers/net/wireless/mac80211_hwsim.h
+++ b/drivers/net/wireless/mac80211_hwsim.h
@@ -64,7 +64,8 @@ enum hwsim_tx_control_flags {
  * @HWSIM_CMD_TX_INFO_FRAME: Transmission info report from user space to
  * kernel, uses:
  * %HWSIM_ATTR_ADDR_TRANSMITTER, %HWSIM_ATTR_FLAGS,
- * %HWSIM_ATTR_TX_INFO, %HWSIM_ATTR_SIGNAL, %HWSIM_ATTR_COOKIE
+ * %HWSIM_ATTR_TX_INFO, %WSIM_ATTR_TX_INFO_FLAGS,
+ * %HWSIM_ATTR_SIGNAL, %HWSIM_ATTR_COOKIE
  *