mac80211 / o11s mesh: Modularize Path Selection Protocol

net/mac80211/Kconfig +9 -0

+	  The implementation is based on Draft 1.08 of the Mesh Networking
+	  amendment. For more information visit http://o11s.org/.
 
+	  Includes the HWMP Mesh path selection protocol, as that
+	  is a requirement of the (Draft) standard.
+
+config MAC80211_MESH_PP_TEST
+	tristate "80211s: Path selection protocol test module"
+	default n
+	depends on MAC80211_MESH && MAC80211 && EXPERIMENTAL && m

+++ b/include/net/cfg80211.h

include/net/cfg80211.h +4 -0

@@ -458,6 +458,10 @@ struct mesh_config {
 	u32 dot11MeshHWMPactivePathTimeout;
 	u16 dot11MeshHWMPpreqMinInterval;
 	u16 dot11MeshHWMPnetDiameterTraversalTime;
+	/* Mesh IDs */
+	u32 mesh_path_selection_protocol_id;
+	u32 mesh_path_selection_metric_id;
+	u32 mesh_congestion_control_mode_id;

net/mac80211/cfg.c +9 -0

+	if (_chg_mesh_attr(NL80211_MESHCONF_PATH_SELECTION_PROTOCOL_ID, mask))
+		mesh_ids_set_pp(&sdata->u.mesh,
+		nconf->mesh_path_selection_protocol_id);
+	if (_chg_mesh_attr(NL80211_MESHCONF_PATH_SELECTION_METRIC_ID, mask))
+		conf->mesh_path_selection_metric_id =
+			nconf->mesh_path_selection_metric_id;
+	if (_chg_mesh_attr(NL80211_MESHCONF_CONGESTION_CONTROL_MODE_ID, mask))
+		conf->mesh_congestion_control_mode_id =
+			nconf->mesh_congestion_control_mode_id;

net/wireless/nl80211.c +9 -0

+	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, mesh_path_selection_protocol_id,
+			mask, NL80211_MESHCONF_PATH_SELECTION_PROTOCOL_ID,
+			nla_get_u32);
+	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, mesh_path_selection_metric_id,
+			mask, NL80211_MESHCONF_PATH_SELECTION_METRIC_ID,
+			nla_get_u32);
+	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, mesh_congestion_control_mode_id,
+			mask, NL80211_MESHCONF_CONGESTION_CONTROL_MODE_ID,
+			nla_get_u32);

net/mac80211/mesh.c +2 -0

 	rm_cache = kmem_cache_create("mesh_rmc", sizeof(struct rmc_entry),
 				     0, 0, NULL);
+	if (!(ieee80211_mesh_path_sel_proto_find(0x000FACFF)))
+		ieee80211_mesh_path_sel_proto_register(&mesh_path_sel_hwmp);

net/mac80211/mesh.c +9 -0

+struct mesh_path_sel_proto *ieee80211_mesh_path_sel_proto_find(u32 id)
+{
+	struct mesh_path_sel_proto *a;
+	list_for_each_entry(a, &mesh_path_sel_proto_list, list) {
+		if (a->id == id)
+			return a;
+	}
+	return NULL;
+}

net/mac80211/mesh.c +10 -0

+			sta->mesh_pp = algo;
+			/* used to compare meshes (see mesh_matches_local) */
+			memcpy(sta->mesh_pp_id, &(algo->id), 4);
+			/* used by the nl80211 layer */
+			sta->mshcfg.mesh_path_selection_protocol_id = algo->id;
+
+			printk(KERN_INFO "o11s: Initial mesh path selection "
+				"algorithm %s / %08X\n", algo->name, algo->id);
+			return;
+		}

net/mac80211/mesh.c +10 -0

