net: wireless: mesh: Add multicast and unicast stat counters

PATCH In review Daniel Walker 2 participants 5 messages Aug 18, 2009 mac80211

Share & tools

Daniel Walker

author

2009-08-18 14:02 UTC #0 lore raw

PATCH 1/1 net: wireless: mesh: Add multicast and unicast stat counters

I added two new stat counters to count if each forwarded frame is either multicast or unicast. This expands on the current fwded_frames stat counter which should be equal to the total of these two new counters.

The new counters are called "fwded_mcast" and "fwded_unicast".

CC Johannes Berg <[email protected]>

CC David S. Miller <[email protected]>

CC John W. Linville <[email protected]>

CC Luis R. Rodriguez <[email protected]>

CC Andrey Yurovsky <[email protected]>

CC Javier Cardona <[email protected]>

CC [email protected]

CC Sven-Thorsten Dietrich <[email protected]>

Signed-off-by Daniel Walker <[email protected]>

---
 net/mac80211/debugfs_netdev.c |    6 ++++++
 net/mac80211/ieee80211_i.h    |    6 +++++-
 net/mac80211/mesh_hwmp.c      |    4 ++++
 net/mac80211/rx.c             |    9 +++++++--
 4 files changed, 22 insertions(+), 3 deletions(-)

net/mac80211/debugfs_netdev.c +6 -0

index e9ec6ca..00f7c6e 100644
@@ -116,6 +116,8 @@ IEEE80211_IF_FILE(peer, u.wds.remote_addr, MAC);
 
 #ifdef CONFIG_MAC80211_MESH
 /* Mesh stats attributes */
