Fix regression in mesh forwarding path.
PATCH 1/1 Fix regression in mesh forwarding path.
From: Javier Cardona <[email protected]>
The removal of the master netdev broke the mesh forwarding path. This patch fixes it by using the new internal 'pending' queue.
As a result of this change, mesh forwarding no longer does the inefficient 802.11 -> 802.3 -> 802.11 conversion that was done before.
--- net/mac80211/mesh_hwmp.c | 3 ++- net/mac80211/mesh_pathtbl.c | 7 +++++-- net/mac80211/rx.c | 17 +++++++++++++++-- net/mac80211/tx.c | 3 --- 4 files changed, 22 insertions(+), 8 deletions(-)
net/mac80211/mesh_hwmp.c +2 -1
@@ -784,7 +784,6 @@ int mesh_nexthop_lookup(struct sk_buff *skb,mesh_path_add (dst_addr, sdata); mpath =mesh_path_lookup (dst_addr, sdata);if (!mpath) { -dev_kfree_skb (skb); sdata->u.mesh.mshstats.dropped_frames_no_route++; err = -ENOSPC ; goto endlookup;
@@ -804,6 +803,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,memcpy (hdr->addr1, mpath->next_hop->sta.addr,ETH_ALEN ); }else { +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);if (!(mpath->flags &MESH_PATH_RESOLVING )) {/* Start discovery only if it is not running yet */ mesh_queue_preq (mpath,PREQ_Q_F_START );
@@ -815,6 +815,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,skb_unlink (skb_to_free, &mpath->frame_queue); } + info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ;skb_queue_tail (&mpath->frame_queue, skb);if (skb_to_free)mesh_path_discard_frame (skb_to_free, sdata);
net/mac80211/mesh_pathtbl.c +5 -2
@@ -14,6 +14,7 @@#include <linux/string.h> #include <net/mac80211.h> #include "ieee80211_i.h" +#include "wme.h" #include "mesh.h" /* There will be initially 2^INIT_PATHS_SIZE_ORDER buckets */
@@ -481,8 +482,10 @@ void mesh_path_tx_pending(struct mesh_path *mpath)struct sk_buff *skb;while ((skb =skb_dequeue (&mpath->frame_queue)) && - (mpath->flags &MESH_PATH_ACTIVE )) -dev_queue_xmit (skb); + (mpath->flags &MESH_PATH_ACTIVE )) { +ieee80211_select_queue (mpath->sdata->local, skb); +ieee80211_add_pending_skb (mpath->sdata->local, skb); + } }/**
net/mac80211/rx.c +15 -2
@@ -1485,10 +1485,12 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)unsigned int hdrlen;struct sk_buff *skb = rx->skb, *fwd_skb;struct ieee80211_local *local = rx->local; +struct ieee80211_sub_if_data *sdata; hdr = (struct ieee80211_hdr *) skb->data; hdrlen =ieee80211_hdrlen (hdr->frame_control); mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen); + sdata =IEEE80211_DEV_TO_SUB_IF (rx->dev);if (!ieee80211_is_data (hdr->frame_control))return RX_CONTINUE ;
@@ -1498,10 +1500,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)return RX_DROP_MONITOR ;if (mesh_hdr->flags &MESH_FLAGS_AE_A5_A6 ){ -struct ieee80211_sub_if_data *sdata;struct mesh_path *mppath; - sdata =IEEE80211_DEV_TO_SUB_IF (rx->dev);rcu_read_lock (); mppath =mpp_path_lookup (mesh_hdr->eaddr2, sdata);if (!mppath) {
@@ -1546,6 +1546,19 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)memset (info,0 ,sizeof (*info)); info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ; fwd_skb->iif = rx->dev->ifindex; +if (is_multicast_ether_addr (fwd_hdr->addr3)) +memcpy (fwd_hdr->addr1, fwd_hdr->addr3, +ETH_ALEN ); +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_frames);ieee80211_select_queue (local, fwd_skb);ieee80211_add_pending_skb (local, fwd_skb); }
net/mac80211/tx.c +0 -3
@@ -1399,9 +1399,6 @@ static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,dev_put (sdata->dev);return ; } -if (memcmp (sdata->dev->dev_addr, hdr->addr4,ETH_ALEN ) !=0 ) -IEEE80211_IFSTA_MESH_CTR_INC (&sdata->u.mesh, - fwded_frames); }else if (unlikely (sdata->vif.type ==NL80211_IFTYPE_MONITOR )) {int hdrlen;u16 len_rthdr;
Signature · 1 line
1.5.4.3
PATCH 1/1 Fix regression in mesh forwarding path.
From: Javier Cardona <[email protected]>
The removal of the master netdev broke the mesh forwarding path. This patch fixes it by using the new internal 'pending' queue.
As a result of this change, mesh forwarding no longer does the inefficient 802.11 -> 802.3 -> 802.11 conversion that was done before.
--- net/mac80211/mesh_hwmp.c | 3 ++- net/mac80211/mesh_pathtbl.c | 7 +++++-- net/mac80211/rx.c | 17 +++++++++++++++-- net/mac80211/tx.c | 3 --- 4 files changed, 22 insertions(+), 8 deletions(-)
net/mac80211/mesh_hwmp.c +2 -1
@@ -784,7 +784,6 @@ int mesh_nexthop_lookup(struct sk_buff *skb,mesh_path_add (dst_addr, sdata); mpath =mesh_path_lookup (dst_addr, sdata);if (!mpath) { -dev_kfree_skb (skb); sdata->u.mesh.mshstats.dropped_frames_no_route++; err = -ENOSPC ; goto endlookup;
@@ -804,6 +803,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,memcpy (hdr->addr1, mpath->next_hop->sta.addr,ETH_ALEN ); }else { +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);if (!(mpath->flags &MESH_PATH_RESOLVING )) {/* Start discovery only if it is not running yet */ mesh_queue_preq (mpath,PREQ_Q_F_START );
@@ -815,6 +815,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,skb_unlink (skb_to_free, &mpath->frame_queue); } + info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ;skb_queue_tail (&mpath->frame_queue, skb);if (skb_to_free)mesh_path_discard_frame (skb_to_free, sdata);
net/mac80211/mesh_pathtbl.c +5 -2
@@ -14,6 +14,7 @@#include <linux/string.h> #include <net/mac80211.h> #include "ieee80211_i.h" +#include "wme.h" #include "mesh.h" /* There will be initially 2^INIT_PATHS_SIZE_ORDER buckets */
@@ -481,8 +482,10 @@ void mesh_path_tx_pending(struct mesh_path *mpath)struct sk_buff *skb;while ((skb =skb_dequeue (&mpath->frame_queue)) && - (mpath->flags &MESH_PATH_ACTIVE )) -dev_queue_xmit (skb); + (mpath->flags &MESH_PATH_ACTIVE )) { +ieee80211_select_queue (mpath->sdata->local, skb); +ieee80211_add_pending_skb (mpath->sdata->local, skb); + } }/**
net/mac80211/rx.c +15 -2
@@ -1485,10 +1485,12 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)unsigned int hdrlen;struct sk_buff *skb = rx->skb, *fwd_skb;struct ieee80211_local *local = rx->local; +struct ieee80211_sub_if_data *sdata; hdr = (struct ieee80211_hdr *) skb->data; hdrlen =ieee80211_hdrlen (hdr->frame_control); mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen); + sdata =IEEE80211_DEV_TO_SUB_IF (rx->dev);if (!ieee80211_is_data (hdr->frame_control))return RX_CONTINUE ;
@@ -1498,10 +1500,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)return RX_DROP_MONITOR ;if (mesh_hdr->flags &MESH_FLAGS_AE_A5_A6 ){ -struct ieee80211_sub_if_data *sdata;struct mesh_path *mppath; - sdata =IEEE80211_DEV_TO_SUB_IF (rx->dev);rcu_read_lock (); mppath =mpp_path_lookup (mesh_hdr->eaddr2, sdata);if (!mppath) {
@@ -1546,6 +1546,19 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)memset (info,0 ,sizeof (*info)); info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ; fwd_skb->iif = rx->dev->ifindex; +if (is_multicast_ether_addr (fwd_hdr->addr3)) +memcpy (fwd_hdr->addr1, fwd_hdr->addr3, +ETH_ALEN ); +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_frames);ieee80211_select_queue (local, fwd_skb);ieee80211_add_pending_skb (local, fwd_skb); }
net/mac80211/tx.c +0 -3
@@ -1399,9 +1399,6 @@ static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,dev_put (sdata->dev);return ; } -if (memcmp (sdata->dev->dev_addr, hdr->addr4,ETH_ALEN ) !=0 ) -IEEE80211_IFSTA_MESH_CTR_INC (&sdata->u.mesh, - fwded_frames); }else if (unlikely (sdata->vif.type ==NL80211_IFTYPE_MONITOR )) {int hdrlen;u16 len_rthdr;
Signature · 1 line
1.5.4.3
Johannes Berg
maintainerQuoted 4 lines · On Mon, 2009-07-06 at 17:52 -0700, [email protected] wrote:
From: Javier Cardona <[email protected]>
The removal of the master netdev broke the mesh forwarding path. This patch fixes it by using the new internal 'pending' queue.
Sorry, never tested mesh recently.
Quoted 2 lines
As a result of this change, mesh forwarding no longer does the inefficient 802.11 -> 802.3 -> 802.11 conversion that was done before.
That sounds good!
net/mac80211/mesh_pathtbl.c void mesh_path_tx_pending(struct mesh_path *mpath) · line 488
Quoted 7 lines
net/mac80211/mesh_pathtbl.c +4
-2while ((skb =skb_dequeue (&mpath->frame_queue)) && - (mpath->flags &MESH_PATH_ACTIVE )) -dev_queue_xmit (skb); + (mpath->flags &MESH_PATH_ACTIVE )) { +ieee80211_select_queue (mpath->sdata->local, skb); +ieee80211_add_pending_skb (mpath->sdata->local, skb); + }
That does a lot of locking operations -- can you not select the queue earlier, and use ieee80211_add_pending_skbs?
johannes
PATCH v2 1/1 Fix regression in mesh forwarding path.
From: Javier Cardona <[email protected]>
The removal of the master netdev broke the mesh forwarding path. This patch fixes it by using the new internal 'pending' queue.
As a result of this change, mesh forwarding no longer does the inefficient 802.11 -> 802.3 -> 802.11 conversion that was done before.
--- net/mac80211/mesh_hwmp.c | 3 ++- net/mac80211/mesh_pathtbl.c | 3 ++- net/mac80211/rx.c | 17 +++++++++++++++-- net/mac80211/tx.c | 3 --- 4 files changed, 19 insertions(+), 7 deletions(-)
net/mac80211/mesh_hwmp.c +2 -1
@@ -784,7 +784,6 @@ int mesh_nexthop_lookup(struct sk_buff *skb,mesh_path_add (dst_addr, sdata); mpath =mesh_path_lookup (dst_addr, sdata);if (!mpath) { -dev_kfree_skb (skb); sdata->u.mesh.mshstats.dropped_frames_no_route++; err = -ENOSPC ; goto endlookup;
@@ -804,6 +803,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,memcpy (hdr->addr1, mpath->next_hop->sta.addr,ETH_ALEN ); }else { +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);if (!(mpath->flags &MESH_PATH_RESOLVING )) {/* Start discovery only if it is not running yet */ mesh_queue_preq (mpath,PREQ_Q_F_START );
@@ -815,6 +815,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,skb_unlink (skb_to_free, &mpath->frame_queue); } + info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ;skb_queue_tail (&mpath->frame_queue, skb);if (skb_to_free)mesh_path_discard_frame (skb_to_free, sdata);
net/mac80211/mesh_pathtbl.c +2 -1
@@ -14,6 +14,7 @@#include <linux/string.h> #include <net/mac80211.h> #include "ieee80211_i.h" +#include "wme.h" #include "mesh.h" /* There will be initially 2^INIT_PATHS_SIZE_ORDER buckets */
@@ -482,7 +483,7 @@ void mesh_path_tx_pending(struct mesh_path *mpath)while ((skb =skb_dequeue (&mpath->frame_queue)) && (mpath->flags &MESH_PATH_ACTIVE )) -dev_queue_xmit (skb); +ieee80211_add_pending_skb (mpath->sdata->local, skb); }/**
net/mac80211/rx.c +15 -2
@@ -1485,10 +1485,12 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)unsigned int hdrlen;struct sk_buff *skb = rx->skb, *fwd_skb;struct ieee80211_local *local = rx->local; +struct ieee80211_sub_if_data *sdata; hdr = (struct ieee80211_hdr *) skb->data; hdrlen =ieee80211_hdrlen (hdr->frame_control); mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen); + sdata =IEEE80211_DEV_TO_SUB_IF (rx->dev);if (!ieee80211_is_data (hdr->frame_control))return RX_CONTINUE ;
@@ -1498,10 +1500,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)return RX_DROP_MONITOR ;if (mesh_hdr->flags &MESH_FLAGS_AE_A5_A6 ){ -struct ieee80211_sub_if_data *sdata;struct mesh_path *mppath; - sdata =IEEE80211_DEV_TO_SUB_IF (rx->dev);rcu_read_lock (); mppath =mpp_path_lookup (mesh_hdr->eaddr2, sdata);if (!mppath) {
@@ -1547,6 +1547,19 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ; fwd_skb->iif = rx->dev->ifindex;ieee80211_select_queue (local, fwd_skb); +if (is_multicast_ether_addr (fwd_hdr->addr3)) +memcpy (fwd_hdr->addr1, fwd_hdr->addr3, +ETH_ALEN ); +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_frames);ieee80211_add_pending_skb (local, fwd_skb); } }
net/mac80211/tx.c +0 -3
@@ -1399,9 +1399,6 @@ static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,dev_put (sdata->dev);return ; } -if (memcmp (sdata->dev->dev_addr, hdr->addr4,ETH_ALEN ) !=0 ) -IEEE80211_IFSTA_MESH_CTR_INC (&sdata->u.mesh, - fwded_frames); }else if (unlikely (sdata->vif.type ==NL80211_IFTYPE_MONITOR )) {int hdrlen;u16 len_rthdr;
Signature · 1 line
1.5.4.3
Johannes Berg
maintainernet/mac80211/mesh_pathtbl.c void mesh_path_tx_pending(struct mesh_path *mpath) · line 487
Quoted 6 lines · On Mon, 2009-07-06 at 18:25 -0700, [email protected] wrote:
while ((skb = skb_dequeue(&mpath->frame_queue)) && (mpath->flags & MESH_PATH_ACTIVE))net/mac80211/mesh_pathtbl.c +1
-1-dev_queue_xmit (skb); +ieee80211_add_pending_skb (mpath->sdata->local, skb); }
?
Hmm, now I'm confused, why not just do
if (mpath->flags & MESH_PATH_ACTIVE)
ieee80211_add_pending_skbs(mpath->sdata->local, &mpath->frame_queue);
?
johannes
Johannes,
Quoted 6 lines · Johannes Berg
Hmm, now I'm confused, why not just do
if (
mpath->flags&MESH_PATH_ACTIVE)ieee80211_add_pending_skbs(mpath->sdata->local, &mpath->frame_queue); ?
Ah, yes, much better. I had missed the trailing 's' in your previous e-mail. See v3 of the patch.
Thanks,
Javier
Signature · 3 lines
Javier Cardona cozybit Inc. http://www.cozybit.com
PATCH v3 1/1 Fix regression in mesh forwarding path.
In reply to [email protected]From: Javier Cardona <[email protected]>
The removal of the master netdev broke the mesh forwarding path. This patch fixes it by using the new internal 'pending' queue.
As a result of this change, mesh forwarding no longer does the inefficient 802.11 -> 802.3 -> 802.11 conversion that was done before.
--- net/mac80211/mesh_hwmp.c | 3 ++- net/mac80211/mesh_pathtbl.c | 9 ++++----- net/mac80211/rx.c | 17 +++++++++++++++-- net/mac80211/tx.c | 3 --- 4 files changed, 21 insertions(+), 11 deletions(-)
net/mac80211/mesh_hwmp.c +2 -1
@@ -784,7 +784,6 @@ int mesh_nexthop_lookup(struct sk_buff *skb,mesh_path_add (dst_addr, sdata); mpath =mesh_path_lookup (dst_addr, sdata);if (!mpath) { -dev_kfree_skb (skb); sdata->u.mesh.mshstats.dropped_frames_no_route++; err = -ENOSPC ; goto endlookup;
@@ -804,6 +803,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,memcpy (hdr->addr1, mpath->next_hop->sta.addr,ETH_ALEN ); }else { +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);if (!(mpath->flags &MESH_PATH_RESOLVING )) {/* Start discovery only if it is not running yet */ mesh_queue_preq (mpath,PREQ_Q_F_START );
@@ -815,6 +815,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,skb_unlink (skb_to_free, &mpath->frame_queue); } + info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ;skb_queue_tail (&mpath->frame_queue, skb);if (skb_to_free)mesh_path_discard_frame (skb_to_free, sdata);
net/mac80211/mesh_pathtbl.c +4 -5
@@ -14,6 +14,7 @@#include <linux/string.h> #include <net/mac80211.h> #include "ieee80211_i.h" +#include "wme.h" #include "mesh.h" /* There will be initially 2^INIT_PATHS_SIZE_ORDER buckets */
@@ -478,11 +479,9 @@ enddel:*/ void mesh_path_tx_pending (struct mesh_path *mpath) { -struct sk_buff *skb; - -while ((skb =skb_dequeue (&mpath->frame_queue)) && - (mpath->flags &MESH_PATH_ACTIVE )) -dev_queue_xmit (skb); +if (mpath->flags &MESH_PATH_ACTIVE ) +ieee80211_add_pending_skbs (mpath->sdata->local, + &mpath->frame_queue); }/**
net/mac80211/rx.c +15 -2
@@ -1485,10 +1485,12 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)unsigned int hdrlen;struct sk_buff *skb = rx->skb, *fwd_skb;struct ieee80211_local *local = rx->local; +struct ieee80211_sub_if_data *sdata; hdr = (struct ieee80211_hdr *) skb->data; hdrlen =ieee80211_hdrlen (hdr->frame_control); mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen); + sdata =IEEE80211_DEV_TO_SUB_IF (rx->dev);if (!ieee80211_is_data (hdr->frame_control))return RX_CONTINUE ;
@@ -1498,10 +1500,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)return RX_DROP_MONITOR ;if (mesh_hdr->flags &MESH_FLAGS_AE_A5_A6 ){ -struct ieee80211_sub_if_data *sdata;struct mesh_path *mppath; - sdata =IEEE80211_DEV_TO_SUB_IF (rx->dev);rcu_read_lock (); mppath =mpp_path_lookup (mesh_hdr->eaddr2, sdata);if (!mppath) {
@@ -1547,6 +1547,19 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ; fwd_skb->iif = rx->dev->ifindex;ieee80211_select_queue (local, fwd_skb); +if (is_multicast_ether_addr (fwd_hdr->addr3)) +memcpy (fwd_hdr->addr1, fwd_hdr->addr3, +ETH_ALEN ); +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_frames);ieee80211_add_pending_skb (local, fwd_skb); } }
net/mac80211/tx.c +0 -3
@@ -1399,9 +1399,6 @@ static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,dev_put (sdata->dev);return ; } -if (memcmp (sdata->dev->dev_addr, hdr->addr4,ETH_ALEN ) !=0 ) -IEEE80211_IFSTA_MESH_CTR_INC (&sdata->u.mesh, - fwded_frames); }else if (unlikely (sdata->vif.type ==NL80211_IFTYPE_MONITOR )) {int hdrlen;u16 len_rthdr;
Signature · 1 line
1.5.4.3
Quoted 10 lines · On Mon, 2009-07-06 at 19:54 -0700, [email protected] wrote:
From: Javier Cardona <[email protected]>
The removal of the master netdev broke the mesh forwarding path. This patch fixes it by using the new internal 'pending' queue.
As a result of this change, mesh forwarding no longer does the inefficient 802.11 -> 802.3 -> 802.11 conversion that was done before.
Signed-off-by Javier Cardona <[email protected]>Signed-off-by Andrey Yurovsky <[email protected]>
Quoted 40 lines
--- net/mac80211/mesh_hwmp.c | 3 ++- net/mac80211/mesh_pathtbl.c | 9 ++++----- net/mac80211/rx.c | 17 +++++++++++++++-- net/mac80211/tx.c | 3 --- 4 files changed, 21 insertions(+), 11 deletions(-)net/mac80211/mesh_hwmp.c +2
-1@@ -784,7 +784,6 @@ int mesh_nexthop_lookup(struct sk_buff *skb,mesh_path_add (dst_addr, sdata); mpath =mesh_path_lookup (dst_addr, sdata);if (!mpath) { -dev_kfree_skb (skb); sdata->u.mesh.mshstats.dropped_frames_no_route++; err = -ENOSPC ; goto endlookup;@@ -804,6 +803,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,memcpy (hdr->addr1, mpath->next_hop->sta.addr,ETH_ALEN ); }else { +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);if (!(mpath->flags &MESH_PATH_RESOLVING )) {/* Start discovery only if it is not running yet */ mesh_queue_preq (mpath,PREQ_Q_F_START );@@ -815,6 +815,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,skb_unlink (skb_to_free, &mpath->frame_queue); } + info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ;skb_queue_tail (&mpath->frame_queue, skb);if (skb_to_free)mesh_path_discard_frame (skb_to_free, sdata);net/mac80211/mesh_pathtbl.c +0
-0
net/mac80211/mesh_pathtbl.c line 18
Quoted 5 lines
net/mac80211/mesh_pathtbl.c +1
-0@@ -14,6 +14,7 @@#include <linux/string.h> #include <net/mac80211.h> #include "ieee80211_i.h" +#include "wme.h" #include "mesh.h"
You _could_ drop that extra include now, but it's not like it really matters.
johannes
PATCH v4 1/1 Fix regression in mesh forwarding path.
In reply to [email protected]The removal of the master netdev broke the mesh forwarding path. This patch fixes it by using the new internal 'pending' queue.
As a result of this change, mesh forwarding no longer does the inefficient 802.11 -> 802.3 -> 802.11 conversion that was done before.
[Changes since v1]
Suggested by Johannes:
- Select queue before adding to mpath queue
- ieee80211_add_pending_skb -> ieee80211_add_pending_skbs
- Remove unnecessary header wme.h
--- net/mac80211/mesh_hwmp.c | 3 ++- net/mac80211/mesh_pathtbl.c | 8 +++----- net/mac80211/rx.c | 17 +++++++++++++++-- net/mac80211/tx.c | 3 --- 4 files changed, 20 insertions(+), 11 deletions(-)
net/mac80211/mesh_hwmp.c +2 -1
@@ -784,7 +784,6 @@ int mesh_nexthop_lookup(struct sk_buff *skb,mesh_path_add (dst_addr, sdata); mpath =mesh_path_lookup (dst_addr, sdata);if (!mpath) { -dev_kfree_skb (skb); sdata->u.mesh.mshstats.dropped_frames_no_route++; err = -ENOSPC ; goto endlookup;
@@ -804,6 +803,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,memcpy (hdr->addr1, mpath->next_hop->sta.addr,ETH_ALEN ); }else { +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);if (!(mpath->flags &MESH_PATH_RESOLVING )) {/* Start discovery only if it is not running yet */ mesh_queue_preq (mpath,PREQ_Q_F_START );
@@ -815,6 +815,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,skb_unlink (skb_to_free, &mpath->frame_queue); } + info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ;skb_queue_tail (&mpath->frame_queue, skb);if (skb_to_free)mesh_path_discard_frame (skb_to_free, sdata);
net/mac80211/mesh_pathtbl.c +3 -5
@@ -478,11 +478,9 @@ enddel:*/ void mesh_path_tx_pending (struct mesh_path *mpath) { -struct sk_buff *skb; - -while ((skb =skb_dequeue (&mpath->frame_queue)) && - (mpath->flags &MESH_PATH_ACTIVE )) -dev_queue_xmit (skb); +if (mpath->flags &MESH_PATH_ACTIVE ) +ieee80211_add_pending_skbs (mpath->sdata->local, + &mpath->frame_queue); }/**
net/mac80211/rx.c +15 -2
@@ -1485,10 +1485,12 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)unsigned int hdrlen;struct sk_buff *skb = rx->skb, *fwd_skb;struct ieee80211_local *local = rx->local; +struct ieee80211_sub_if_data *sdata; hdr = (struct ieee80211_hdr *) skb->data; hdrlen =ieee80211_hdrlen (hdr->frame_control); mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen); + sdata =IEEE80211_DEV_TO_SUB_IF (rx->dev);if (!ieee80211_is_data (hdr->frame_control))return RX_CONTINUE ;
@@ -1498,10 +1500,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)return RX_DROP_MONITOR ;if (mesh_hdr->flags &MESH_FLAGS_AE_A5_A6 ){ -struct ieee80211_sub_if_data *sdata;struct mesh_path *mppath; - sdata =IEEE80211_DEV_TO_SUB_IF (rx->dev);rcu_read_lock (); mppath =mpp_path_lookup (mesh_hdr->eaddr2, sdata);if (!mppath) {
@@ -1547,6 +1547,19 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ; fwd_skb->iif = rx->dev->ifindex;ieee80211_select_queue (local, fwd_skb); +if (is_multicast_ether_addr (fwd_hdr->addr3)) +memcpy (fwd_hdr->addr1, fwd_hdr->addr3, +ETH_ALEN ); +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_frames);ieee80211_add_pending_skb (local, fwd_skb); } }
net/mac80211/tx.c +0 -3
@@ -1399,9 +1399,6 @@ static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,dev_put (sdata->dev);return ; } -if (memcmp (sdata->dev->dev_addr, hdr->addr4,ETH_ALEN ) !=0 ) -IEEE80211_IFSTA_MESH_CTR_INC (&sdata->u.mesh, - fwded_frames); }else if (unlikely (sdata->vif.type ==NL80211_IFTYPE_MONITOR )) {int hdrlen;u16 len_rthdr;
Signature · 1 line
1.5.4.3
Quoted 7 lines · On Mon, Jul 06, 2009 at 07:54:12PM -0700, [email protected] wrote:
From: Javier Cardona <[email protected]>
The removal of the master netdev broke the mesh forwarding path. This patch fixes it by using the new internal 'pending' queue.
As a result of this change, mesh forwarding no longer does the inefficient 802.11 -> 802.3 -> 802.11 conversion that was done before.
I'm sorry, but this doesn't seem to apply on top of the current tree. Would you mind taking a look and respinning?
Thanks!
John
Signature · 3 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready. ¡Viva Honduras Libre!
PATCH v5 1/1 Fix regression in mesh forwarding path.
From: Javier Cardona <[email protected]>
The removal of the master netdev broke the mesh forwarding path. This patch fixes it by using the new internal 'pending' queue.
As a result of this change, mesh forwarding no longer does the inefficient 802.11 -> 802.3 -> 802.11 conversion that was done before.
[Changes since v1]
Suggested by Johannes:
- Select queue before adding to mpath queue
- ieee80211_add_pending_skb -> ieee80211_add_pending_skbs
- Remove unnecessary header wme.h
--- net/mac80211/mesh_hwmp.c | 3 ++- net/mac80211/mesh_pathtbl.c | 8 +++----- net/mac80211/rx.c | 17 +++++++++++++++-- net/mac80211/tx.c | 3 --- 4 files changed, 20 insertions(+), 11 deletions(-)
net/mac80211/mesh_hwmp.c +2 -1
@@ -784,7 +784,6 @@ int mesh_nexthop_lookup(struct sk_buff *skb,mesh_path_add (dst_addr, sdata); mpath =mesh_path_lookup (dst_addr, sdata);if (!mpath) { -dev_kfree_skb (skb); sdata->u.mesh.mshstats.dropped_frames_no_route++; err = -ENOSPC ; goto endlookup;
@@ -804,6 +803,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,memcpy (hdr->addr1, mpath->next_hop->sta.addr,ETH_ALEN ); }else { +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);if (!(mpath->flags &MESH_PATH_RESOLVING )) {/* Start discovery only if it is not running yet */ mesh_queue_preq (mpath,PREQ_Q_F_START );
@@ -815,6 +815,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,skb_unlink (skb_to_free, &mpath->frame_queue); } + info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ;skb_queue_tail (&mpath->frame_queue, skb);if (skb_to_free)mesh_path_discard_frame (skb_to_free, sdata);
net/mac80211/mesh_pathtbl.c +3 -5
@@ -478,11 +478,9 @@ enddel:*/ void mesh_path_tx_pending (struct mesh_path *mpath) { -struct sk_buff *skb; - -while ((skb =skb_dequeue (&mpath->frame_queue)) && - (mpath->flags &MESH_PATH_ACTIVE )) -dev_queue_xmit (skb); +if (mpath->flags &MESH_PATH_ACTIVE ) +ieee80211_add_pending_skbs (mpath->sdata->local, + &mpath->frame_queue); }/**
net/mac80211/rx.c +15 -2
@@ -1485,10 +1485,12 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)unsigned int hdrlen;struct sk_buff *skb = rx->skb, *fwd_skb;struct ieee80211_local *local = rx->local; +struct ieee80211_sub_if_data *sdata; hdr = (struct ieee80211_hdr *) skb->data; hdrlen =ieee80211_hdrlen (hdr->frame_control); mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen); + sdata =IEEE80211_DEV_TO_SUB_IF (rx->dev);if (!ieee80211_is_data (hdr->frame_control))return RX_CONTINUE ;
@@ -1498,10 +1500,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)return RX_DROP_MONITOR ;if (mesh_hdr->flags &MESH_FLAGS_AE_A5_A6 ){ -struct ieee80211_sub_if_data *sdata;struct mesh_path *mppath; - sdata =IEEE80211_DEV_TO_SUB_IF (rx->dev);rcu_read_lock (); mppath =mpp_path_lookup (mesh_hdr->eaddr2, sdata);if (!mppath) {
@@ -1547,6 +1547,19 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) info->flags |=IEEE80211_TX_INTFL_NEED_TXPROCESSING ; fwd_skb->iif = rx->dev->ifindex;ieee80211_select_queue (local, fwd_skb); +if (is_multicast_ether_addr (fwd_hdr->addr3)) +memcpy (fwd_hdr->addr1, fwd_hdr->addr3, +ETH_ALEN ); +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_frames);ieee80211_add_pending_skb (local, fwd_skb); } }
net/mac80211/tx.c +0 -3
@@ -1399,9 +1399,6 @@ static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,dev_put (sdata->dev);return ; } -if (memcmp (sdata->dev->dev_addr, hdr->addr4,ETH_ALEN ) !=0 ) -IEEE80211_IFSTA_MESH_CTR_INC (&sdata->u.mesh, - fwded_frames); }else if (unlikely (sdata->vif.type ==NL80211_IFTYPE_MONITOR )) {int hdrlen;u16 len_rthdr;
Signature · 1 line
1.5.4.3
Re: [PATCH v5] mac80211: Fix regression in mesh forwarding path.
Quoted 14 lines · On Tue, Jul 07, 2009 at 10:55:03AM -0700, [email protected] wrote:
From: Javier Cardona <[email protected]>
The removal of the master netdev broke the mesh forwarding path. This patch fixes it by using the new internal 'pending' queue.
As a result of this change, mesh forwarding no longer does the inefficient 802.11 -> 802.3 -> 802.11 conversion that was done before.
[Changes since v1]
Suggested by Johannes:
- Select queue before adding to mpath queue
-ieee80211_add_pending_skb->ieee80211_add_pending_skbs
- Remove unnecessary headerwme.h
Quoted 3 lines
Signed-off-by Javier Cardona <[email protected]>Signed-off-by Andrey Yurovsky <[email protected]>Reviewed-by Johannes Berg <[email protected]>
What tree are you basing this on?
Signature · 3 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready. ¡Viva Honduras Libre!
Re: [PATCH v5] mac80211: Fix regression in mesh forwarding path.
Quoted 15 lines · John W. Linville
Quoted 14 lines · On Tue, Jul 07, 2009 at 10:55:03AM -0700, [email protected] wrote:
From: Javier Cardona <[email protected]>
The removal of the master netdev broke the mesh forwarding path. This patch fixes it by using the new internal 'pending' queue.
As a result of this change, mesh forwarding no longer does the inefficient 802.11 -> 802.3 -> 802.11 conversion that was done before.
[Changes since v1]
Suggested by Johannes:
- Select queue before adding to mpath queue
-ieee80211_add_pending_skb->ieee80211_add_pending_skbs
- Remove unnecessary headerwme.h
Quoted 5 lines
Quoted 3 lines
Signed-off-by Javier Cardona <[email protected]>Signed-off-by Andrey Yurovsky <[email protected]>Reviewed-by Johannes Berg <[email protected]>What tree are you basing this on?
wireless-testing, the latest (re-spun) version applied on top of commit 5ac0fb5e5044cb578fb352dc65def1a46a2a21aa
Quoted 2 lines · Johannes Berg
That does a lot of locking operations -- can you not select the queue earlier, and use
ieee80211_add_pending_skbs?
Indeed. Just submitted v2 of the patch.
Thanks!
Javier
Signature · 3 lines
Javier Cardona cozybit Inc. http://www.cozybit.com