+void ieee80211_mesh_path_sel_proto_register(struct mesh_path_sel_proto *algo)
+{
+	/* Sanity checks */
+	BUG_ON(!algo->ops->path_start_discovery);
+	BUG_ON(!algo->ops->nexthop_lookup);
+	BUG_ON(!algo->ops->path_error_tx);
+	BUG_ON(!algo->ops->queue_preq);
+	BUG_ON(!algo->ops->rx_path_sel_frame);
+	BUG_ON(!algo->ops->path_sel_start);
+	BUG_ON(!algo->ops->path_sel_stop);

net/mac80211/mesh.c +12 -0

+	spin_lock(&path_sel_list_lock);
+	if (!ieee80211_mesh_path_sel_proto_find(algo->id)) {
+		list_add_tail(&algo->list, &mesh_path_sel_proto_list);
+		spin_unlock(&path_sel_list_lock);
+		printk(KERN_INFO "o11s: Mesh path selection algorithm %s / "
+			"%08X registered\n", algo->name, algo->id);
+	} else {
+		spin_unlock(&path_sel_list_lock);
+		printk(KERN_WARNING "o11s: Error: Path selection algorithm "
+			"%s / %08X already registered\n", algo->name,
+			algo->id);
+	}

net/mac80211/mesh.c +11 -0

+void ieee80211_mesh_path_sel_proto_unregister(struct mesh_path_sel_proto *algo)
+{
+	if (ieee80211_mesh_path_sel_proto_find(algo->id)) {
+		list_del(&algo->list);
+		printk(KERN_INFO "o11s: Mesh path selection algorithm %s / "
+			"%08X unregistered\n", algo->name, algo->id);
+	} else {
+		printk(KERN_WARNING "o11s: Error: Mesh path selection algorithm"
+			" %s / %08X not found\n", algo->name, algo->id);
+	}
+}

net/mac80211/mesh.c +13 -0

+void mesh_ids_set_pp(struct ieee80211_if_mesh *sta, u32 pp)
+{
+	struct mesh_path_sel_proto *nalgo =
+		ieee80211_mesh_path_sel_proto_find(pp);
+
+	if (nalgo)
+		ieee80211_mesh_path_sel_proto_set(sta, nalgo);
+	else
+		printk(KERN_WARNING "o11s: Could not find mesh path selection "
+			"protocol with ID %08X\n", pp);
+}
+/* Set path selection metric ID: OUI followed by arbitrary 2 bytes */
+void mesh_ids_set_pm(struct ieee80211_if_mesh *sta, u32 pm)

net/mac80211/mesh.c +8 -0

+{
+	memcpy(sta->mesh_pm_id, &pm, 4);
+}
+/* Set congestion control mode ID: OUI followed by arbitrary 2 bytes */
+void mesh_ids_set_cc(struct ieee80211_if_mesh *sta, u32 cc)
+{
+	memcpy(sta->mesh_cc_id, &cc, 4);
+}

net/mac80211/mesh.c +2 -0

@@ -444,6 +551,16 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)
 	queue_work(local->hw.workqueue, &ifmsh->work);
 	ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON |
 				   IEEE80211_IFCC_BEACON_ENABLED);
+
+	/* If no PS protocol has manually been set, go with the default */

net/mac80211/mesh.c +8 -0

+	if (!ifmsh->mesh_pp)
+		ifmsh->mesh_pp = ieee80211_mesh_path_sel_proto_find
+			(0x000FACFF);
+	/* If we still have no PS Proto, bail out */
+	if (!ifmsh->mesh_pp) {
+		printk(KERN_WARNING "o11s: Could not load HWMP, aborting\n");
+		ieee80211_stop_mesh(sdata);
+	}
 }

net/mac80211/mesh.c +2 -1

 void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)

