From: Eliad Peller <eliad@wizery.com>
To: Michal Kazior <michal.kazior@tieto.com>
Cc: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
Johannes Berg <johannes@sipsolutions.net>
Subject: Re: [RFC 13/21] mac80211: implement multi-vif in-place reservations
Date: Wed, 19 Mar 2014 20:35:00 +0200 [thread overview]
Message-ID: <CAB3XZEc3wqpEVg=qSDeuGAKCTh_dRV2HyQJBSHvfq5p0EEuAmg@mail.gmail.com> (raw)
In-Reply-To: <1395150804-24090-14-git-send-email-michal.kazior@tieto.com>
On Tue, Mar 18, 2014 at 3:53 PM, Michal Kazior <michal.kazior@tieto.com> wrote:
> Multi-vif in-place reservations happen when
> it's impossible to allocate more chanctx as per
> driver combinations.
>
> Such reservations aren't finalized until last
> reservation interface calls in to use the
> reservation.
>
> This introduces a special hook
> ieee80211_vif_chanctx_reservation_complete(). This
> is currently an empty stub and will be filled in
> by AP/STA CSA code. This is required to implement
> 2-step CSA finalization.
>
> This also gets rid of driver requirement to be
> able to re-program channel of a chanctx.
>
> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
> ---
[...]
i started playing with the patches and got some warnings.
they seem to come from:
> +static int
> +ieee80211_vif_use_reserved_incompat(struct ieee80211_local *local,
> + struct ieee80211_chanctx *ctx,
> + const struct cfg80211_chan_def *chandef)
> +{
[...]
> + new_ctx = ieee80211_alloc_chanctx(local, chandef, ctx->mode);
> + if (!new_ctx) {
> + err = -ENOMEM;
> + goto err;
> }
>
> - old_ctx = container_of(conf, struct ieee80211_chanctx, conf);
> + list_for_each_entry(sdata, &ctx->reserved_vifs, reserved_chanctx_list) {
> + drv_unassign_vif_chanctx(local, sdata, ctx);
> + rcu_assign_pointer(sdata->vif.chanctx_conf, &new_ctx->conf);
> + }
>
> - if (sdata->vif.bss_conf.chandef.width != sdata->reserved_chandef.width)
> - tmp_changed |= BSS_CHANGED_BANDWIDTH;
> + list_del_rcu(&ctx->list);
> + ieee80211_del_chanctx(local, ctx);
>
> - sdata->vif.bss_conf.chandef = sdata->reserved_chandef;
> + err = ieee80211_add_chanctx(local, new_ctx);
> + if (err)
> + goto err_revert;
>
> - /* unref our reservation */
> - sdata->reserved_chanctx = NULL;
> - sdata->radar_required = sdata->reserved_radar_required;
> - list_del(&sdata->reserved_chanctx_list);
> + /* don't simply overwrite radar_required in case of failure */
> + list_for_each_entry(sdata, &ctx->reserved_vifs, reserved_chanctx_list) {
> + bool tmp = sdata->radar_required;
> + sdata->radar_required = sdata->reserved_radar_required;
> + sdata->reserved_radar_required = tmp;
> + }
>
> - if (old_ctx == ctx) {
> - /* This is our own context, just change it */
> - ret = __ieee80211_vif_change_channel(sdata, old_ctx,
> - &tmp_changed);
> - if (ret)
> - goto out;
> - } else {
> - ret = ieee80211_assign_vif_chanctx(sdata, ctx);
> - if (ieee80211_chanctx_refcount(local, old_ctx) == 0)
> - ieee80211_free_chanctx(local, old_ctx);
> - if (ret) {
> - /* if assign fails refcount stays the same */
> - if (ieee80211_chanctx_refcount(local, ctx) == 0)
> - ieee80211_free_chanctx(local, ctx);
> - goto out;
> - }
> + list_for_each_entry(sdata, &ctx->reserved_vifs, reserved_chanctx_list) {
> + err = drv_assign_vif_chanctx(local, sdata, ctx);
this should be new_ctx (ctx was already removed from the driver, etc.)
> + if (err)
> + goto err_unassign;
> + }
>
> + if (sdata->vif.type == NL80211_IFTYPE_AP)
> __ieee80211_vif_copy_chanctx_to_vlans(sdata, false);
> - }
>
> - *changed = tmp_changed;
> + list_add_rcu(&new_ctx->list, &local->chanctx_list);
> + kfree_rcu(ctx, rcu_head);
>
> ieee80211_recalc_chanctx_chantype(local, ctx);
> ieee80211_recalc_smps_chanctx(local, ctx);
> ieee80211_recalc_radar_chanctx(local, ctx);
> ieee80211_recalc_chanctx_min_def(local, ctx);
and same here i guess.
all the recalcs have to be moved after setting bss_conf.chandef in the
following loop, as otherwise you it recalcs according to the old
configuration (which is incompatible with the new one).
after these changes the warnings were gone.
i haven't done throughout testing, though.
Eliad.
next prev parent reply other threads:[~2014-03-19 18:35 UTC|newest]
Thread overview: 199+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-18 13:53 [RFC 00/21] cfg80211/mac80211: multi-vif csa Michal Kazior
2014-03-18 13:53 ` [RFC 01/21] mac80211: add support for radar detection for reservations Michal Kazior
2014-03-18 13:53 ` [RFC 02/21] cfg80211: allow drivers to iterate over matching combinations Michal Kazior
2014-03-18 13:53 ` [RFC 03/21] mac80211: add max channel calculation utility function Michal Kazior
2014-03-18 16:17 ` Eliad Peller
2014-03-19 8:32 ` Michal Kazior
2014-03-19 8:43 ` Eliad Peller
2014-03-19 8:54 ` Michal Kazior
2014-03-19 10:18 ` Eliad Peller
2014-03-18 13:53 ` [RFC 04/21] mac80211: prevent chanctx overcommit Michal Kazior
2014-03-18 16:25 ` Eliad Peller
2014-03-18 13:53 ` [RFC 05/21] mac80211: track assigned vifs in chanctx Michal Kazior
2014-03-18 13:53 ` [RFC 06/21] mac80211: track reserved " Michal Kazior
2014-03-18 13:53 ` [RFC 07/21] mac80211: improve find_chanctx() for reservations Michal Kazior
2014-03-18 16:42 ` Eliad Peller
2014-03-19 8:34 ` Michal Kazior
2014-03-19 8:47 ` Eliad Peller
2014-03-19 9:00 ` Michal Kazior
2014-03-19 10:53 ` Eliad Peller
2014-03-18 13:53 ` [RFC 08/21] mac80211: improve chanctx reservation lookup Michal Kazior
2014-03-18 16:57 ` Eliad Peller
2014-03-19 8:45 ` Michal Kazior
2014-03-18 13:53 ` [RFC 09/21] mac80211: split ieee80211_new_chanctx() Michal Kazior
2014-03-18 13:53 ` [RFC 10/21] mac80211: split ieee80211_free_chanctx() Michal Kazior
2014-03-18 13:53 ` [RFC 11/21] mac80211: fix racy usage of chanctx->refcount Michal Kazior
2014-03-18 13:53 ` [RFC 12/21] mac80211: compute chanctx refcount on-the-fly Michal Kazior
2014-03-18 13:53 ` [RFC 13/21] mac80211: implement multi-vif in-place reservations Michal Kazior
2014-03-19 18:35 ` Eliad Peller [this message]
2014-03-20 7:25 ` Michal Kazior
2014-03-18 13:53 ` [RFC 14/21] mac80211: fix CSA tx queue locking Michal Kazior
2014-03-18 13:53 ` [RFC 15/21] mac80211: split CSA finalize function Michal Kazior
2014-03-18 13:53 ` [RFC 16/21] mac80211: make check_combinations() aware of chanctx reservation Michal Kazior
2014-03-18 13:53 ` [RFC 17/21] mac80211: use chanctx reservation for AP CSA Michal Kazior
2014-03-18 13:53 ` [RFC 18/21] mac80211: use chanctx reservation for STA CSA Michal Kazior
2014-03-18 13:53 ` [RFC 19/21] mac80211: ignore cqm during csa Michal Kazior
2014-03-18 13:53 ` [RFC 20/21] mac80211: remove old unused channel switching code Michal Kazior
2014-03-18 13:53 ` [RFC 21/21] cfg80211: remove channel_switch combination check Michal Kazior
2014-03-18 15:52 ` [RFC 00/21] cfg80211/mac80211: multi-vif csa Eliad Peller
2014-03-19 9:34 ` Luca Coelho
2014-03-21 13:47 ` [PATCH v2 00/13] cfg80211/mac80211: implement multi-vif chanctx reservations Michal Kazior
2014-03-21 13:47 ` [PATCH v2 01/13] cfg80211: allow drivers to iterate over matching combinations Michal Kazior
2014-03-28 13:05 ` Johannes Berg
2014-03-28 13:21 ` Michal Kazior
2014-03-28 13:22 ` Johannes Berg
2014-03-28 13:42 ` Michal Kazior
2014-03-28 13:49 ` Johannes Berg
2014-03-21 13:47 ` [PATCH v2 02/13] mac80211: add max channel calculation utility function Michal Kazior
2014-03-21 13:47 ` [PATCH v2 03/13] mac80211: prevent chanctx overcommit Michal Kazior
2014-03-25 7:59 ` Luca Coelho
2014-03-25 8:13 ` Luca Coelho
2014-03-25 8:37 ` Michal Kazior
2014-03-25 9:45 ` Luca Coelho
2014-03-21 13:47 ` [PATCH v2 04/13] mac80211: add support for radar detection for reservations Michal Kazior
2014-03-21 13:47 ` [PATCH v2 05/13] mac80211: track assigned vifs in chanctx Michal Kazior
2014-03-28 13:06 ` Johannes Berg
2014-03-21 13:47 ` [PATCH v2 06/13] mac80211: track reserved " Michal Kazior
2014-03-28 13:07 ` Johannes Berg
2014-03-21 13:47 ` [PATCH v2 07/13] mac80211: improve find_chanctx() for reservations Michal Kazior
2014-03-28 13:08 ` Johannes Berg
2014-03-28 13:32 ` Michal Kazior
2014-03-21 13:47 ` [PATCH v2 08/13] mac80211: improve chanctx reservation lookup Michal Kazior
2014-03-21 13:47 ` [PATCH v2 09/13] mac80211: split ieee80211_new_chanctx() Michal Kazior
2014-03-21 13:47 ` [PATCH v2 10/13] mac80211: split ieee80211_free_chanctx() Michal Kazior
2014-03-21 13:47 ` [PATCH v2 11/13] mac80211: fix racy usage of chanctx->refcount Michal Kazior
2014-03-21 13:47 ` [PATCH v2 12/13] mac80211: compute chanctx refcount on-the-fly Michal Kazior
2014-03-28 13:11 ` Johannes Berg
2014-03-28 13:22 ` Michal Kazior
2014-03-28 13:25 ` Johannes Berg
2014-03-21 13:47 ` [PATCH v2 13/13] mac80211: implement multi-vif in-place reservations Michal Kazior
2014-03-31 10:39 ` [PATCH v3 00/13] cfg80211/mac80211: implement multi-vif chanctx reservations Michal Kazior
2014-03-31 10:39 ` [PATCH v3 01/13] cfg80211: allow drivers to iterate over matching combinations Michal Kazior
2014-03-31 10:39 ` [PATCH v3 02/13] mac80211: add max channel calculation utility function Michal Kazior
2014-04-08 13:23 ` Johannes Berg
2014-03-31 10:39 ` [PATCH v3 03/13] mac80211: prevent chanctx overcommit Michal Kazior
2014-03-31 10:39 ` [PATCH v3 04/13] mac80211: add support for radar detection for reservations Michal Kazior
2014-04-08 13:25 ` Johannes Berg
2014-04-09 7:05 ` Michal Kazior
2014-03-31 10:39 ` [PATCH v3 05/13] mac80211: track assigned vifs in chanctx Michal Kazior
2014-03-31 10:39 ` [PATCH v3 06/13] mac80211: track reserved " Michal Kazior
2014-03-31 10:39 ` [PATCH v3 07/13] mac80211: improve find_chanctx() for reservations Michal Kazior
2014-03-31 10:39 ` [PATCH v3 08/13] mac80211: improve chanctx reservation lookup Michal Kazior
2014-03-31 10:39 ` [PATCH v3 09/13] mac80211: split ieee80211_new_chanctx() Michal Kazior
2014-03-31 10:39 ` [PATCH v3 10/13] mac80211: split ieee80211_free_chanctx() Michal Kazior
2014-03-31 10:39 ` [PATCH v3 11/13] mac80211: fix racy usage of chanctx->refcount Michal Kazior
2014-03-31 10:39 ` [PATCH v3 12/13] mac80211: compute chanctx refcount on-the-fly Michal Kazior
2014-03-31 10:39 ` [PATCH v3 13/13] mac80211: implement multi-vif in-place reservations Michal Kazior
2014-03-31 16:15 ` Eliad Peller
2014-04-01 5:10 ` Michal Kazior
2014-04-01 7:46 ` Eliad Peller
2014-04-01 7:54 ` Michal Kazior
2014-04-01 8:10 ` Eliad Peller
2014-04-01 8:26 ` Michal Kazior
2014-04-08 13:30 ` [PATCH v3 00/13] cfg80211/mac80211: implement multi-vif chanctx reservations Johannes Berg
2014-04-08 14:00 ` Luca Coelho
2014-04-09 7:07 ` Michal Kazior
2014-04-09 13:29 ` [PATCH v4 " Michal Kazior
2014-04-09 13:29 ` [PATCH v4 01/13] cfg80211: allow drivers to iterate over matching combinations Michal Kazior
2014-04-09 13:29 ` [PATCH v4 02/13] mac80211: add max channel calculation utility function Michal Kazior
2014-04-09 13:29 ` [PATCH v4 03/13] mac80211: prevent chanctx overcommit Michal Kazior
2014-04-09 13:29 ` [PATCH v4 04/13] mac80211: add support for radar detection for reservations Michal Kazior
2014-04-09 13:29 ` [PATCH v4 05/13] mac80211: track assigned vifs in chanctx Michal Kazior
2014-04-09 13:29 ` [PATCH v4 06/13] mac80211: track reserved " Michal Kazior
2014-04-09 13:29 ` [PATCH v4 07/13] mac80211: improve find_chanctx() for reservations Michal Kazior
2014-04-09 13:29 ` [PATCH v4 08/13] mac80211: improve chanctx reservation lookup Michal Kazior
2014-04-09 13:29 ` [PATCH v4 09/13] mac80211: split ieee80211_new_chanctx() Michal Kazior
2014-04-09 13:29 ` [PATCH v4 10/13] mac80211: split ieee80211_free_chanctx() Michal Kazior
2014-04-09 13:29 ` [PATCH v4 11/13] mac80211: fix racy usage of chanctx->refcount Michal Kazior
2014-04-09 13:29 ` [PATCH v4 12/13] mac80211: compute chanctx refcount on-the-fly Michal Kazior
2014-04-09 13:29 ` [PATCH v4 13/13] mac80211: implement multi-vif in-place reservations Michal Kazior
2014-04-28 16:32 ` [v4 " Zhao, Gang
2014-04-29 6:10 ` Michal Kazior
2014-04-29 19:44 ` Johannes Berg
2014-04-30 9:21 ` [PATCH v5] " Michal Kazior
2014-05-06 10:41 ` Johannes Berg
2014-05-06 12:47 ` Michal Kazior
2014-05-06 14:05 ` Johannes Berg
2014-05-07 6:05 ` Michal Kazior
2014-05-07 8:07 ` Johannes Berg
2014-05-07 8:51 ` Michal Kazior
2014-05-07 9:41 ` Luca Coelho
2014-05-07 9:40 ` Luca Coelho
2014-05-07 10:02 ` Michal Kazior
2014-05-07 10:16 ` Luca Coelho
2014-05-07 10:38 ` Michal Kazior
2014-05-07 11:09 ` Johannes Berg
2014-05-07 11:19 ` Michal Kazior
2014-05-07 11:54 ` Johannes Berg
2014-05-07 12:08 ` Luca Coelho
2014-05-07 12:13 ` Johannes Berg
2014-05-07 12:20 ` Luca Coelho
2014-05-07 12:38 ` Johannes Berg
2014-05-07 12:44 ` Michal Kazior
2014-05-07 12:53 ` Johannes Berg
2014-05-07 13:03 ` Michal Kazior
2014-05-08 10:06 ` Johannes Berg
2014-05-08 10:41 ` Michal Kazior
2014-05-13 13:42 ` Johannes Berg
2014-05-13 13:56 ` Michal Kazior
2014-05-13 15:53 ` Johannes Berg
2014-05-14 5:14 ` Michal Kazior
2014-05-14 8:25 ` Johannes Berg
2014-05-14 8:51 ` Michal Kazior
2014-05-08 10:08 ` Johannes Berg
2014-05-07 12:53 ` Luca Coelho
2014-05-07 13:06 ` Johannes Berg
2014-05-07 13:10 ` Luca Coelho
2014-05-08 10:03 ` Johannes Berg
2014-05-07 12:27 ` Michal Kazior
2014-05-07 12:36 ` Johannes Berg
2014-05-07 12:20 ` Michal Kazior
2014-05-07 12:34 ` Johannes Berg
2014-05-07 11:48 ` Luca Coelho
2014-05-07 9:27 ` Luca Coelho
2014-05-07 11:09 ` Johannes Berg
2014-05-07 11:24 ` Luca Coelho
2014-04-25 15:20 ` [PATCH v4 00/13] cfg80211/mac80211: implement multi-vif chanctx reservations Johannes Berg
2014-04-28 6:16 ` Michal Kazior
2014-03-21 13:52 ` [PATCH v2 0/7] cfg80211/mac80211: implement multi-vif csa Michal Kazior
2014-03-21 13:52 ` [PATCH v2 1/7] cfg80211: fix radar_detect combination checking Michal Kazior
2014-03-28 12:59 ` Johannes Berg
2014-03-21 13:52 ` [PATCH v2 2/7] mac80211: make check_combinations() aware of chanctx reservation Michal Kazior
2014-03-28 13:00 ` Johannes Berg
2014-03-21 13:52 ` [PATCH v2 3/7] mac80211: use chanctx reservation for AP CSA Michal Kazior
2014-03-28 13:01 ` Johannes Berg
2014-03-21 13:52 ` [PATCH v2 4/7] mac80211: use chanctx reservation for STA CSA Michal Kazior
2014-03-21 13:52 ` [PATCH v2 5/7] mac80211: ignore cqm during csa Michal Kazior
2014-03-21 13:52 ` [PATCH v2 6/7] mac80211: remove old unused channel switching code Michal Kazior
2014-03-28 13:03 ` Johannes Berg
2014-03-21 13:52 ` [PATCH v2 7/7] cfg80211: remove channel_switch combination check Michal Kazior
2014-03-31 12:04 ` [PATCH v3 0/5] cfg80211/mac80211: implement multi-vif csa Michal Kazior
2014-03-31 12:04 ` [PATCH v3 1/5] mac80211: make check_combinations() aware of chanctx reservation Michal Kazior
2014-03-31 12:04 ` [PATCH v3 2/5] mac80211: use chanctx reservation for AP CSA Michal Kazior
2014-03-31 13:12 ` Michal Kazior
2014-03-31 12:04 ` [PATCH v3 3/5] mac80211: use chanctx reservation for STA CSA Michal Kazior
2014-03-31 12:04 ` [PATCH v3 4/5] mac80211: ignore cqm during csa Michal Kazior
2014-03-31 12:04 ` [PATCH v3 5/5] cfg80211: remove channel_switch combination check Michal Kazior
2014-04-09 13:45 ` [PATCH v4 0/5] cfg80211/mac80211: implement multi-vif csa Michal Kazior
2014-04-09 13:45 ` [PATCH v4 1/5] mac80211: make check_combinations() aware of chanctx reservation Michal Kazior
2014-04-09 13:45 ` [PATCH v4 2/5] mac80211: use chanctx reservation for AP CSA Michal Kazior
2014-05-06 14:42 ` Johannes Berg
2014-05-07 7:25 ` Michal Kazior
2014-05-07 8:05 ` Johannes Berg
2014-05-07 9:05 ` Michal Kazior
2014-05-07 9:06 ` Michal Kazior
2014-05-07 9:07 ` Johannes Berg
2014-05-07 9:41 ` Michal Kazior
2014-05-07 11:17 ` Johannes Berg
2014-05-07 11:43 ` Michal Kazior
2014-05-07 11:50 ` Johannes Berg
2014-05-07 12:12 ` Michal Kazior
2014-04-09 13:45 ` [PATCH v4 3/5] mac80211: use chanctx reservation for STA CSA Michal Kazior
2014-05-06 14:43 ` Johannes Berg
2014-05-07 7:35 ` Michal Kazior
2014-05-07 8:03 ` Johannes Berg
2014-04-09 13:45 ` [PATCH v4 4/5] mac80211: ignore cqm during csa Michal Kazior
2014-05-06 14:45 ` Johannes Berg
2014-04-09 13:45 ` [PATCH v4 5/5] cfg80211: remove channel_switch combination check Michal Kazior
2014-05-06 14:45 ` Johannes Berg
2014-05-07 7:40 ` Michal Kazior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAB3XZEc3wqpEVg=qSDeuGAKCTh_dRV2HyQJBSHvfq5p0EEuAmg@mail.gmail.com' \
--to=eliad@wizery.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=michal.kazior@tieto.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).