wifi: nl80211: add support for NAN stations

There are 2 types of logical links with a NAN peer:
- management (NMI), which is used for Tx/Rx of NAN management frames.
- data (NDI), which is used for Tx/Rx of data frames, or non-NAN
  management frames.

The NMI station has two roles:
- representation of the NAN peer - for example, the peer's schedule
  and the HT, VHT, HE capabilities - belong to the NMI station, and not to
  the NDI ones.
- Tx/Rx of NAN management frames to/from the peer.

The NDI station is used for Tx/Rx data frames of a specific NDP that was
established with the NAN peer.

Note that a peer can choose to reuse its NMI address as the NDI address.
In that case, it is expected that two stations will be added even though
they will have the same address.

- An NDI station can only be added after the corresponding NMI station
  was configured with capabilities.
- All the NDI stations will be removed before the NDI interface is brought
  down.
- All NMI stations will be removed before NAN is stopped.
- Before NMI sta removal, all corresponding NDI stations will be removed

Add support for adding, removing, and changing NMI and NDI stations.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20260219114327.d280936ee832.I6d859eee759bb5824a9ffd2984410faf879ba00e@changeid
Link: https://patch.msgid.link/20260318123926.206536-6-miriam.rachel.korenblit@intel.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 60cd0fbe9a46ba01bc5c5bb2fb24d733f387d413..654d71f60e8c91fb3fc94c90affc55818d7f80e1 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1831,6 +1831,7 @@ struct cfg80211_ttlm_params {
  * @eml_cap: EML capabilities of this station
  * @link_sta_params: link related params.
  * @epp_peer: EPP peer indication