@@ -523,7 +640,8 @@ static void ieee80211_mesh_rx_mgmt_action(struct ieee80211_sub_if_data *sdata,
 		mesh_rx_plink_frame(sdata, mgmt, len, rx_status);
 		break;
 	case MESH_PATH_SEL_CATEGORY:
-		mesh_rx_path_sel_frame(sdata, mgmt, len);
+		sdata->u.mesh.mesh_pp->ops->
+			rx_path_sel_frame(sdata, mgmt, len);

net/mac80211/mesh.c +1 -1

-		mesh_path_start_discovery(sdata);
+		ifmsh->mesh_pp->ops->path_start_discovery(sdata);

net/mac80211/mesh.h +5 -0

@@ -169,6 +169,57 @@ struct mesh_rmc {
  */
 #define MESH_PREQ_MIN_INT	10
 #define MESH_DIAM_TRAVERSAL_TIME 50
+
+/* Default Path Selection, Path Metric, Congestion Control Mode */
+#define MESH_PATH_SELECTION_PROTOCOL_ID 0x000FACFF
+#define MESH_PATH_SELECTION_METRIC_ID 0x000FACFF
+#define MESH_CONGESTION_CONTROL_MODE_ID 0x000FACFF

net/mac80211/mesh.h +2 -0

+/**
+  * struct mesh_path_sel_ops - Mesh Path Selection Protocol function pointers

net/mac80211/mesh.h +2 -0

+  * This resembles the main part of the mesh path selection protocol
+  * abstracion layer. Every new PS protocol has to define every member.

net/mac80211/mesh.h +12 -0

+struct mesh_path_sel_ops {
+	void (*path_start_discovery) (struct ieee80211_sub_if_data *sdata);
+	int (*nexthop_lookup) (struct sk_buff *skb,
+		struct ieee80211_sub_if_data *sdata);
+	void (*queue_preq) (struct mesh_path *mpath, u8 flags);
+	int (*path_error_tx) (u8 *dst, __le32 dst_dsn, u8 *ra,
+		struct ieee80211_sub_if_data *sdata);
+	void (*rx_path_sel_frame) (struct ieee80211_sub_if_data *sdata,
+		struct ieee80211_mgmt *mgmt, size_t len);
+	void (*path_sel_start) (struct ieee80211_if_mesh *sta);
+	void (*path_sel_stop) (struct ieee80211_if_mesh *sta);
+};

net/mac80211/mesh.h +8 -0

+#define MESH_ALGO_NAME_MAX    (16)
+struct mesh_path_sel_proto {
+	struct list_head list;
+	char name[MESH_ALGO_NAME_MAX];
+	u32 id;
+	struct mesh_path_sel_ops *ops;
+	struct module *owner;
+};

net/mac80211/mesh.h +1 -0

 #ifdef CONFIG_MAC80211_MESH
 extern int mesh_allocated;
+extern struct mesh_path_sel_proto mesh_path_sel_hwmp;

net/mac80211/mesh_hwmp.c +1 -0

+struct mesh_path_sel_proto mesh_path_sel_hwmp;

net/mac80211/mesh_hwmp.c +1 -1

-int mesh_nexthop_lookup(struct sk_buff *skb,
+static int mesh_nexthop_lookup(struct sk_buff *skb,
 			struct ieee80211_sub_if_data *sdata)

net/mac80211/mesh_pathtbl.c +1 -1

index 3c72557..f8a795f 100644
@@ -26,7 +26,7 @@
 				time_after(jiffies, mpath->exp_time) && \
 				!(mpath->flags & MESH_PATH_FIXED))
 
-struct mpath_node {
+		struct mpath_node {

net/mac80211/mesh_pathtbl.c +10 -0

+		mpath->flags = 0;
+		mpath->exp_time = jiffies;
+		mesh_path_flush_pending(mpath);
+	}
+
+	spin_unlock_bh(&mpath->state_lock);
+endmpathtimer:
+	rcu_read_unlock();
+}
+EXPORT_SYMBOL(mesh_path_timer);

net/mac80211/sta_info.c +1 -0

@@ -105,6 +105,7 @@ struct sta_info *sta_info_get(struct ieee80211_local *local, const u8 *addr)
 	}
 	return sta;
 }
+EXPORT_SYMBOL(sta_info_get);

net/mac80211/sta_info.c +4 -1

+#ifdef CONFIG_MAC80211_MESH
 		else
-			if (mesh_nexthop_lookup(skb, osdata)) {
+			if (osdata->u.mesh.mesh_pp->ops->
+				nexthop_lookup(skb, osdata)) {
 				dev_put(odev);
 				return 0;
 			}
+#endif