2020-04-20 20:54:33

by Jouni Malinen

Subject: [RFC] mac80211: Process multicast RX registration for Public Action frames

Convert a user space registration for processing multicast frames
(NL80211_CMD_REGISTER_FRAME with NL80211_ATTR_RECEIVE_MULTICAST) to a
new enum ieee80211_filter_flags bit FIF_MCAST_PUBLIC_ACTION so that
drivers can update the RX filter parameters appropriately, if needed.

Signed-off-by: Jouni Malinen <[email protected]>
---
include/net/mac80211.h | 6 ++++++
net/mac80211/cfg.c | 10 +++++++---
net/mac80211/ieee80211_i.h | 1 +
net/mac80211/main.c | 3 +++
4 files changed, 17 insertions(+), 3 deletions(-)

This depends on the pending cfg80211 patch
[RFC PATCH] cfg80211: support multicast RX registration

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index f6dc5a38720f..b97569de7a52 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1620,6 +1620,8 @@ enum ieee80211_vif_flags {
* monitor interface (if that is requested.)
* @probe_req_reg: probe requests should be reported to mac80211 for this
* interface.
+ * @rx_multicast_reg: multicast Public Action frames should be reported to
+ * mac80211 for this interface.
* @drv_priv: data area for driver use, will always be aligned to
* sizeof(void \*).
* @txq: the multicast data TX queue (if driver uses the TXQ abstraction)
@@ -1648,6 +1650,7 @@ struct ieee80211_vif {
#endif

bool probe_req_reg;
+ bool rx_multicast_reg;

bool txqs_stopped[IEEE80211_NUM_ACS];

@@ -3091,6 +3094,8 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
* @FIF_PSPOLL: pass PS Poll frames
*
* @FIF_PROBE_REQ: pass probe request frames
+ *
+ * @FIF_MCAST_PUBLIC_ACTION: pass multicast Public Action frames
*/
enum ieee80211_filter_flags {
FIF_ALLMULTI = 1<<1,
@@ -3101,6 +3106,7 @@ enum ieee80211_filter_flags {
FIF_OTHER_BSS = 1<<6,
FIF_PSPOLL = 1<<7,
FIF_PROBE_REQ = 1<<8,
+ FIF_MCAST_PUBLIC_ACTION = 1<<9,
};

/**
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index e62b4764e82e..af8f420c2c6c 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -3409,12 +3409,16 @@ ieee80211_update_mgmt_frame_registrations(struct wiphy *wiphy,
bool global_change, intf_change;

global_change =
- local->probe_req_reg != !!(upd->global_stypes & preq_mask);
+ (local->probe_req_reg != !!(upd->global_stypes & preq_mask)) ||
+ (local->rx_multicast_reg != !!upd->global_mcast_stypes);
local->probe_req_reg = upd->global_stypes & preq_mask;
+ local->rx_multicast_reg = upd->global_mcast_stypes;

- intf_change = sdata->vif.probe_req_reg !=
- !!(upd->interface_stypes & preq_mask);
+ intf_change = (sdata->vif.probe_req_reg !=
+ !!(upd->interface_stypes & preq_mask)) ||
+ (sdata->vif.rx_multicast_reg != !!upd->interface_mcast_stypes);
sdata->vif.probe_req_reg = upd->interface_stypes & preq_mask;
+ sdata->vif.rx_multicast_reg = upd->interface_mcast_stypes;

if (!local->open_count)
return;
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index e3c8b1d9b1a1..9ef2c44bbcd0 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1170,6 +1170,7 @@ struct ieee80211_local {
int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
fif_probe_req;
bool probe_req_reg;
+ bool rx_multicast_reg;
unsigned int filter_flags; /* FIF_* */

bool wiphy_ciphers_allocated;
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 0e9ad60fb2b3..0bf5cfb37458 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -64,6 +64,9 @@ void ieee80211_configure_filter(struct ieee80211_local *local)
if (local->fif_pspoll)
new_flags |= FIF_PSPOLL;

+ if (local->rx_multicast_reg)
+ new_flags |= FIF_MCAST_PUBLIC_ACTION;
+
spin_lock_bh(&local->filter_lock);
changed_flags = local->filter_flags ^ new_flags;

--
2.20.1

2020-04-20 21:20:10

by Johannes Berg

Subject: Re: [RFC] mac80211: Process multicast RX registration for Public Action frames

On Mon, 2020-04-20 at 23:50 +0300, Jouni Malinen wrote:
>
> + * @rx_multicast_reg: multicast Public Action frames should be reported to
> + * mac80211 for this interface.

Since this is pretty specific ("multicast Public Action"), ...


> + local->rx_multicast_reg = upd->global_mcast_stypes;

Maybe that should be a bit more specific and select only action subtype?

I guess I'd kinda prefer to document action, not just public action too,
since that's the granularity we have in the API now? I mean, public
action may be all we need now, but ...

johannes