+ * @nmi_mac: MAC address of the NMI station of the NAN peer
  */
 struct station_parameters {
        struct net_device *vlan;
@@ -1858,6 +1859,7 @@ struct station_parameters {
        u16 eml_cap;
        struct link_station_parameters link_sta_params;
        bool epp_peer;
+       const u8 *nmi_mac;
 };
 
 /**
@@ -1897,6 +1899,8 @@ struct station_del_parameters {
  *     entry that is operating, has been marked authorized by userspace)
  * @CFG80211_STA_MESH_PEER_KERNEL: peer on mesh interface (kernel managed)
  * @CFG80211_STA_MESH_PEER_USER: peer on mesh interface (user managed)
+ * @CFG80211_STA_NAN_MGMT: NAN management interface station
+ * @CFG80211_STA_NAN_DATA: NAN data path station
  */
 enum cfg80211_station_type {
        CFG80211_STA_AP_CLIENT,
@@ -1908,6 +1912,8 @@ enum cfg80211_station_type {
        CFG80211_STA_TDLS_PEER_ACTIVE,
        CFG80211_STA_MESH_PEER_KERNEL,
        CFG80211_STA_MESH_PEER_USER,
+       CFG80211_STA_NAN_MGMT,
+       CFG80211_STA_NAN_DATA,
 };
 
 /**
@@ -3999,6 +4005,56 @@ struct cfg80211_qos_map {
  *
  * The local schedule specifies which channels the device is available on and
  * when. Must be cancelled before NAN is stopped.
+ *
+ * NAN Stations
+ * ~~~~~~~~~~~~
+ *
+ * There are two types of stations corresponding to the two interface types:
+ *
+ * - NMI station: Represents the NAN peer. Peer-specific data such as the peer's
+ *   schedule and the HT, VHT and HE capabilities belongs to the NMI station.
+ *   Also used for Tx/Rx of NAN management frames to/from the peer.
+ *   Added on the %NL80211_IFTYPE_NAN interface.
+ *
+ * - NDI station: Used for Tx/Rx of data frames (and non-NAN management frames)
+ *   for a specific NDP established with the NAN peer. Added on the
+ *   %NL80211_IFTYPE_NAN_DATA interface.
+ *
+ * A peer may reuse its NMI address as the NDI address. In that case, two
+ * separate stations should be added even though they share the same MAC
+ * address.
+ *
+ * HT, VHT and HE capabilities should not changes after it was set. It is the
+ * driver's responsibility to check that.
+ *
+ * An NDI station can only be added if the corresponding NMI station has already
+ * been configured with HT (and possibly VHT and HE) capabilities. It is the
+ * driver's responsibility to check that.
+ *
+ * All NDI stations must be removed before corresponding NMI station is removed.
+ * Therefore, removing a NMI station implies that the associated NDI station(s)
+ * (if any) will be removed first.
+ *
+ * NAN Dependencies
+ * ~~~~~~~~~~~~~~~~
+ *
+ * The following diagram shows the dependencies between NAN components.
+ * An arrow from A to B means A must be started/added before B, and B must be
+ * stopped/removed before A:
+ *
+ *       +-------------+
+ *       |  NMI iface  |---(local schedule)
+ *       +------+------+
+ *          /       \
+ *         v         v
+ *   +-----------+  +-------------+
+ *   | NDI iface |  |   NMI sta   |---(peer schedule)
+ *   +-----+-----+  +------+------+
+ *          \           /
+ *           v         v
+ *          +----------+
+ *          | NDI sta  |
+ *          +----------+
  */
 
 /**

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index c94e957a3467cf4c1c15efe8bb6341b0c52e9fb2..1897b9a35be81ed54c85f3044ab900ae0dfdec21 100644 (file)
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2677,7 +2677,8 @@ enum nl80211_commands {
  *      a flow is assigned on each round of the DRR scheduler.
  * @NL80211_ATTR_HE_CAPABILITY: HE Capability information element (from
  *     association request when used with NL80211_CMD_NEW_STATION). Can be set
- *     only if %NL80211_STA_FLAG_WME is set.
+ *     only if %NL80211_STA_FLAG_WME is set (except for NAN, which uses WME
+ *     anyway).
  *
  * @NL80211_ATTR_FTM_RESPONDER: nested attribute which user-space can include
  *     in %NL80211_CMD_START_AP or %NL80211_CMD_SET_BEACON for fine timing
@@ -3057,6 +3058,9 @@ enum nl80211_commands {
  *     %NL80211_CMD_NAN_SCHED_UPDATE_DONE to indicate that the deferred
  *     schedule update completed successfully. If this flag is not present,
  *     the update failed.
+ * @NL80211_ATTR_NAN_NMI_MAC: The address of the NMI station to which this NDI
+ *     station belongs. Used with %NL80211_CMD_NEW_STATION when adding an NDI
+ *     station.
  *
  * @NL80211_ATTR_INCUMBENT_SIGNAL_INTERFERENCE_BITMAP: u32 attribute specifying
  *     the signal interference bitmap detected on the operating bandwidth for
@@ -3656,6 +3660,8 @@ enum nl80211_attrs {
        NL80211_ATTR_NAN_SCHED_DEFERRED,
        NL80211_ATTR_NAN_SCHED_UPDATE_SUCCESS,
 
+       NL80211_ATTR_NAN_NMI_MAC,
+
        /* add attributes here, update the policy in nl80211.c */
 
        __NL80211_ATTR_AFTER_LAST,

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index a9a829613b7b7876e9562639f3bea10409102aa1..89fb61d53e2f2fe78978e034336a280c23c94cd7 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1004,6 +1004,7 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
        [NL80211_ATTR_NAN_AVAIL_BLOB] =
                NLA_POLICY_VALIDATE_FN(NLA_BINARY, validate_nan_avail_blob),
        [NL80211_ATTR_NAN_SCHED_DEFERRED] = { .type = NLA_FLAG },
+       [NL80211_ATTR_NAN_NMI_MAC] = NLA_POLICY_ETH_ADDR,
 };
 
 /* policy for the key attributes */
@@ -7233,6 +7234,26 @@ static int parse_station_flags(struct genl_info *info,
                if ((params->sta_flags_mask |
                     params->sta_flags_set) & BIT(__NL80211_STA_FLAG_INVALID))
                        return -EINVAL;
+
+               if ((iftype == NL80211_IFTYPE_NAN ||
+                    iftype == NL80211_IFTYPE_NAN_DATA) &&
+                   params->sta_flags_mask &
+                   ~(BIT(NL80211_STA_FLAG_AUTHENTICATED) |
+                     BIT(NL80211_STA_FLAG_ASSOCIATED) |
+                     BIT(NL80211_STA_FLAG_AUTHORIZED) |
+                     BIT(NL80211_STA_FLAG_MFP)))
+                               return -EINVAL;
+
+               /* WME is always used in NAN */
+               if (iftype == NL80211_IFTYPE_NAN_DATA) {
+                       /* but don't let userspace control it */
+                       if (params->sta_flags_mask & BIT(NL80211_STA_FLAG_WME))
+                               return -EINVAL;
+
+                       params->sta_flags_mask |= BIT(NL80211_STA_FLAG_WME);
+                       params->sta_flags_set |= BIT(NL80211_STA_FLAG_WME);
+               }
+
                return 0;
        }
 
@@ -8115,7 +8136,7 @@ static int nl80211_dump_station(struct sk_buff *skb,
        /* nl80211_prepare_wdev_dump acquired it in the successful case */
        __acquire(&rdev->wiphy.mtx);
 
-       if (!wdev->netdev) {
+       if (!wdev->netdev && wdev->iftype != NL80211_IFTYPE_NAN) {
                err = -EINVAL;
                goto out_err;
        }
@@ -8302,10 +8323,12 @@ int cfg80211_check_station_change(struct wiphy *wiphy,
                        return -EINVAL;
                if (params->link_sta_params.supported_rates)
                        return -EINVAL;
-               if (params->ext_capab || params->link_sta_params.ht_capa ||
-                   params->link_sta_params.vht_capa ||
-                   params->link_sta_params.he_capa ||
-                   params->link_sta_params.eht_capa ||
+               if (statype != CFG80211_STA_NAN_MGMT &&
+                   (params->link_sta_params.ht_capa ||
+                    params->link_sta_params.vht_capa ||
+                    params->link_sta_params.he_capa))
+                       return -EINVAL;
+               if (params->ext_capab || params->link_sta_params.eht_capa ||
                    params->link_sta_params.uhr_capa)
                        return -EINVAL;
                if (params->sta_flags_mask & BIT(NL80211_STA_FLAG_SPP_AMSDU))
@@ -8377,6 +8400,19 @@ int cfg80211_check_station_change(struct wiphy *wiphy,
                    params->plink_action != NL80211_PLINK_ACTION_BLOCK)
                        return -EINVAL;
                break;
+       case CFG80211_STA_NAN_MGMT:
+               if (params->sta_flags_mask &
+                   ~(BIT(NL80211_STA_FLAG_AUTHORIZED) |
+                     BIT(NL80211_STA_FLAG_MFP)))
+                       return -EINVAL;
+               break;
+       case CFG80211_STA_NAN_DATA:
+               if (params->sta_flags_mask &
+                   ~(BIT(NL80211_STA_FLAG_AUTHORIZED) |
+                     BIT(NL80211_STA_FLAG_MFP) |
+                     BIT(NL80211_STA_FLAG_WME)))
+                       return -EINVAL;
+               break;
        }
 
        /*
@@ -8591,7 +8627,8 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
 
        memset(&params, 0, sizeof(params));
 
-       if (!dev)
+       if (!dev && wdev->iftype != NL80211_IFTYPE_NAN &&
+           wdev->iftype != NL80211_IFTYPE_NAN_DATA)
                return -EINVAL;
 
        if (!rdev->ops->change_station)
@@ -8734,6 +8771,8 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
        case NL80211_IFTYPE_STATION:
        case NL80211_IFTYPE_ADHOC:
        case NL80211_IFTYPE_MESH_POINT:
+       case NL80211_IFTYPE_NAN:
+       case NL80211_IFTYPE_NAN_DATA:
                break;
        default:
                err = -EOPNOTSUPP;
@@ -8762,7 +8801,7 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
 
        memset(&params, 0, sizeof(params));
 
-       if (!dev)
+       if (!dev && wdev->iftype != NL80211_IFTYPE_NAN)
                return -EINVAL;
 
        if (!rdev->ops->add_station)
@@ -8771,15 +8810,31 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[NL80211_ATTR_MAC])
                return -EINVAL;
 
-       if (!info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL])
-               return -EINVAL;
+       if (wdev->iftype == NL80211_IFTYPE_NAN ||
+           wdev->iftype == NL80211_IFTYPE_NAN_DATA) {
+               if (info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES])
+                       return -EINVAL;
+               if (wdev->iftype == NL80211_IFTYPE_NAN_DATA) {
+                       if (!info->attrs[NL80211_ATTR_NAN_NMI_MAC])
+                               return -EINVAL;
 
-       if (!info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES])
-               return -EINVAL;
+                       /* Only NMI stations receive the HT/VHT/HE capabilities */
+                       if (info->attrs[NL80211_ATTR_HT_CAPABILITY] ||
+                           info->attrs[NL80211_ATTR_VHT_CAPABILITY] ||
+                           info->attrs[NL80211_ATTR_HE_CAPABILITY])
+                               return -EINVAL;
+               }
+       } else {
+               if (!info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL])
+                       return -EINVAL;
 
-       if (!info->attrs[NL80211_ATTR_STA_AID] &&
-           !info->attrs[NL80211_ATTR_PEER_AID])
-               return -EINVAL;
+               if (!info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES])
+                       return -EINVAL;
+
+               if (!info->attrs[NL80211_ATTR_STA_AID] &&
+                   !info->attrs[NL80211_ATTR_PEER_AID])
+                       return -EINVAL;
+       }
 
        params.link_sta_params.link_id =
                nl80211_link_id_or_invalid(info->attrs);
