nl80211: Add support to configure TID specific Tx rate configuration

This patch adds support to configure per TID Tx Rate configuration
through NL80211_TID_CONFIG_ATTR_TX_RATE* attributes. And it uses
nl80211_parse_tx_bitrate_mask api to validate the Tx rate mask.

Signed-off-by: Tamizh Chelvam <tamizhr@codeaurora.org>
Link: https://lore.kernel.org/r/1589357504-10175-1-git-send-email-tamizhr@codeaurora.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index f842f3652026eb0e5152cd78fcc456eeec0208c4..e2dbc9c02ef3cf1ffee9b7ad5e11c463c0e0d5c5 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -630,6 +630,19 @@ struct cfg80211_chan_def {
        u16 freq1_offset;
 };
 
+/*
+ * cfg80211_bitrate_mask - masks for bitrate control
+ */
+struct cfg80211_bitrate_mask {
+       struct {
+               u32 legacy;
+               u8 ht_mcs[IEEE80211_HT_MCS_MASK_LEN];
+               u16 vht_mcs[NL80211_VHT_NSS_MAX];
+               enum nl80211_txrate_gi gi;
+       } control[NUM_NL80211_BANDS];
+};
+
+
 /**
  * struct cfg80211_tid_cfg - TID specific configuration
  * @config_override: Flag to notify driver to reset TID configuration
@@ -643,6 +656,8 @@ struct cfg80211_chan_def {
  * @ampdu: Enable/Disable MPDU aggregation
  * @rtscts: Enable/Disable RTS/CTS
  * @amsdu: Enable/Disable MSDU aggregation
+ * @txrate_type: Tx bitrate mask type
+ * @txrate_mask: Tx bitrate to be applied for the TID
  */
 struct cfg80211_tid_cfg {
        bool config_override;
@@ -653,6 +668,8 @@ struct cfg80211_tid_cfg {
        enum nl80211_tid_config ampdu;
        enum nl80211_tid_config rtscts;
        enum nl80211_tid_config amsdu;
+       enum nl80211_tx_rate_setting txrate_type;
+       struct cfg80211_bitrate_mask txrate_mask;
 };
 
 /**
@@ -1007,18 +1024,6 @@ struct cfg80211_acl_data {
        struct mac_address mac_addrs[];
 };
 
-/*
- * cfg80211_bitrate_mask - masks for bitrate control
- */
-struct cfg80211_bitrate_mask {
-       struct {
-               u32 legacy;
-               u8 ht_mcs[IEEE80211_HT_MCS_MASK_LEN];
-               u16 vht_mcs[NL80211_VHT_NSS_MAX];
-               enum nl80211_txrate_gi gi;
-       } control[NUM_NL80211_BANDS];
-};
-
 /**
  * enum cfg80211_ap_settings_flags - AP settings flags
  *

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 0f324b6b81cc741c85192fc8f0f9081b9e0cf188..c14666b75e575abf62a46a77f957624ebd30c945 100644 (file)
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -4841,6 +4841,17 @@ enum nl80211_tid_config {
        NL80211_TID_CONFIG_DISABLE,
 };
 
+/* enum nl80211_tx_rate_setting - TX rate configuration type
+ * @NL80211_TX_RATE_AUTOMATIC: automatically determine TX rate
+ * @NL80211_TX_RATE_LIMITED: limit the TX rate by the TX rate parameter
+ * @NL80211_TX_RATE_FIXED: fix TX rate to the TX rate parameter
+ */
+enum nl80211_tx_rate_setting {
+       NL80211_TX_RATE_AUTOMATIC,
+       NL80211_TX_RATE_LIMITED,
+       NL80211_TX_RATE_FIXED,
+};
+
 /* enum nl80211_tid_config_attr - TID specific configuration.
  * @NL80211_TID_CONFIG_ATTR_PAD: pad attribute for 64-bit values
  * @NL80211_TID_CONFIG_ATTR_VIF_SUPP: a bitmap (u64) of attributes supported
@@ -4876,6 +4887,14 @@ enum nl80211_tid_config {
  * @NL80211_TID_CONFIG_ATTR_AMSDU_CTRL: Enable/Disable MSDU aggregation
  *     for the TIDs specified in %NL80211_TID_CONFIG_ATTR_TIDS.
  *     Its type is u8, using the values from &nl80211_tid_config.
+ * @NL80211_TID_CONFIG_ATTR_TX_RATE_TYPE: This attribute will be useful
+ *     to notfiy the driver that what type of txrate should be used
+ *     for the TIDs specified in %NL80211_TID_CONFIG_ATTR_TIDS. using
+ *     the values form &nl80211_tx_rate_setting.
+ * @NL80211_TID_CONFIG_ATTR_TX_RATE: Data frame TX rate mask should be applied
+ *     with the parameters passed through %NL80211_ATTR_TX_RATES.
+ *     configuration is applied to the data frame for the tid to that connected
+ *     station.
  */
 enum nl80211_tid_config_attr {
        __NL80211_TID_CONFIG_ATTR_INVALID,
@@ -4890,6 +4909,8 @@ enum nl80211_tid_config_attr {
        NL80211_TID_CONFIG_ATTR_AMPDU_CTRL,
        NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL,
        NL80211_TID_CONFIG_ATTR_AMSDU_CTRL,
+       NL80211_TID_CONFIG_ATTR_TX_RATE_TYPE,
+       NL80211_TID_CONFIG_ATTR_TX_RATE,
 
        /* keep last */
        __NL80211_TID_CONFIG_ATTR_AFTER_LAST,

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 7ea764865546efa818f9a4e6a6218b69b219e355..22c4d13e28cb2af6d9c30a12f217aaed800896a9 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -329,6 +329,15 @@ he_bss_color_policy[NL80211_HE_BSS_COLOR_ATTR_MAX + 1] = {
        [NL80211_HE_BSS_COLOR_ATTR_PARTIAL] = { .type = NLA_FLAG },
 };
 
+static const struct nla_policy nl80211_txattr_policy[NL80211_TXRATE_MAX + 1] = {
+       [NL80211_TXRATE_LEGACY] = { .type = NLA_BINARY,
+                                   .len = NL80211_MAX_SUPP_RATES },
+       [NL80211_TXRATE_HT] = { .type = NLA_BINARY,
+                               .len = NL80211_MAX_SUPP_HT_RATES },
+       [NL80211_TXRATE_VHT] = NLA_POLICY_EXACT_LEN_WARN(sizeof(struct nl80211_txrate_vht)),
+       [NL80211_TXRATE_GI] = { .type = NLA_U8 },
+};
+
 static const struct nla_policy
 nl80211_tid_config_attr_policy[NL80211_TID_CONFIG_ATTR_MAX + 1] = {
        [NL80211_TID_CONFIG_ATTR_VIF_SUPP] = { .type = NLA_U64 },
@@ -345,6 +354,10 @@ nl80211_tid_config_attr_policy[NL80211_TID_CONFIG_ATTR_MAX + 1] = {
                        NLA_POLICY_MAX(NLA_U8, NL80211_TID_CONFIG_DISABLE),
        [NL80211_TID_CONFIG_ATTR_AMSDU_CTRL] =
                        NLA_POLICY_MAX(NLA_U8, NL80211_TID_CONFIG_DISABLE),
+       [NL80211_TID_CONFIG_ATTR_TX_RATE_TYPE] =
+                       NLA_POLICY_MAX(NLA_U8, NL80211_TX_RATE_FIXED),
+       [NL80211_TID_CONFIG_ATTR_TX_RATE] =
+                       NLA_POLICY_NESTED(nl80211_txattr_policy),
 };
 
 static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
@@ -4388,16 +4401,9 @@ static bool vht_set_mcs_mask(struct ieee80211_supported_band *sband,
        return true;
 }
 
-static const struct nla_policy nl80211_txattr_policy[NL80211_TXRATE_MAX + 1] = {
-       [NL80211_TXRATE_LEGACY] = { .type = NLA_BINARY,
-                                   .len = NL80211_MAX_SUPP_RATES },
-       [NL80211_TXRATE_HT] = { .type = NLA_BINARY,
-                               .len = NL80211_MAX_SUPP_HT_RATES },
-       [NL80211_TXRATE_VHT] = NLA_POLICY_EXACT_LEN_WARN(sizeof(struct nl80211_txrate_vht)),
-       [NL80211_TXRATE_GI] = { .type = NLA_U8 },
-};
-
 static int nl80211_parse_tx_bitrate_mask(struct genl_info *info,
+                                        struct nlattr *attrs[],
+                                        enum nl80211_attrs attr,
                                         struct cfg80211_bitrate_mask *mask)
 {
        struct nlattr *tb[NL80211_TXRATE_MAX + 1];
@@ -4428,14 +4434,14 @@ static int nl80211_parse_tx_bitrate_mask(struct genl_info *info,
        }
 
        /* if no rates are given set it back to the defaults */
-       if (!info->attrs[NL80211_ATTR_TX_RATES])
+       if (!attrs[attr])
                goto out;
 
        /* The nested attribute uses enum nl80211_band as the index. This maps
         * directly to the enum nl80211_band values used in cfg80211.
         */
        BUILD_BUG_ON(NL80211_MAX_SUPP_HT_RATES > IEEE80211_HT_MCS_MASK_LEN * 8);
-       nla_for_each_nested(tx_rates, info->attrs[NL80211_ATTR_TX_RATES], rem) {
+       nla_for_each_nested(tx_rates, attrs[attr], rem) {
                enum nl80211_band band = nla_type(tx_rates);
                int err;
 
@@ -4940,7 +4946,9 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
                return -EINVAL;
 
        if (info->attrs[NL80211_ATTR_TX_RATES]) {
-               err = nl80211_parse_tx_bitrate_mask(info, &params.beacon_rate);
+               err = nl80211_parse_tx_bitrate_mask(info, info->attrs,
+                                                   NL80211_ATTR_TX_RATES,
+                                                   &params.beacon_rate);
                if (err)
                        return err;
 
@@ -10753,7 +10761,8 @@ static int nl80211_set_tx_bitrate_mask(struct sk_buff *skb,
        if (!rdev->ops->set_bitrate_mask)
                return -EOPNOTSUPP;
 
-       err = nl80211_parse_tx_bitrate_mask(info, &mask);
+       err = nl80211_parse_tx_bitrate_mask(info, info->attrs,
+                                           NL80211_ATTR_TX_RATES, &mask);
        if (err)
                return err;
 
@@ -11359,7 +11368,9 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)
        }
 
        if (info->attrs[NL80211_ATTR_TX_RATES]) {
-               err = nl80211_parse_tx_bitrate_mask(info, &setup.beacon_rate);
+               err = nl80211_parse_tx_bitrate_mask(info, info->attrs,
+                                                   NL80211_ATTR_TX_RATES,
+                                                   &setup.beacon_rate);
                if (err)
                        return err;
 
@@ -14139,6 +14150,23 @@ static int parse_tid_conf(struct cfg80211_registered_device *rdev,
                        nla_get_u8(attrs[NL80211_TID_CONFIG_ATTR_AMSDU_CTRL]);
        }
 
+       if (attrs[NL80211_TID_CONFIG_ATTR_TX_RATE_TYPE]) {
+               u32 idx = NL80211_TID_CONFIG_ATTR_TX_RATE_TYPE, attr;
+
+               tid_conf->txrate_type = nla_get_u8(attrs[idx]);
+
+               if (tid_conf->txrate_type != NL80211_TX_RATE_AUTOMATIC) {
+                       attr = NL80211_TID_CONFIG_ATTR_TX_RATE;
+                       err = nl80211_parse_tx_bitrate_mask(info, attrs, attr,
+                                                   &tid_conf->txrate_mask);
+                       if (err)
+                               return err;
+
+                       tid_conf->mask |= BIT(NL80211_TID_CONFIG_ATTR_TX_RATE);
+               }
+               tid_conf->mask |= BIT(NL80211_TID_CONFIG_ATTR_TX_RATE_TYPE);
+       }
+
        if (peer)
                mask = rdev->wiphy.tid_config_support.peer;
        else