cfg80211/mac80211: Add support for TID specific configuration
Subsystems (2)
v7 cover cfg80211/mac80211: Add support for TID specific configuration
Add infrastructure to support per TID configurations like noack policy, retry count, AMPDU control(disable/enable), RTSCTS control(enable/disable) and TX rate mask configurations.
This will be useful for the driver which can supports data TID specific configuration rather than phy level configurations. Here NL80211_CMD_SET_TID_CONFIG added to support this operation by accepting TID configuration.
This command can accept STA mac addreess to make the configuration station specific rather than applying to all the connected stations to the netdev.
And this nested command configuration can accept multiple number of data TID specific configuration in a single command,
enum ieee80211_tid_conf_mask used to notify the driver that which configuration got modified for the TID.
Tamizh chelvam (6):
nl80211: New netlink command for TID specific configuration
nl80211: Add new netlink attribute for TID speicific retry count
nl80211: Add netlink attribute for AMPDU aggregation enable/disable
nl80211: Add netlink attribute to enable/disable RTS_CTS
nl80211: Add netlink attribute to configure TID specific tx rate
mac80211: Add api to support configuring TID specific configuration
v7:
* Fixed compilation error and removed tid config variables from mac80211
v6:
* Addressed Johannes comments.
v5:
* Fixed possible memleak of 'tid_conf' in nl80211_set_tid_config.
v4:
* Fixed kbuild warnings.
v3:
* Modified "nl80211: Add netlink attribute to configure TID specific tx rate" patch to accept multiple TX rate configuration at a time.
* Modified noack and ampdu variable data type to int in
"mac80211: Add api to support configuring TID specific configuration" patch to store default configuration.
* Modified "ath10k: Add new api to support TID specific configuration" patch to handle default values for noack and ampdu. And added sta pointer sanity check in ath10k_mac_tid_bitrate_config function.
* Fixed "ath10k: Add extended TID configuration support" wmi command parameters assigned part.
v2:
* Added support to accept multiple TID configuration
* Added support to configure TX rate and RTSCTS control
include/net/cfg80211.h | 55 +++++++++ include/net/mac80211.h | 8 ++ include/uapi/linux/nl80211.h | 190 +++++++++++++++++++++++++++++ net/mac80211/cfg.c | 28 +++++ net/mac80211/driver-ops.h | 15 +++ net/wireless/nl80211.c | 276 +++++++++++++++++++++++++++++++++++++++--- net/wireless/rdev-ops.h | 12 ++ net/wireless/trace.h | 17 +++ 8 files changed, 584 insertions(+), 17 deletions(-)
Signature · 1 line
1.7.9.5
PATCH v7 1/6 nl80211: New netlink command for TID specific configuration
Add a new NL command, NL80211_CMD_SET_TID_CONFIG to support data TID specific configuration. This per TID configurations are passed in NL80211_TID_CONFIG_ATTR_TID which is a nested attribute. This patch adds support to configure per TID noack policy through NL80211_TID_CONFIG_ATTR_NOACK attribute. Data TID value for this configuration will be passed through NL80211_TID_CONFIG_ATTR_TID attribute. When the user-space wants this configuration peer specific rather than being applied for all the connected stations, MAC address of the peer can be passed in NL80211_ATTR_MAC attribute. This patch introduced
enum ieee80211_tid_conf_mask to notify the driver that which configuration modified.
Driver supporting data TID specific noack policy configuration should be advertise through NL80211_EXT_FEATURE_PER_TID_NOACK_CONFIG and supporting per STA data TID noack policy configuration should be advertise through NL80211_EXT_FEATURE_PER_STA_NOACK_CONFIG
--- include/net/cfg80211.h | 35 ++++++++++++ include/uapi/linux/nl80211.h | 59 ++++++++++++++++++++ net/wireless/nl80211.c | 122 ++++++++++++++++++++++++++++++++++++++++++ net/wireless/rdev-ops.h | 12 +++++ net/wireless/trace.h | 17 ++++++ 5 files changed, 245 insertions(+)
include/net/cfg80211.h +35 -0
@@ -596,6 +596,35 @@ struct cfg80211_chan_def {struct ieee80211_edmg edmg; }; +enum ieee80211_tid_conf_mask { +IEEE80211_TID_CONF_NOACK =BIT (0 ), +}; + +/** +* struct ieee80211_tid_cfg - TID specific configuration +* @tid: TID number +* @tid_conf_mask: bitmap indicating which parameter changed +* see %enum ieee80211_tid_conf_mask +* @noack: noack configuration value for the TID +*/ +struct ieee80211_tid_cfg { +u8 tid; +u32 tid_conf_mask; +u8 noack; +}; + +/** +* struct ieee80211_tid_config - TID configuration +* @peer: Station's MAC address +* @n_tid_conf: Number of TID specific configurations to be applied +* @tid_conf: Configuration change info +*/ +struct ieee80211_tid_config { +const u8 *peer; +u32 n_tid_conf; +struct ieee80211_tid_cfg tid_conf[]; +}; +/** * cfg80211_get_chandef_type - return old channel type from chandef * @chandef: the channel definition
@@ -3625,6 +3654,10 @@ struct cfg80211_update_owe_info {* * @probe_mesh_link: Probe direct Mesh peer's link quality by sending data frame * and overrule HWMP path selection algorithm. +* @set_tid_config: TID specific configuration. Apply this configuration for +* all the connected stations in the BSS if peer is %NULL. Otherwise +* apply this configuration to the specific station. +* This callback may sleep. */ struct cfg80211_ops {int (*suspend)(struct wiphy *wiphy,struct cfg80211_wowlan *wow);
@@ -3943,6 +3976,8 @@ struct cfg80211_ops { struct cfg80211_update_owe_info *owe_info);int (*probe_mesh_link)(struct wiphy *wiphy,struct net_device *dev,const u8 *buf,size_t len); +int (*set_tid_config)(struct wiphy *wiphy,struct net_device *dev, +struct ieee80211_tid_config *tid_conf); };/*
include/uapi/linux/nl80211.h +59 -0
101 lines not on this page · raw message
net/wireless/nl80211.c +122 -0
146 lines not on this page · raw message
net/wireless/rdev-ops.h +12 -0
@@ -1299,4 +1299,16 @@ static inline int rdev_update_owe_info(struct cfg80211_registered_device *rdev, return ret; } +static inline int rdev_set_tid_config (struct cfg80211_registered_device *rdev, +struct net_device *dev, +struct ieee80211_tid_config *tid_conf) +{ +int ret; + +trace_rdev_set_tid_config (&rdev->wiphy, dev, tid_conf); + ret = rdev->ops->set_tid_config (&rdev->wiphy, dev, tid_conf); +trace_rdev_return_int (&rdev->wiphy, ret); +return ret; +} +#endif /* __CFG80211_RDEV_OPS */
net/wireless/trace.h +17 -0
@@ -3458,6 +3458,23 @@ WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(dest)) ); +TRACE_EVENT (rdev_set_tid_config, + TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, + struct ieee80211_tid_config *tid_conf), +TP_ARGS (wiphy, netdev, tid_conf), +TP_STRUCT__entry ( + WIPHY_ENTRY + NETDEV_ENTRY +MAC_ENTRY (peer) + ), +TP_fast_assign ( + WIPHY_ASSIGN; + NETDEV_ASSIGN; + MAC_ASSIGN(peer, tid_conf->peer); + ), +TP_printk (WIPHY_PR_FMT ", " NETDEV_PR_FMT ", peer: " MAC_PR_FMT , +WIPHY_PR_ARG ,NETDEV_PR_ARG ,MAC_PR_ARG (peer)) +);#endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */ #undef TRACE_INCLUDE_PATH
Signature · 1 line
1.7.9.5
PATCH v7 2/6 nl80211: Add new netlink attribute for TID speicific retry count
In reply to Tamizh chelvamThis patch introduced below NL attributes to add support for configuring data TID specific retry count
NL80211_TID_CONFIG_ATTR_RETRYNL80211_TID_CONFIG_ATTR_RETRY_SHORTNL80211_TID_CONFIG_ATTR_RETRY_LONG
These attributes are added in NL80211_ATTR_TID_CONFIG nested attribute. This will be useful for the driver which supports data TID specific retry count configuration rather using phy level retry configuration. This TID specific retry configuration will have more precedence than phy level configuration. This configuration can be applied for a specific peer. To apply this configuration specific to a peer rather than being applied for all the connected stations,
MAC address of the peer can be passed in NL80211_ATTR_MAC attribute.
Driver should advertise WIPHY_FLAG_HAS_MAX_DATA_RETRY_COUNT and max_data_retry_count value to notify user space to avoid of passing greater than the allowed limit.
Driver supporting TID specific retry configuration should advertise NL80211_EXT_FEATURE_PER_TID_RETRY_CONFIG and per STA specific data TID retry configuration should advertise NL80211_EXT_FEATURE_PER_STA_RETRY_CONFIG.
--- include/net/cfg80211.h | 9 ++++++++ include/uapi/linux/nl80211.h | 48 ++++++++++++++++++++++++++++++++++++++++++ net/wireless/nl80211.c | 45 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+)
include/net/cfg80211.h +9 -0
@@ -598,6 +598,7 @@ struct cfg80211_chan_def {enum ieee80211_tid_conf_mask {IEEE80211_TID_CONF_NOACK =BIT (0 ), +IEEE80211_TID_CONF_RETRY =BIT (1 ), };/**
@@ -606,11 +607,15 @@ enum ieee80211_tid_conf_mask {* @tid_conf_mask: bitmap indicating which parameter changed * see %enum ieee80211_tid_conf_mask * @noack: noack configuration value for the TID +* @retry_long: retry count value +* @retry_short: retry count value */ struct ieee80211_tid_cfg {u8 tid;u32 tid_conf_mask;u8 noack; +int retry_long; +int retry_short; };/**
@@ -4567,6 +4572,8 @@ struct cfg80211_pmsr_capabilities {* @support_mbssid must be set for this to have any effect. * * @pmsr_capa: peer measurement capabilities +* @max_data_retry_count: Maximum limit can be configured as retry count +* for a TID. */ struct wiphy {/* assign these fields before you register the wiphy */
@@ -4711,6 +4718,8 @@ struct wiphy {const struct cfg80211_pmsr_capabilities *pmsr_capa; +u8 max_data_retry_count; +char priv[0 ]__aligned(NETDEV_ALIGN) ; };
include/uapi/linux/nl80211.h +48 -0
83 lines not on this page · raw message
net/wireless/nl80211.c +45 -0
63 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v7 3/6 nl80211: Add netlink attribute for AMPDU aggregation enable/disable
In reply to Tamizh chelvamIntroduce NL80211_TID_CONFIG_ATTR_AMPDU_CTRL in nl80211_attr_tid_config to accept TID specific AMPDU aggregation enable/disable configuration through NL80211_CMD_SET_TID_CONFIG command. TID for which the aggregation control configuration is to be applied is passed in NL80211_TID_CONFIG_ATTR_TID attribute. When the user-space wants this configuration peer specific rather than being applied for all the connected stations, MAC address of the peer can be passed in NL80211_ATTR_MAC attribute.
Driver supporting this feature should advertise NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL and supporting per-STA data TID ampdu configuration should advertise NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL.
--- include/net/cfg80211.h | 3 +++ include/uapi/linux/nl80211.h | 22 ++++++++++++++++++++++ net/wireless/nl80211.c | 14 ++++++++++++++ 3 files changed, 39 insertions(+)
include/net/cfg80211.h +3 -0
@@ -599,6 +599,7 @@ struct cfg80211_chan_def {enum ieee80211_tid_conf_mask {IEEE80211_TID_CONF_NOACK =BIT (0 ),IEEE80211_TID_CONF_RETRY =BIT (1 ), +IEEE80211_TID_CONF_AMPDU =BIT (2 ), };/**
@@ -609,6 +610,7 @@ enum ieee80211_tid_conf_mask {* @noack: noack configuration value for the TID * @retry_long: retry count value * @retry_short: retry count value +* @ampdu: Enable/Disable aggregation */ struct ieee80211_tid_cfg {u8 tid;
@@ -616,6 +618,7 @@ struct ieee80211_tid_cfg {u8 noack;int retry_long;int retry_short; +u8 ampdu; };/**
include/uapi/linux/nl80211.h +22 -0
@@ -4761,6 +4761,21 @@ enum nl80211_tid_config {* the max value should be advertised by the driver through * max_data_retry_count. when this attribute is not present, the driver * would use the default configuration. +* @NL80211_TID_CONFIG_ATTR_AMPDU_CTRL: Enable/Disable aggregation for the TID +* specified in %%NL80211_TID_CONFIG_ATTR_TID. Its type is u8, +* if the peer MAC address is passed in %NL80211_ATTR_MAC, the aggregation +* configuration is applied +* to the data frame for the tid to that connected station. +* Station specific aggregation configuration is valid only for STA's +* current connection. i.e. the configuration will be reset to default when +* the station connects back after disconnection/roaming. +* when user-space does not include %NL80211_ATTR_MAC, this configuration +* should be treated as per-netdev configuration. This configuration will +* be cleared when the interface goes down and on the disconnection from a +* BSS. Driver supporting this feature should advertise +* NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL and supporting per station +* aggregation configuration should advertise +* NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL. */ enum nl80211_tid_config_attr { __NL80211_TID_CONFIG_ATTR_INVALID,
@@ -4769,6 +4784,7 @@ enum nl80211_tid_config_attr {NL80211_TID_CONFIG_ATTR_RETRY ,NL80211_TID_CONFIG_ATTR_RETRY_SHORT ,NL80211_TID_CONFIG_ATTR_RETRY_LONG , +NL80211_TID_CONFIG_ATTR_AMPDU_CTRL ,/* keep last */ __NL80211_TID_CONFIG_ATTR_AFTER_LAST,
@@ -5594,6 +5610,10 @@ enum nl80211_feature_flags {* count functionality. * @NL80211_EXT_FEATURE_PER_STA_RETRY_CONFIG: Driver supports STA specific * data retry count functionality. +* @NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL: Driver supports TID specific +* aggregation control(enable/disable). +* @NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL: Driver supports per STA +* specific TID aggregation control(enable/disable). * * @NUM_NL80211_EXT_FEATURES: number of extended features. * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -5644,6 +5664,8 @@ enum nl80211_ext_feature_index {NL80211_EXT_FEATURE_PER_STA_NOACK_CONFIG ,NL80211_EXT_FEATURE_PER_TID_RETRY_CONFIG ,NL80211_EXT_FEATURE_PER_STA_RETRY_CONFIG , +NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL , +NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL ,/* add new features before the definition below */ NUM_NL80211_EXT_FEATURES,
net/wireless/nl80211.c +14 -0
@@ -329,6 +329,8 @@ static int validate_ie_attr(const struct nlattr *attr, [NL80211_TID_CONFIG_ATTR_RETRY] = { .type = NLA_FLAG }, [NL80211_TID_CONFIG_ATTR_RETRY_SHORT] = { .type = NLA_U8}, [NL80211_TID_CONFIG_ATTR_RETRY_LONG] = { .type = NLA_U8}, + [NL80211_TID_CONFIG_ATTR_AMPDU_CTRL ] = + NLA_POLICY_MAX(NLA_U8, NL80211_TID_CONFIG_DISABLE), };const struct nla_policy nl80211_policy[NUM_NL80211_ATTR ] = {
@@ -13884,6 +13886,18 @@ static int parse_tid_conf(struct cfg80211_registered_device *rdev, } } +if (attrs[NL80211_TID_CONFIG_ATTR_AMPDU_CTRL ]) { + err =nl80211_check_tid_config_support (rdev, extack, peer, + attrs[NL80211_TID_CONFIG_ATTR_AMPDU_CTRL ], +NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL , +NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL ); +if (err) +return err; + + tid_conf->tid_conf_mask |=IEEE80211_TID_CONF_AMPDU ; + tid_conf->ampdu = +nla_get_u8 (attrs[NL80211_TID_CONFIG_ATTR_AMPDU_CTRL ]); + }return 0 ; }
Signature · 1 line
1.7.9.5
PATCH v7 4/6 nl80211: Add netlink attribute to enable/disable RTS_CTS
In reply to Tamizh chelvamIntroduce NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL in nl80211_attr_tid_config to accept TID specific RTS_CTS enable/disable configuration through NL80211_CMD_SET_TID_CONFIG command. TID for which the RTS_CTS control configuration is to be applied is passed in NL80211_TID_CONFIG_ATTR_TID attribute. When the user-space wants this configuration peer specific rather than being applied for all the connected stations, MAC address of the peer can be passed in NL80211_ATTR_MAC attribute.
Driver supporting this feature should advertise NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL and supporting per-STA data TID RTS_CTS configuration should advertise NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL.
--- include/net/cfg80211.h | 3 +++ include/uapi/linux/nl80211.h | 22 ++++++++++++++++++++++ net/wireless/nl80211.c | 16 ++++++++++++++++ 3 files changed, 41 insertions(+)
include/net/cfg80211.h +3 -0
@@ -600,6 +600,7 @@ enum ieee80211_tid_conf_mask {IEEE80211_TID_CONF_NOACK =BIT (0 ),IEEE80211_TID_CONF_RETRY =BIT (1 ),IEEE80211_TID_CONF_AMPDU =BIT (2 ), + IEEE80211_TID_CONF_RTSCTS = BIT(3), };/**
@@ -611,6 +612,7 @@ enum ieee80211_tid_conf_mask {* @retry_long: retry count value * @retry_short: retry count value * @ampdu: Enable/Disable aggregation +* @rtscts: Enable/Disable RTS/CTS */ struct ieee80211_tid_cfg {u8 tid;
@@ -619,6 +621,7 @@ struct ieee80211_tid_cfg {int retry_long;int retry_short;u8 ampdu; +u8 rtscts; };/**
include/uapi/linux/nl80211.h +22 -0
@@ -4776,6 +4776,21 @@ enum nl80211_tid_config {* NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL and supporting per station * aggregation configuration should advertise * NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL. +* @NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL: Enable/Disable RTS_CTS for the TID +* specified in %%NL80211_TID_CONFIG_ATTR_TID. It is u8 type, if the +* peer MAC address is passed in %NL80211_ATTR_MAC, then this +* configuration is applied to the data frame for the tid to that +* connected station. +* Station specific RTS_CTS configuration is valid only for STA's +* current connection. i.e. the configuration will be reset to default when +* the station connects back after disconnection/roaming. +* when user-space does not include %NL80211_ATTR_MAC, this configuration +* should be treated as per-netdev configuration. This configuration will +* be cleared when the interface goes down and on the disconnection from a +* BSS. Driver supporting this feature should advertise +* NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL and supporting per station +* RTS_CTS configuration should advertise +* NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL. */ enum nl80211_tid_config_attr { __NL80211_TID_CONFIG_ATTR_INVALID,
@@ -4785,6 +4800,7 @@ enum nl80211_tid_config_attr {NL80211_TID_CONFIG_ATTR_RETRY_SHORT ,NL80211_TID_CONFIG_ATTR_RETRY_LONG ,NL80211_TID_CONFIG_ATTR_AMPDU_CTRL , +NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL ,/* keep last */ __NL80211_TID_CONFIG_ATTR_AFTER_LAST,
@@ -5614,6 +5630,10 @@ enum nl80211_feature_flags {* aggregation control(enable/disable). * @NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL: Driver supports per STA * specific TID aggregation control(enable/disable). +* @NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL: Driver supports TID specific +* RTS_CTS control(enable/disable). +* @NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL: Driver supports STA specific +* RTS_CTS control(enable/disable). * * @NUM_NL80211_EXT_FEATURES: number of extended features. * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -5666,6 +5686,8 @@ enum nl80211_ext_feature_index {NL80211_EXT_FEATURE_PER_STA_RETRY_CONFIG ,NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL ,NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL , +NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL , +NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL ,/* add new features before the definition below */ NUM_NL80211_EXT_FEATURES,
net/wireless/nl80211.c +16 -0
@@ -331,6 +331,8 @@ static int validate_ie_attr(const struct nlattr *attr, [NL80211_TID_CONFIG_ATTR_RETRY_LONG] = { .type = NLA_U8}, [NL80211_TID_CONFIG_ATTR_AMPDU_CTRL ] = NLA_POLICY_MAX(NLA_U8, NL80211_TID_CONFIG_DISABLE), + [NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL ] = + NLA_POLICY_MAX(NLA_U8, NL80211_TID_CONFIG_DISABLE), };const struct nla_policy nl80211_policy[NUM_NL80211_ATTR ] = {
@@ -13898,6 +13900,20 @@ static int parse_tid_conf(struct cfg80211_registered_device *rdev, tid_conf->ampdu =nla_get_u8 (attrs[NL80211_TID_CONFIG_ATTR_AMPDU_CTRL ]); } + +if (attrs[NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL ]) { + err =nl80211_check_tid_config_support (rdev, extack, peer, + attrs[NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL ], +NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL , +NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL ); +if (err) +return err; + + tid_conf->tid_conf_mask |=IEEE80211_TID_CONF_RTSCTS ; + tid_conf->rtscts = +nla_get_u8 (attrs[NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL ]); + } +return 0 ; }
Signature · 1 line
1.7.9.5
PATCH v7 5/6 nl80211: Add netlink attribute to configure TID specific tx rate
In reply to Tamizh chelvamIntroduce NL80211_TID_CONFIG_ATTR_TX_RATES in nl80211_tid_attr_config to accept data TID specific TX bitrate configuration
through NL80211_CMD_SET_TID_CONFIG command. TID for which the this configuration is to be applied is passed in NL80211_TID_CONFIG_ATTR_TID attribute. TX bitrate mask values passed in NL80211_ATTR_TX_RATES attribute and NL80211_TID_CONFIG_ATTR_TX_RATES attribute will have types of the TX rate should be applied. This uses nl80211_parse_tx_bitrate_mask to validate and calculate the bitrate mask. When the user-space wants this configuration peer specific rather than being applied for all the connected stations, MAC address of the peer can be passed in NL80211_ATTR_MAC attribute.
Driver supporting this feature should advertise NL80211_EXT_FEATURE_PER_TID_TX_BITRATE_MASK and supporting per-STA data TID TX bitrate configuration should advertise NL80211_EXT_FEATURE_PER_STA_TX_BITRATE_MASK.
--- include/net/cfg80211.h | 5 +++ include/uapi/linux/nl80211.h | 39 +++++++++++++++++++++ net/wireless/nl80211.c | 79 +++++++++++++++++++++++++++++++++--------- 3 files changed, 106 insertions(+), 17 deletions(-)
include/net/cfg80211.h +5 -0
@@ -601,6 +601,7 @@ enum ieee80211_tid_conf_mask {IEEE80211_TID_CONF_RETRY =BIT (1 ),IEEE80211_TID_CONF_AMPDU =BIT (2 ),IEEE80211_TID_CONF_RTSCTS =BIT (3 ), + IEEE80211_TID_CONF_TX_BITRATE = BIT(4), };/**
@@ -613,6 +614,8 @@ enum ieee80211_tid_conf_mask {* @retry_short: retry count value * @ampdu: Enable/Disable aggregation * @rtscts: Enable/Disable RTS/CTS +* @txrate_type: TX bitrate mask type +* @mask: bitrate to be applied for the TID */ struct ieee80211_tid_cfg {u8 tid;
@@ -622,6 +625,8 @@ struct ieee80211_tid_cfg {int retry_short;u8 ampdu;u8 rtscts; +enum nl80211_tx_rate_setting txrate_type; +struct cfg80211_bitrate_mask *mask; };/**
include/uapi/linux/nl80211.h +39 -0
@@ -4696,6 +4696,18 @@ enum nl80211_tx_power_setting { };/** +* 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 - TID config state * @NL80211_TID_CONFIG_DEFAULT: Default config for the TID. This is to * notify driver to reset the previous config and use vif specific
@@ -4791,6 +4803,25 @@ enum nl80211_tid_config {* NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL and supporting per station * RTS_CTS configuration should advertise * NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL. +* @NL80211_TID_CONFIG_ATTR_TX_RATES: Data frame TX rate mask should be applied +* with the parameters passed through %NL80211_ATTR_TX_RATES. This +* configuration is per TID, TID is specified with +* %NL80211_TID_CONFIG_ATTR_TID. +* If the peer MAC address is passed in %NL80211_ATTR_MAC, then this +* configuration is applied to the data frame for the tid to that connected +* station. This attribute will be useful to notfiy the driver that what +* type of txrate should be applied(%enum enum nl80211_tx_rate_setting) +* for the connected station (%NL80211_ATTR_MAC), +* Station specific retry configuration is valid only for STA's +* current connection. i.e. the configuration will be reset to default when +* the station connects back after disconnection/roaming. +* when user-space does not include %NL80211_ATTR_MAC, this configuration +* should be treated as per-netdev configuration. This configuration will +* be cleared when the interface goes down and on the disconnection from a +* BSS. Driver supporting this feature should advertise +* NL80211_EXT_FEATURE_PER_TID_TX_BITRATE_MASK and supporting per station +* TX bitrate configuration should advertise +* NL80211_EXT_FEATURE_PER_STA_TX_BITRATE_MASK. */ enum nl80211_tid_config_attr { __NL80211_TID_CONFIG_ATTR_INVALID,
@@ -4801,6 +4832,8 @@ enum nl80211_tid_config_attr {NL80211_TID_CONFIG_ATTR_RETRY_LONG ,NL80211_TID_CONFIG_ATTR_AMPDU_CTRL ,NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL , +NL80211_TID_CONFIG_ATTR_TX_RATES_TYPE , +NL80211_TID_CONFIG_ATTR_TX_RATES ,/* keep last */ __NL80211_TID_CONFIG_ATTR_AFTER_LAST,
@@ -5634,6 +5667,10 @@ enum nl80211_feature_flags {* RTS_CTS control(enable/disable). * @NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL: Driver supports STA specific * RTS_CTS control(enable/disable). +* @NL80211_EXT_FEATURE_PER_TID_TX_BITRATE_MASK: Driver supports TID specific +* TX bitrate configuration. +* @NL80211_EXT_FEATURE_PER_STA_TX_BITRATE_MASK: Driver supports STA specific +* TX bitrate configuration. * * @NUM_NL80211_EXT_FEATURES: number of extended features. * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -5688,6 +5725,8 @@ enum nl80211_ext_feature_index {NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL ,NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL ,NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL , +NL80211_EXT_FEATURE_PER_TID_TX_BITRATE_MASK , +NL80211_EXT_FEATURE_PER_STA_TX_BITRATE_MASK ,/* add new features before the definition below */ NUM_NL80211_EXT_FEATURES,
net/wireless/nl80211.c +62 -17
134 lines not on this page · raw message
Signature · 1 line
1.7.9.5
Re: [PATCHv7 5/6] nl80211: Add netlink attribute to configure TID specific tx rate
Hi Tamizh,
Quoted 12 lines · Tamizh chelvam
Introduce
NL80211_TID_CONFIG_ATTR_TX_RATESinnl80211_tid_attr_configto accept data TID specific TX bitrate configuration
throughNL80211_CMD_SET_TID_CONFIGcommand. TID for which the this configuration is to be applied is passed inNL80211_TID_CONFIG_ATTR_TIDattribute. TX bitrate mask values passed inNL80211_ATTR_TX_RATESattribute andNL80211_TID_CONFIG_ATTR_TX_RATESattribute will have types of the TX rate should be applied. This usesnl80211_parse_tx_bitrate_maskto validate and calculate the bitrate mask. When the user-space wants this configuration peer specific rather than being applied for all the connected stations, MAC address of the peer can be passed inNL80211_ATTR_MACattribute.
Quoted 6 lines
Driver supporting this feature should advertise
NL80211_EXT_FEATURE_PER_TID_TX_BITRATE_MASKand supporting per-STA data TID TX bitrate configuration should advertiseNL80211_EXT_FEATURE_PER_STA_TX_BITRATE_MASK.Signed-off-by Tamizh chelvam <[email protected]>
Below is a report from the 0day team doing clang builds for us, please take a look at it when you get a chance. Mixing enums like this usually means the code is not using the enums properly; if it is intentional, consider explicitly casting the enum to eliminate the warning.
Cheers,
Nathan
Quoted 165 lines · kbuild test robot
CC: [email protected]
In-Reply-To: <[email protected]>
References: <[email protected]>
TO: Tamizh chelvam <[email protected]>
CC: [email protected]
CC: [email protected], Tamizh chelvam <[email protected]>Hi Tamizh,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on mac80211-next/master]
[also build test WARNING on v5.4-rc5 next-20191031]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]url: https://github.com/0day-ci/linux/commits/Tamizh-chelvam/nl80211-New-netlink-command-for-TID-specific-configuration/20191103-092741 base: https://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git master config: arm64-defconfig (attached as .config) compiler: clang version 10.0.0 (git://gitmirror/llvm_project 97725707f488d3f00f94d4c4f2d9e193c302b23c)reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm64If you fix the issue, kindly add following tag
Reported-by kbuild test robot <[email protected]>All warnings (new ones prefixed by >>):
Quoted 1 line
Quoted 1 line
net/wireless/nl80211.c:13912:11: warning: implicit conversion from enumeration type 'enumnl80211_tid_config_attr' to different enumeration type 'enumnl80211_attrs' [-Wenum-conversion]attr = NL80211_TID_CONFIG_ATTR_TX_RATES; ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~1 warning generated.
vim +13912
net/wireless/nl80211.c13805
13806 static int parse_tid_conf(structcfg80211_registered_device*rdev,13807 struct nlattr *attrs[], 13808 struct ieee80211_tid_cfg *tid_conf, 13809 struct genl_info *info, const u8 *peer)13810 {
13811 structnetlink_ext_ack*extack =info->extack;
13812 int err;
13813
13814tid_conf->tid=nla_get_u8(attrs[NL80211_TID_CONFIG_ATTR_TID]);
13815 if (attrs[NL80211_TID_CONFIG_ATTR_NOACK]) {
13816 err = nl80211_check_tid_config_support(rdev, extack, peer,
13817 attrs[NL80211_TID_CONFIG_ATTR_NOACK],
13818NL80211_EXT_FEATURE_PER_TID_NOACK_CONFIG,
13819NL80211_EXT_FEATURE_PER_STA_NOACK_CONFIG);
13820 if (err)
13821 return err;
13822
13823tid_conf->tid_conf_mask|=IEEE80211_TID_CONF_NOACK;
13824tid_conf->noack=
13825nla_get_u8(attrs[NL80211_TID_CONFIG_ATTR_NOACK]);
13826 }
13827
13828 if (nla_get_flag(attrs[NL80211_TID_CONFIG_ATTR_RETRY])) {
13829 err = nl80211_check_tid_config_support(rdev, extack, peer,
13830 attrs[NL80211_TID_CONFIG_ATTR_RETRY],
13831NL80211_EXT_FEATURE_PER_TID_RETRY_CONFIG,
13832NL80211_EXT_FEATURE_PER_STA_RETRY_CONFIG);
13833 if (err)
13834 return err;
13835
13836tid_conf->tid_conf_mask|=IEEE80211_TID_CONF_RETRY;
13837 if (attrs[NL80211_TID_CONFIG_ATTR_RETRY_SHORT]) {
13838tid_conf->retry_short=
13839nla_get_u8(attrs[NL80211_TID_CONFIG_ATTR_RETRY_SHORT]);
13840 if (tid_conf->retry_short>
13841rdev->wiphy.max_data_retry_count)
13842 return-EINVAL;
13843 } else {
13844 /* Use driver default retry count or VIF specific
13845 * retry count
13846 */
13847tid_conf->retry_short= -1;
13848 }
13849
13850 if (attrs[NL80211_TID_CONFIG_ATTR_RETRY_LONG]) {
13851tid_conf->retry_long=
13852nla_get_u8(attrs[NL80211_TID_CONFIG_ATTR_RETRY_LONG]);
13853 if (tid_conf->retry_long>
13854rdev->wiphy.max_data_retry_count)
13855 return-EINVAL;
13856 } else {
13857 /* Use driver default retry count or VIF specific
13858 * retry count
13859 */
13860tid_conf->retry_long= -1;
13861 }
13862 }
13863
13864 if (attrs[NL80211_TID_CONFIG_ATTR_AMPDU_CTRL]) {
13865 err = nl80211_check_tid_config_support(rdev, extack, peer,
13866 attrs[NL80211_TID_CONFIG_ATTR_AMPDU_CTRL],
13867NL80211_EXT_FEATURE_PER_TID_AMPDU_CTRL,
13868NL80211_EXT_FEATURE_PER_STA_AMPDU_CTRL);
13869 if (err)
13870 return err;
13871
13872tid_conf->tid_conf_mask|=IEEE80211_TID_CONF_AMPDU;
13873tid_conf->ampdu=
13874nla_get_u8(attrs[NL80211_TID_CONFIG_ATTR_AMPDU_CTRL]);
13875 }
13876
13877 if (attrs[NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL]) {
13878 err = nl80211_check_tid_config_support(rdev, extack, peer,
13879 attrs[NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL],
13880NL80211_EXT_FEATURE_PER_TID_RTSCTS_CTRL,
13881NL80211_EXT_FEATURE_PER_STA_RTSCTS_CTRL);
13882 if (err)
13883 return err;
13884
13885tid_conf->tid_conf_mask|=IEEE80211_TID_CONF_RTSCTS;
13886tid_conf->rtscts=
13887nla_get_u8(attrs[NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL]);
13888 }
13889
13890 if (attrs[NL80211_TID_CONFIG_ATTR_TX_RATES_TYPE]) {
13891 int idx;
13892 enumnl80211_attrsattr;
13893
13894 err = nl80211_check_tid_config_support(rdev, extack, peer,
13895 attrs[NL80211_TID_CONFIG_ATTR_TX_RATES_TYPE],
13896NL80211_EXT_FEATURE_PER_TID_TX_BITRATE_MASK,
13897NL80211_EXT_FEATURE_PER_STA_TX_BITRATE_MASK);
13898 if (err)
13899 return err;
13900
13901 idx =NL80211_TID_CONFIG_ATTR_TX_RATES_TYPE;
13902tid_conf->txrate_type=nla_get_u8(attrs[idx]);
13903
13904tid_conf->tid_conf_mask|=IEEE80211_TID_CONF_TX_BITRATE;
13905 if (tid_conf->txrate_type!=NL80211_TX_RATE_AUTOMATIC) {
13906tid_conf->mask=
13907 kzalloc(sizeof(structcfg80211_bitrate_mask),
13908GFP_KERNEL);
13909 if (!tid_conf->mask)
13910 return-ENOMEM;
13911
13912 attr =NL80211_TID_CONFIG_ATTR_TX_RATES;
13913 err = nl80211_parse_tx_bitrate_mask(info, attrs, attr,
13914tid_conf->mask);
13915 if (err) {
13916kfree(tid_conf->mask);
13917 return err;
13918 }
13919 } else {
13920tid_conf->mask= NULL;
13921 }
13922 }
13923
13924 return 0;
13925 }
13926---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
PATCH v7 6/6 mac80211: Add api to support configuring TID specific configuration
In reply to Tamizh chelvamImplement drv_set_tid_config api to allow TID specific configuration. This per-TID configuration
will be applied for all the connected stations when MAC is NULL.
--- include/net/mac80211.h | 8 ++++++++ net/mac80211/cfg.c | 28 ++++++++++++++++++++++++++++ net/mac80211/driver-ops.h | 15 +++++++++++++++ 3 files changed, 51 insertions(+)
include/net/mac80211.h +8 -0
@@ -3756,6 +3756,10 @@ enum ieee80211_reconfig_type {* * @start_pmsr: start peer measurement (e.g. FTM) (this call can sleep) * @abort_pmsr: abort peer measurement (this call can sleep) +* @set_tid_config: TID specific configurations will be applied for a particular +* station when @sta is non-NULL. When @sta is %NULL, then the +* configuration will be for all the connected clients in the vif. +* This callback may sleep. */ struct ieee80211_ops { void (*tx)(struct ieee80211_hw *hw,
@@ -4060,6 +4064,10 @@ struct ieee80211_ops { struct cfg80211_pmsr_request *request);void (*abort_pmsr)(struct ieee80211_hw *hw,struct ieee80211_vif *vif,struct cfg80211_pmsr_request *request); +int (*set_tid_config)(struct ieee80211_hw *hw, +struct ieee80211_vif *vif, +struct ieee80211_sta *sta, +struct ieee80211_tid_config *tid_conf); };/**
net/mac80211/cfg.c +28 -0
@@ -3942,6 +3942,33 @@ static int ieee80211_get_txq_stats(struct wiphy *wiphy,return drv_abort_pmsr (local, sdata, request); } +static int ieee80211_set_tid_config (struct wiphy *wiphy, +struct net_device *dev, +struct ieee80211_tid_config *tid_conf) +{ +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); +struct sta_info *sta; +int ret; + +if (!sdata->local->ops->set_tid_config) +return -EOPNOTSUPP ; + +if (!tid_conf->peer) +return drv_set_tid_config (sdata->local, sdata,NULL , tid_conf); + +mutex_lock (&sdata->local->sta_mtx); + + sta =sta_info_get_bss (sdata, tid_conf->peer); +if (!sta) { +mutex_unlock (&sdata->local->sta_mtx); +return -ENOENT ; + } + + ret =drv_set_tid_config (sdata->local, sdata, &sta->sta, tid_conf); +mutex_unlock (&sdata->local->sta_mtx); +return ret; +} +const struct cfg80211_ops mac80211_config_ops = { .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface,
@@ -4040,4 +4067,5 @@ static int ieee80211_get_txq_stats(struct wiphy *wiphy, .start_pmsr = ieee80211_start_pmsr, .abort_pmsr = ieee80211_abort_pmsr, .probe_mesh_link = ieee80211_probe_mesh_link, + .set_tid_config = ieee80211_set_tid_config, };
net/mac80211/driver-ops.h +15 -0
@@ -1358,4 +1358,19 @@ static inline void drv_del_nan_func(struct ieee80211_local *local, trace_drv_return_void(local); } +static inline int drv_set_tid_config (struct ieee80211_local *local, +struct ieee80211_sub_if_data *sdata, +struct ieee80211_sta *sta, +struct ieee80211_tid_config *tid_conf) +{ +int ret; + +might_sleep (); + ret = local->ops->set_tid_config (&local->hw, &sdata->vif, sta, + tid_conf); +trace_drv_return_int (local, ret); + +return ret; +} +#endif /* __MAC80211_DRIVER_OPS */
Signature · 1 line
1.7.9.5