+IEEE80211_IF_FILE(fwded_mcast, u.mesh.mshstats.fwded_mcast, DEC);
+IEEE80211_IF_FILE(fwded_unicast, u.mesh.mshstats.fwded_unicast, DEC);
 IEEE80211_IF_FILE(fwded_frames, u.mesh.mshstats.fwded_frames, DEC);
 IEEE80211_IF_FILE(dropped_frames_ttl, u.mesh.mshstats.dropped_frames_ttl, DEC);
 IEEE80211_IF_FILE(dropped_frames_no_route,

@@ -205,6 +207,8 @@ static void add_mesh_stats(struct ieee80211_sub_if_data *sdata)
 {
 	sdata->mesh_stats_dir = debugfs_create_dir("mesh_stats",
 				sdata->debugfsdir);
+	MESHSTATS_ADD(mcast_frames);
+	MESHSTATS_ADD(unicast_frames);
 	MESHSTATS_ADD(fwded_frames);
 	MESHSTATS_ADD(dropped_frames_ttl);
 	MESHSTATS_ADD(dropped_frames_no_route);

@@ -327,6 +331,8 @@ static void del_monitor_files(struct ieee80211_sub_if_data *sdata)
 
 static void del_mesh_stats(struct ieee80211_sub_if_data *sdata)
 {
+	MESHSTATS_DEL(mcast_frames);
+	MESHSTATS_DEL(unicast_frames);
 	MESHSTATS_DEL(fwded_frames);
 	MESHSTATS_DEL(dropped_frames_ttl);
 	MESHSTATS_DEL(dropped_frames_no_route);

net/mac80211/ieee80211_i.h +5 -1

index d6bd7dd..82c39d9 100644
@@ -212,7 +212,9 @@ struct ieee80211_if_vlan {
 };
 
 struct mesh_stats {
-	__u32 fwded_frames;		/* Mesh forwarded frames */
+	__u32 fwded_mcast;		/* Mesh forwarded multicast frames */
+	__u32 fwded_unicast;		/* Mesh forwarded unicast frames */
+	__u32 fwded_frames;		/* Mesh total forwarded frames */
 	__u32 dropped_frames_ttl;	/* Not transmitted since mesh_ttl == 0*/
 	__u32 dropped_frames_no_route;	/* Not transmitted, no route found */
 	atomic_t estab_plinks;

@@ -506,6 +508,8 @@ struct ieee80211_sub_if_data {
 #ifdef CONFIG_MAC80211_MESH
 	struct dentry *mesh_stats_dir;
 	struct {
+		struct dentry *fwded_mcast;
+		struct dentry *fwded_unicast;
 		struct dentry *fwded_frames;
 		struct dentry *dropped_frames_ttl;
 		struct dentry *dropped_frames_no_route;

net/mac80211/mesh_hwmp.c +4 -0

index e1a763e..593ea64 100644
@@ -478,6 +478,8 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
 				hopcount, ttl, cpu_to_le32(lifetime),
 				cpu_to_le32(metric), cpu_to_le32(preq_id),
 				sdata);
+		
+		ifmsh->mshstats.fwded_mcast++;
 		ifmsh->mshstats.fwded_frames++;
 	}
 }

@@ -536,6 +538,8 @@ static void hwmp_prep_frame_process(struct ieee80211_sub_if_data *sdata,
 		cpu_to_le32(lifetime), cpu_to_le32(metric),
 		0, sdata);
 	rcu_read_unlock();
+
+	sdata->u.mesh.mshstats.fwded_unicast++;
 	sdata->u.mesh.mshstats.fwded_frames++;
 	return;

net/mac80211/rx.c +7 -2

index 25a669c..cf21f57 100644
@@ -1543,16 +1543,21 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 			info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
 			info->control.vif = &rx->sdata->vif;
 			ieee80211_select_queue(local, fwd_skb);
-			if (is_multicast_ether_addr(fwd_hdr->addr3))
+			if (is_multicast_ether_addr(fwd_hdr->addr3)) {
 				memcpy(fwd_hdr->addr1, fwd_hdr->addr3,
 						ETH_ALEN);
-			else {
+				IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,
+							     fwded_mcast);
+			} else {
 				int err = mesh_nexthop_lookup(fwd_skb, sdata);
 				/* Failed to immediately resolve next hop:
 				 * fwded frame was dropped or will be added
 				 * later to the pending skb queue.  */
 				if (err)
 					return RX_DROP_MONITOR;
+
+				IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,
+							     fwded_unicast);
 			}
 			IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,
 						     fwded_frames);

Signature · 1 line

1.5.6.3

Javier Cardona

2009-08-18 18:08 UTC #1 lore raw

Daniel,

Thanks for the patch, that's useful.
I've reworked it so it can be applied to the HEAD of wireless-testing.
Comments in line and reworked patch in a follow-up email.
Cheers,

Javier

Quoted 21 lines

---
net/mac80211/debugfs_netdev.c | 6 ++++++
net/mac80211/ieee80211_i.h | 6 +++++-
net/mac80211/mesh_hwmp.c | 4 ++++
net/mac80211/rx.c | 9 +++++++--

 4 files changed, 22 insertions(+), 3 deletions(-)

net/mac80211/debugfs_netdev.c +2 -0

index e9ec6ca..00f7c6e 100644
@@ -116,6 +116,8 @@ IEEE80211_IF_FILE(peer, u.wds.remote_addr, MAC);
 
  #ifdef CONFIG_MAC80211_MESH
  /* Mesh stats attributes */
+IEEE80211_IF_FILE(fwded_mcast, u.mesh.mshstats.fwded_mcast, DEC);
+IEEE80211_IF_FILE(fwded_unicast, u.mesh.mshstats.fwded_unicast, DEC);
  IEEE80211_IF_FILE(fwded_frames, u.mesh.mshstats.fwded_frames, DEC);
  IEEE80211_IF_FILE(dropped_frames_ttl, u.mesh.mshstats.dropped_frames_ttl, DEC);
  IEEE80211_IF_FILE(dropped_frames_no_route,

net/mac80211/debugfs_netdev.c static void add_mesh_stats(struct ieee80211_sub_if_data *sdata) · line 211

Quoted 5 lines

net/mac80211/debugfs_netdev.c +2 -0

@@ -205,6 +207,8 @@ static void add_mesh_stats(struct ieee80211_sub_if_data *sdata)
  {
        sdata->mesh_stats_dir = debugfs_create_dir("mesh_stats",
                                sdata->debugfsdir);
+       MESHSTATS_ADD(mcast_frames);
+       MESHSTATS_ADD(unicast_frames);

mcast_frames -> fwded_mcast
unicast_frames -> fwded_unicast

net/mac80211/debugfs_netdev.c static void del_monitor_files(struct ieee80211_sub_if_data *sdata) · line 335

Quoted 9 lines

net/mac80211/debugfs_netdev.c +2 -0

        MESHSTATS_ADD(fwded_frames);
        MESHSTATS_ADD(dropped_frames_ttl);
        MESHSTATS_ADD(dropped_frames_no_route);

@@ -327,6 +331,8 @@ static void del_monitor_files(struct ieee80211_sub_if_data *sdata)
 
  static void del_mesh_stats(struct ieee80211_sub_if_data *sdata)
  {
+       MESHSTATS_DEL(mcast_frames);
+       MESHSTATS_DEL(unicast_frames);

Same as previous comment.

Quoted 67 lines

net/mac80211/debugfs_netdev.c +0 -0

        MESHSTATS_DEL(fwded_frames);
        MESHSTATS_DEL(dropped_frames_ttl);
        MESHSTATS_DEL(dropped_frames_no_route);

net/mac80211/ieee80211_i.h +3 -1

index d6bd7dd..82c39d9 100644
@@ -212,7 +212,9 @@ struct ieee80211_if_vlan {
  };
 
  struct mesh_stats {
-       __u32 fwded_frames;             /* Mesh forwarded frames */
+       __u32 fwded_mcast;              /* Mesh forwarded multicast frames */
+       __u32 fwded_unicast;            /* Mesh forwarded unicast frames */
+       __u32 fwded_frames;             /* Mesh total forwarded frames */

__u32 dropped_frames_ttl; /* Not transmitted since mesh_ttl == 0*/ __u32 dropped_frames_no_route; /* Not transmitted, no route found */ atomic_t estab_plinks;

net/mac80211/ieee80211_i.h +2 -0

@@ -506,6 +508,8 @@ struct ieee80211_sub_if_data {
  #ifdef CONFIG_MAC80211_MESH
        struct dentry *mesh_stats_dir;
        struct {
+               struct dentry *fwded_mcast;
+               struct dentry *fwded_unicast;
                struct dentry *fwded_frames;
                struct dentry *dropped_frames_ttl;
                struct dentry *dropped_frames_no_route;

net/mac80211/mesh_hwmp.c +4 -0

index e1a763e..593ea64 100644
@@ -478,6 +478,8 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
                                hopcount, ttl, cpu_to_le32(lifetime),
                                cpu_to_le32(metric), cpu_to_le32(preq_id),
                                sdata);
+
+               ifmsh->mshstats.fwded_mcast++;
                ifmsh->mshstats.fwded_frames++;
        }
  }

@@ -536,6 +538,8 @@ static void hwmp_prep_frame_process(struct ieee80211_sub_if_data *sdata,
                cpu_to_le32(lifetime), cpu_to_le32(metric),
                0, sdata);
        rcu_read_unlock();
+
+       sdata->u.mesh.mshstats.fwded_unicast++;
        sdata->u.mesh.mshstats.fwded_frames++;
        return;

net/mac80211/rx.c +4 -2

index 25a669c..cf21f57 100644
@@ -1543,16 +1543,21 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
                        info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
                        info->control.vif = &rx->sdata->vif;
                        ieee80211_select_queue(local, fwd_skb);
-                       if (is_multicast_ether_addr(fwd_hdr->addr3))
+                       if (is_multicast_ether_addr(fwd_hdr->addr3)) {
                                memcpy(fwd_hdr->addr1, fwd_hdr->addr3,
                                                ETH_ALEN);
-                       else {
+                               IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,
+                                                            fwded_mcast);
+                       } else {
                                int err = mesh_nexthop_lookup(fwd_skb, sdata);
                                /* Failed to immediately resolve next hop:

net/mac80211/rx.c ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) · line 1563

Quoted 10 lines

net/mac80211/rx.c +3 -0

                                 * fwded frame was dropped or will be added
                                 * later to the pending skb queue.  */
                                if (err)
                                        return RX_DROP_MONITOR;
+
+                               IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,
+                                                            fwded_unicast);
                        }
                        IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,
                                                     fwded_frames);

Hunk will fail due to recent changes to multicast frame format.

Javier Cardona

2009-08-18 18:10 UTC #2 lore raw

PATCH 1/1 mac80211: New stat counters for multicast and unicast forwarded frames

From: Daniel Walker <[email protected]>

This expands on the current fwded_frames stat counter which should be equal to the total of these two new counters. The new counters are called "fwded_mcast" and "fwded_unicast".

Signed-off-by Daniel Walker <[email protected]>

Signed-off-by Javier Cardona <[email protected]>

---
 net/mac80211/debugfs_netdev.c |    6 ++++++
 net/mac80211/ieee80211_i.h    |    6 +++++-
 net/mac80211/mesh_hwmp.c      |    3 +++
 net/mac80211/rx.c             |    8 +++++++-
 4 files changed, 21 insertions(+), 2 deletions(-)

net/mac80211/debugfs_netdev.c +6 -0

index e9ec6ca..61234e7 100644
@@ -116,6 +116,8 @@ IEEE80211_IF_FILE(peer, u.wds.remote_addr, MAC);
 
 #ifdef CONFIG_MAC80211_MESH
 /* Mesh stats attributes */
+IEEE80211_IF_FILE(fwded_mcast, u.mesh.mshstats.fwded_mcast, DEC);
+IEEE80211_IF_FILE(fwded_unicast, u.mesh.mshstats.fwded_unicast, DEC);
 IEEE80211_IF_FILE(fwded_frames, u.mesh.mshstats.fwded_frames, DEC);
 IEEE80211_IF_FILE(dropped_frames_ttl, u.mesh.mshstats.dropped_frames_ttl, DEC);
 IEEE80211_IF_FILE(dropped_frames_no_route,

@@ -205,6 +207,8 @@ static void add_mesh_stats(struct ieee80211_sub_if_data *sdata)
 {
 	sdata->mesh_stats_dir = debugfs_create_dir("mesh_stats",
 				sdata->debugfsdir);
+	MESHSTATS_ADD(fwded_mcast);
+	MESHSTATS_ADD(fwded_unicast);
 	MESHSTATS_ADD(fwded_frames);
 	MESHSTATS_ADD(dropped_frames_ttl);
 	MESHSTATS_ADD(dropped_frames_no_route);

@@ -327,6 +331,8 @@ static void del_monitor_files(struct ieee80211_sub_if_data *sdata)
 
 static void del_mesh_stats(struct ieee80211_sub_if_data *sdata)
 {
+	MESHSTATS_DEL(fwded_mcast);
+	MESHSTATS_DEL(fwded_unicast);
 	MESHSTATS_DEL(fwded_frames);
 	MESHSTATS_DEL(dropped_frames_ttl);
 	MESHSTATS_DEL(dropped_frames_no_route);

net/mac80211/ieee80211_i.h +5 -1

index a07f017..93e618a 100644
@@ -212,7 +212,9 @@ struct ieee80211_if_vlan {
 };
 
 struct mesh_stats {
-	__u32 fwded_frames;		/* Mesh forwarded frames */
+	__u32 fwded_mcast;		/* Mesh forwarded multicast frames */
+	__u32 fwded_unicast;		/* Mesh forwarded unicast frames */
+	__u32 fwded_frames;		/* Mesh total forwarded frames */
 	__u32 dropped_frames_ttl;	/* Not transmitted since mesh_ttl == 0*/
 	__u32 dropped_frames_no_route;	/* Not transmitted, no route found */
 	atomic_t estab_plinks;

@@ -506,6 +508,8 @@ struct ieee80211_sub_if_data {
 #ifdef CONFIG_MAC80211_MESH
 	struct dentry *mesh_stats_dir;
 	struct {
+		struct dentry *fwded_mcast;
+		struct dentry *fwded_unicast;
 		struct dentry *fwded_frames;
 		struct dentry *dropped_frames_ttl;
 		struct dentry *dropped_frames_no_route;

net/mac80211/mesh_hwmp.c +3 -0

index 7aeba00..e12a786 100644
@@ -497,6 +497,7 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
 				hopcount, ttl, cpu_to_le32(lifetime),
 				cpu_to_le32(metric), cpu_to_le32(preq_id),
 				sdata);
+		ifmsh->mshstats.fwded_mcast++;
 		ifmsh->mshstats.fwded_frames++;
 	}
 }

@@ -555,6 +556,8 @@ static void hwmp_prep_frame_process(struct ieee80211_sub_if_data *sdata,
 		cpu_to_le32(lifetime), cpu_to_le32(metric),
 		0, sdata);
 	rcu_read_unlock();
+
+	sdata->u.mesh.mshstats.fwded_unicast++;
 	sdata->u.mesh.mshstats.fwded_frames++;
 	return;

net/mac80211/rx.c +7 -1

index 4cd9e45..7065fd7 100644
@@ -1550,7 +1550,10 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 			info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
 			info->control.vif = &rx->sdata->vif;
 			ieee80211_select_queue(local, fwd_skb);
-			if (!is_multicast_ether_addr(fwd_hdr->addr1)) {
+			if (is_multicast_ether_addr(fwd_hdr->addr1))
+				IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,
+								fwded_mcast);
+			else {
 				int err;
 				/*
 				 * Save TA to addr1 to send TA a path error if a

@@ -1564,6 +1567,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 				 * later to the pending skb queue.  */
 				if (err)
 					return RX_DROP_MONITOR;
+
+				IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,
+								fwded_unicast);
 			}
 			IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,
 						     fwded_frames);

Signature · 1 line

1.5.4.3

Daniel Walker

author

2009-08-18 18:19 UTC #3 lore raw

Re: [PATCH] mac80211: New stat counters for multicast and unicast forwarded frames

Quoted 9 lines · Javier Cardona

From: Daniel Walker <[email protected]>
This expands on the current fwded_frames stat counter which should be equal to the total of these two new counters. The new counters are called "fwded_mcast" and "fwded_unicast".
Signed-off-by Daniel Walker <[email protected]>
Signed-off-by Javier Cardona <[email protected]>
---

Might have been nice for you to wait for me to review the new version before adding my sign off , but it looks fine.

Signed-off-by Daniel Walker <[email protected]>

Javier Cardona

2009-08-18 18:25 UTC #4 lore raw

Re: [PATCH] mac80211: New stat counters for multicast and unicast forwarded frames

Daniel,

Quoted 7 lines · Daniel Walker

Quoted 6 lines · Javier Cardona
From: Daniel Walker <[email protected]>
This expands on the current fwded_frames stat counter which should be equal to the total of these two new counters. The new counters are called "fwded_mcast" and "fwded_unicast".

Quoted 6 lines

Quoted 3 lines
Signed-off-by Daniel Walker <[email protected]>
Signed-off-by Javier Cardona <[email protected]>
---
Might have been nice for you to wait for me to review the new version before adding my sign off , but it looks fine.

You are right. Sorry for that.

Thanks,

Javier