wifi: mac80211: add wiphy radio assignment and validation

Validate number of channels and interface combinations per radio.
Assign each channel context to a radio.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://patch.msgid.link/1d3e9ba70a30ce18aaff337f0a76d7aeb311bafb.1720514221.git-series.nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 9aa3b9e2522817844f9070d4b3c06967d889e602..e8567723e94d5eee887212695c8b07262d00e7ab 100644 (file)
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -714,14 +714,15 @@ static struct ieee80211_chanctx *
 ieee80211_new_chanctx(struct ieee80211_local *local,
                      const struct ieee80211_chan_req *chanreq,
                      enum ieee80211_chanctx_mode mode,
-                     bool assign_on_failure)
+                     bool assign_on_failure,
+                     int radio_idx)
 {
        struct ieee80211_chanctx *ctx;
        int err;
 
        lockdep_assert_wiphy(local->hw.wiphy);
 
-       ctx = ieee80211_alloc_chanctx(local, chanreq, mode, -1);
+       ctx = ieee80211_alloc_chanctx(local, chanreq, mode, radio_idx);
        if (!ctx)
                return ERR_PTR(-ENOMEM);
 
@@ -1096,6 +1097,8 @@ ieee80211_replace_chanctx(struct ieee80211_local *local,
                          struct ieee80211_chanctx *curr_ctx)
 {
        struct ieee80211_chanctx *new_ctx, *ctx;
+       struct wiphy *wiphy = local->hw.wiphy;
+       const struct wiphy_radio *radio;
 
        if (!curr_ctx || (curr_ctx->replace_state ==
                          IEEE80211_CHANCTX_WILL_BE_REPLACED) ||
@@ -1125,6 +1128,12 @@ ieee80211_replace_chanctx(struct ieee80211_local *local,
                        if (!list_empty(&ctx->reserved_links))
                                continue;
 
+                       if (ctx->conf.radio_idx >= 0) {
+                               radio = &wiphy->radio[ctx->conf.radio_idx];
+                               if (!cfg80211_radio_chandef_valid(radio, &chanreq->oper))
+                                       continue;
+                       }
+
                        curr_ctx = ctx;
                        break;
                }
@@ -1154,6 +1163,34 @@ ieee80211_replace_chanctx(struct ieee80211_local *local,
        return new_ctx;
 }
 
+static bool
+ieee80211_find_available_radio(struct ieee80211_local *local,
+                              const struct ieee80211_chan_req *chanreq,
+                              int *radio_idx)
+{
+       struct wiphy *wiphy = local->hw.wiphy;
+       const struct wiphy_radio *radio;
+       int i;
+
+       *radio_idx = -1;
+       if (!wiphy->n_radio)
+               return true;
+
+       for (i = 0; i < wiphy->n_radio; i++) {
+               radio = &wiphy->radio[i];
+               if (!cfg80211_radio_chandef_valid(radio, &chanreq->oper))
+                       continue;
+
+               if (!ieee80211_can_create_new_chanctx(local, i))
+                       continue;
+
+               *radio_idx = i;
+               return true;
+       }
+
+       return false;
+}
+
 int ieee80211_link_reserve_chanctx(struct ieee80211_link_data *link,
                                   const struct ieee80211_chan_req *chanreq,
                                   enum ieee80211_chanctx_mode mode,
@@ -1162,6 +1199,7 @@ int ieee80211_link_reserve_chanctx(struct ieee80211_link_data *link,
        struct ieee80211_sub_if_data *sdata = link->sdata;
        struct ieee80211_local *local = sdata->local;
        struct ieee80211_chanctx *new_ctx, *curr_ctx;
+       int radio_idx;
 
        lockdep_assert_wiphy(local->hw.wiphy);
 
@@ -1171,9 +1209,10 @@ int ieee80211_link_reserve_chanctx(struct ieee80211_link_data *link,
 
        new_ctx = ieee80211_find_reservation_chanctx(local, chanreq, mode);
        if (!new_ctx) {
-               if (ieee80211_can_create_new_chanctx(local, -1))
+               if (ieee80211_can_create_new_chanctx(local, -1) &&
+                   ieee80211_find_available_radio(local, chanreq, &radio_idx))
                        new_ctx = ieee80211_new_chanctx(local, chanreq, mode,
-                                                       false);
+                                                       false, radio_idx);
                else
                        new_ctx = ieee80211_replace_chanctx(local, chanreq,
                                                            mode, curr_ctx);
@@ -1810,6 +1849,7 @@ int _ieee80211_link_use_channel(struct ieee80211_link_data *link,
        struct ieee80211_chanctx *ctx;
        u8 radar_detect_width = 0;
        bool reserved = false;
+       int radio_idx;
        int ret;
 
        lockdep_assert_wiphy(local->hw.wiphy);
@@ -1840,9 +1880,11 @@ int _ieee80211_link_use_channel(struct ieee80211_link_data *link,
        /* Note: context is now reserved */
        if (ctx)
                reserved = true;
+       else if (!ieee80211_find_available_radio(local, chanreq, &radio_idx))
+               ctx = ERR_PTR(-EBUSY);
        else
                ctx = ieee80211_new_chanctx(local, chanreq, mode,
-                                           assign_on_failure);
+                                           assign_on_failure, radio_idx);
        if (IS_ERR(ctx)) {
                ret = PTR_ERR(ctx);
                goto out;