@@ -8795,12 +8850,16 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
                mac_addr = nla_data(info->attrs[NL80211_ATTR_MAC]);
        }
 
-       params.link_sta_params.supported_rates =
-               nla_data(info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]);
-       params.link_sta_params.supported_rates_len =
-               nla_len(info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]);
-       params.listen_interval =
-               nla_get_u16(info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL]);
+       if (info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]) {
+               params.link_sta_params.supported_rates =
+                       nla_data(info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]);
+               params.link_sta_params.supported_rates_len =
+                       nla_len(info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]);
+       }
+
+       if (info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL])
+               params.listen_interval =
+                       nla_get_u16(info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL]);
 
        if (info->attrs[NL80211_ATTR_VLAN_ID])
                params.vlan_id = nla_get_u16(info->attrs[NL80211_ATTR_VLAN_ID]);
@@ -8819,7 +8878,7 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
 
        if (info->attrs[NL80211_ATTR_PEER_AID])
                params.aid = nla_get_u16(info->attrs[NL80211_ATTR_PEER_AID]);
-       else
+       else if (info->attrs[NL80211_ATTR_STA_AID])
                params.aid = nla_get_u16(info->attrs[NL80211_ATTR_STA_AID]);
 
        if (info->attrs[NL80211_ATTR_STA_CAPABILITY]) {
@@ -8940,6 +8999,16 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
                        return -EINVAL;
        }
 
