On Wed, Jan 25, 2023 at 12:55 AM Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> On Tue, Jan 24, 2023 at 02:54:29PM +0000, Jaewan Kim wrote:
> > This CL allows mac80211_hwsim to be configured with PMSR capability.
>
> What is a "CL"?
>
> What is "PMSR"?
>
> > The capability is mandatory because nl80211_pmsr_start() ignores
> > incoming PMSR request if PMSR capability isn't set in the wiphy.
>
> Mandatory for what?
>
> >
> > This CL adds HWSIM_ATTR_PMSR_SUPPORT.
>
> "CL"?
>
> > It can be used to set PMSR capability when creating a new radio.
> > To send extra details, HWSIM_ATTR_PMSR_SUPPORT can have nested
> > PMSR capability attributes defined in the nl80211.h.
> > Data format is the same as cfg80211_pmsr_capabilities.
> >
> > If HWSIM_ATTR_PMSR_SUPPORT is specified, mac80211_hwsim builds
> > cfg80211_pmsr_capabilities and sets wiphy.pmsr_capa.
> >
> > Signed-off-by: Jaewan Kim <jaewan@xxxxxxxxxx>
> > ---
> > V5 -> V6: Added per change patch history.
> > V4 -> V5: Fixed style for commit messages.
> > V3 -> V4: Added change details for new attribute, and fixed memory leak.
> > V1 -> V3: Initial commit (includes resends).
> > ---
> > drivers/net/wireless/mac80211_hwsim.c | 159 +++++++++++++++++++++++-
> > drivers/net/wireless/mac80211_hwsim.h | 2 +
> > include/net/cfg80211.h | 10 ++
> > net/wireless/nl80211.c | 17 ++-
> > 4 files changed, 181 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
> > index c57c8903b7c0..84c9db9178c3 100644
> > --- a/drivers/net/wireless/mac80211_hwsim.c
> > +++ b/drivers/net/wireless/mac80211_hwsim.c
> > @@ -719,6 +719,9 @@ struct mac80211_hwsim_data {
> > /* RSSI in rx status of the receiver */
> > int rx_rssi;
> >
> > + /* only used when pmsr capability is supplied */
> > + struct cfg80211_pmsr_capabilities pmsr_capa;
> > +
> > struct mac80211_hwsim_link_data link_data[IEEE80211_MLD_MAX_NUM_LINKS];
> > };
> >
> > @@ -760,6 +763,37 @@ static const struct genl_multicast_group hwsim_mcgrps[] = {
> >
> > /* MAC80211_HWSIM netlink policy */
> >
> > +static const struct nla_policy
> > +hwsim_ftm_capa_policy[NL80211_PMSR_FTM_CAPA_ATTR_MAX + 1] = {
> > + [NL80211_PMSR_FTM_CAPA_ATTR_ASAP] = { .type = NLA_FLAG },
> > + [NL80211_PMSR_FTM_CAPA_ATTR_NON_ASAP] = { .type = NLA_FLAG },
> > + [NL80211_PMSR_FTM_CAPA_ATTR_REQ_LCI] = { .type = NLA_FLAG },
> > + [NL80211_PMSR_FTM_CAPA_ATTR_REQ_CIVICLOC] = { .type = NLA_FLAG },
> > + [NL80211_PMSR_FTM_CAPA_ATTR_PREAMBLES] = { .type = NLA_U32 },
> > + [NL80211_PMSR_FTM_CAPA_ATTR_BANDWIDTHS] = { .type = NLA_U32 },
> > + [NL80211_PMSR_FTM_CAPA_ATTR_MAX_BURSTS_EXPONENT] =
> > + NLA_POLICY_MAX(NLA_U8, 15),
> > + [NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST] =
> > + NLA_POLICY_MAX(NLA_U8, 31),
> > + [NL80211_PMSR_FTM_CAPA_ATTR_TRIGGER_BASED] = { .type = NLA_FLAG },
> > + [NL80211_PMSR_FTM_CAPA_ATTR_NON_TRIGGER_BASED] = { .type = NLA_FLAG },
> > +};
> > +
> > +static const struct nla_policy
> > +hwsim_pmsr_type_policy[NL80211_PMSR_TYPE_MAX + 1] = {
> > + [NL80211_PMSR_TYPE_FTM] = NLA_POLICY_NESTED(hwsim_ftm_capa_policy),
> > +};
> > +
> > +static const struct nla_policy
> > +hwsim_pmsr_capa_policy[NL80211_PMSR_ATTR_MAX + 1] = {
> > + [NL80211_PMSR_ATTR_MAX_PEERS] = { .type = NLA_U32 },
> > + [NL80211_PMSR_ATTR_REPORT_AP_TSF] = { .type = NLA_FLAG },
> > + [NL80211_PMSR_ATTR_RANDOMIZE_MAC_ADDR] = { .type = NLA_FLAG },
> > + [NL80211_PMSR_ATTR_TYPE_CAPA] =
> > + NLA_POLICY_NESTED(hwsim_pmsr_type_policy),
> > + [NL80211_PMSR_ATTR_PEERS] = { .type = NLA_REJECT }, // only for request.
> > +};
> > +
> > static const struct nla_policy hwsim_genl_policy[HWSIM_ATTR_MAX + 1] = {
> > [HWSIM_ATTR_ADDR_RECEIVER] = NLA_POLICY_ETH_ADDR_COMPAT,
> > [HWSIM_ATTR_ADDR_TRANSMITTER] = NLA_POLICY_ETH_ADDR_COMPAT,
> > @@ -788,6 +822,7 @@ static const struct nla_policy hwsim_genl_policy[HWSIM_ATTR_MAX + 1] = {
> > [HWSIM_ATTR_IFTYPE_SUPPORT] = { .type = NLA_U32 },
> > [HWSIM_ATTR_CIPHER_SUPPORT] = { .type = NLA_BINARY },
> > [HWSIM_ATTR_MLO_SUPPORT] = { .type = NLA_FLAG },
> > + [HWSIM_ATTR_PMSR_SUPPORT] = NLA_POLICY_NESTED(hwsim_pmsr_capa_policy),
> > };
> >
> > #if IS_REACHABLE(CONFIG_VIRTIO)
> > @@ -3107,6 +3142,18 @@ static int mac80211_hwsim_change_sta_links(struct ieee80211_hw *hw,
> > return 0;
> > }
> >
> > +static int mac80211_hwsim_start_pmsr(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
> > + struct cfg80211_pmsr_request *request)
> > +{
> > + return -EOPNOTSUPP;
> > +}
> > +
> > +static void mac80211_hwsim_abort_pmsr(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
> > + struct cfg80211_pmsr_request *request)
> > +{
> > + // Do nothing for now.
> > +}
> > +
> > #define HWSIM_COMMON_OPS \
> > .tx = mac80211_hwsim_tx, \
> > .wake_tx_queue = ieee80211_handle_wake_tx_queue, \
> > @@ -3129,7 +3176,9 @@ static int mac80211_hwsim_change_sta_links(struct ieee80211_hw *hw,
> > .flush = mac80211_hwsim_flush, \
> > .get_et_sset_count = mac80211_hwsim_get_et_sset_count, \
> > .get_et_stats = mac80211_hwsim_get_et_stats, \
> > - .get_et_strings = mac80211_hwsim_get_et_strings,
> > + .get_et_strings = mac80211_hwsim_get_et_strings, \
> > + .start_pmsr = mac80211_hwsim_start_pmsr, \
> > + .abort_pmsr = mac80211_hwsim_abort_pmsr,
> >
> > #define HWSIM_NON_MLO_OPS \
> > .sta_add = mac80211_hwsim_sta_add, \
> > @@ -3186,6 +3235,7 @@ struct hwsim_new_radio_params {
> > u32 *ciphers;
> > u8 n_ciphers;
> > bool mlo;
> > + const struct cfg80211_pmsr_capabilities *pmsr_capa;
> > };
> >
> > static void hwsim_mcast_config_msg(struct sk_buff *mcast_skb,
> > @@ -3260,7 +3310,10 @@ static int append_radio_msg(struct sk_buff *skb, int id,
> > return ret;
> > }
> >
> > - return 0;
> > + if (param->pmsr_capa)
> > + ret = cfg80211_send_pmsr_capa(param->pmsr_capa, skb);
> > +
> > + return ret;
> > }
> >
> > static void hwsim_mcast_new_radio(int id, struct genl_info *info,
> > @@ -4606,6 +4659,11 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
> > data->debugfs,
> > data, &hwsim_simulate_radar);
> >
> > + if (param->pmsr_capa) {
> > + data->pmsr_capa = *param->pmsr_capa;
> > + hw->wiphy->pmsr_capa = &data->pmsr_capa;
> > + }
> > +
> > spin_lock_bh(&hwsim_radio_lock);
> > err = rhashtable_insert_fast(&hwsim_radios_rht, &data->rht,
> > hwsim_rht_params);
> > @@ -4715,6 +4773,7 @@ static int mac80211_hwsim_get_radio(struct sk_buff *skb,
> > param.regd = data->regd;
> > param.channels = data->channels;
> > param.hwname = wiphy_name(data->hw->wiphy);
> > + param.pmsr_capa = &data->pmsr_capa;
> >
> > res = append_radio_msg(skb, data->idx, ¶m);
> > if (res < 0)
> > @@ -5053,6 +5112,83 @@ static bool hwsim_known_ciphers(const u32 *ciphers, int n_ciphers)
> > return true;
> > }
> >
> > +static int parse_ftm_capa(const struct nlattr *ftm_capa,
> > + struct cfg80211_pmsr_capabilities *out)
> > +{
> > + struct nlattr *tb[NL80211_PMSR_FTM_CAPA_ATTR_MAX + 1];
> > + int ret = nla_parse_nested(tb, NL80211_PMSR_FTM_CAPA_ATTR_MAX,
> > + ftm_capa, hwsim_ftm_capa_policy, NULL);
> > + if (ret) {
> > + pr_err("mac80211_hwsim: malformed FTM capability");
>
> dev_err()?
Is dev_err() the printing error for device code?
If so, would it be better to propose another change for replacing all
pr_err() with dev_err() in this file?
I asked some people but I couldn't get the answer.
>
> And can userspace trigger this? If so, should it be rate limited?
>
> And you need a blank line before this one, didn't checkpatch complain
> about that?
>
> > + return -EINVAL;
> > + }
> > +
> > + out->ftm.supported = 1;
> > + if (tb[NL80211_PMSR_FTM_CAPA_ATTR_PREAMBLES])
> > + out->ftm.preambles =
> > + nla_get_u32(tb[NL80211_PMSR_FTM_CAPA_ATTR_PREAMBLES]);
> > + if (tb[NL80211_PMSR_FTM_CAPA_ATTR_BANDWIDTHS])
> > + out->ftm.bandwidths =
> > + nla_get_u32(tb[NL80211_PMSR_FTM_CAPA_ATTR_BANDWIDTHS]);
> > + if (tb[NL80211_PMSR_FTM_CAPA_ATTR_MAX_BURSTS_EXPONENT])
> > + out->ftm.max_bursts_exponent =
> > + nla_get_u8(tb[NL80211_PMSR_FTM_CAPA_ATTR_MAX_BURSTS_EXPONENT]);
> > + if (tb[NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST])
> > + out->ftm.max_ftms_per_burst =
> > + nla_get_u8(tb[NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST]);
> > + out->ftm.asap =
> > + !!tb[NL80211_PMSR_FTM_CAPA_ATTR_ASAP];
> > + out->ftm.non_asap =
> > + !!tb[NL80211_PMSR_FTM_CAPA_ATTR_NON_ASAP];
> > + out->ftm.request_lci =
> > + !!tb[NL80211_PMSR_FTM_CAPA_ATTR_REQ_LCI];
> > + out->ftm.request_civicloc =
> > + !!tb[NL80211_PMSR_FTM_CAPA_ATTR_REQ_CIVICLOC];
> > + out->ftm.trigger_based =
> > + !!tb[NL80211_PMSR_FTM_CAPA_ATTR_TRIGGER_BASED];
> > + out->ftm.non_trigger_based =
> > + !!tb[NL80211_PMSR_FTM_CAPA_ATTR_NON_TRIGGER_BASED];
> > +
> > + return 0;
> > +}
> > +
> > +static int parse_pmsr_capa(const struct nlattr *pmsr_capa,
> > + struct cfg80211_pmsr_capabilities *out)
> > +{
> > + struct nlattr *tb[NL80211_PMSR_ATTR_MAX + 1];
> > + struct nlattr *nla;
> > + int size;
> > + int ret = nla_parse_nested(tb, NL80211_PMSR_ATTR_MAX, pmsr_capa,
> > + hwsim_pmsr_capa_policy, NULL);
> > + if (ret) {
> > + pr_err("mac80211_hwsim: malformed PMSR capability");
> > + return -EINVAL;
> > + }
> > +
> > + if (tb[NL80211_PMSR_ATTR_MAX_PEERS])
> > + out->max_peers =
> > + nla_get_u32(tb[NL80211_PMSR_ATTR_MAX_PEERS]);
> > + out->report_ap_tsf = !!tb[NL80211_PMSR_ATTR_REPORT_AP_TSF];
> > + out->randomize_mac_addr =
> > + !!tb[NL80211_PMSR_ATTR_RANDOMIZE_MAC_ADDR];
> > +
> > + if (!tb[NL80211_PMSR_ATTR_TYPE_CAPA]) {
> > + pr_err("mac80211_hwsim: malformed PMSR type");
> > + return -EINVAL;
> > + }
> > +
> > + nla_for_each_nested(nla, tb[NL80211_PMSR_ATTR_TYPE_CAPA], size) {
> > + switch (nla_type(nla)) {
> > + case NL80211_PMSR_TYPE_FTM:
> > + parse_ftm_capa(nla, out);
> > + break;
> > + default:
> > + pr_warn("mac80211_hwsim: Unknown PMSR type\n");
> > + }
> > + }
> > + return 0;
> > +}
> > +
> > static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info)
> > {
> > struct hwsim_new_radio_params param = { 0 };
> > @@ -5173,8 +5309,26 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info)
> > param.hwname = hwname;
> > }
> >
> > + if (info->attrs[HWSIM_ATTR_PMSR_SUPPORT]) {
> > + struct cfg80211_pmsr_capabilities *pmsr_capa =
> > + kmalloc(sizeof(struct cfg80211_pmsr_capabilities),
> > + GFP_KERNEL);
> > + if (!pmsr_capa) {
> > + ret = -ENOMEM;
> > + goto out_free;
> > + }
> > + ret = parse_pmsr_capa(info->attrs[HWSIM_ATTR_PMSR_SUPPORT],
> > + pmsr_capa);
> > + if (ret)
> > + goto out_free;
> > + param.pmsr_capa = pmsr_capa;
> > + }
> > +
> > ret = mac80211_hwsim_new_radio(info, ¶m);
> > +
> > +out_free:
> > kfree(hwname);
> > + kfree(param.pmsr_capa);
> > return ret;
> > }
> >
> > @@ -5419,7 +5573,6 @@ static struct notifier_block hwsim_netlink_notifier = {
> > static int __init hwsim_init_netlink(void)
> > {
> > int rc;
> > -
> > printk(KERN_INFO "mac80211_hwsim: initializing netlink\n");
> >
> > rc = genl_register_family(&hwsim_genl_family);
>
> Why did you delete this line for no reason?
>
> You might want to take some time and get an internal-Google review
> before submitting this again to save the community some time and effort
> in reviewing these. I'm sure there are developers there you can find to
> help you out.
>
> thanks,
>
> greg k-h
Thank you for the review. I'll get another round of internal reviews.