+       if (wdev->iftype == NL80211_IFTYPE_NAN ||
+           wdev->iftype == NL80211_IFTYPE_NAN_DATA) {
+               if (params.sta_modify_mask & STATION_PARAM_APPLY_UAPSD)
+                       return -EINVAL;
+               /* NAN NMI station must be added in associated or authorized state */
+               if (!(params.sta_flags_set & (BIT(NL80211_STA_FLAG_ASSOCIATED) |
+                                             BIT(NL80211_STA_FLAG_AUTHENTICATED))))
+                       return -EINVAL;
+       }
+
        /* Ensure that HT/VHT capabilities are not set for 6 GHz HE STA */
        if (params.link_sta_params.he_6ghz_capa &&
            (params.link_sta_params.ht_capa || params.link_sta_params.vht_capa))
@@ -9032,6 +9101,11 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
                 */
                params.sta_flags_mask &= ~BIT(NL80211_STA_FLAG_AUTHORIZED);
                break;
+       case NL80211_IFTYPE_NAN:
+               break;
+       case NL80211_IFTYPE_NAN_DATA:
+               params.nmi_mac = nla_data(info->attrs[NL80211_ATTR_NAN_NMI_MAC]);
+               break;
        default:
                return -EOPNOTSUPP;
        }
@@ -9073,7 +9147,7 @@ static int nl80211_del_station(struct sk_buff *skb, struct genl_info *info)
 
        memset(&params, 0, sizeof(params));
 
-       if (!dev)
+       if (!dev && wdev->iftype != NL80211_IFTYPE_NAN)
                return -EINVAL;
 
        if (info->attrs[NL80211_ATTR_MAC])
@@ -9084,6 +9158,8 @@ static int nl80211_del_station(struct sk_buff *skb, struct genl_info *info)
        case NL80211_IFTYPE_AP_VLAN:
        case NL80211_IFTYPE_MESH_POINT:
        case NL80211_IFTYPE_P2P_GO:
+       case NL80211_IFTYPE_NAN:
+       case NL80211_IFTYPE_NAN_DATA:
                /* always accept these */
                break;
        case NL80211_IFTYPE_ADHOC: