Preserve queue mapping with bonding and VLAN devices
Subsystems (3)
PATCH 1/1 Preserve queue mapping with bonding and VLAN devices
Must be applied with "[net-next-2.6 PATCH] Multiqueue support for bonding devices"
Forwarded packet goes more that once throught dev_queue_xmit() when using bonding or 802.1q VLAN devices, so we've lost rx-tx queue mapping index for real devices. This is because initial queue index value (as it recorded by skb_record_tx_queue()) is overwritten by skb_set_queue_mapping(). We need to store it somewhere else.
---
include/linux/skbuff.h +13 -7
@@ -375,7 +375,8 @@ struct sk_buff {#endif kmemcheck_bitfield_begin (flags2); - __u16 queue_mapping:16; + __u16 queue_mapping:8, + rx_queue_index:8;#ifdef CONFIG_IPV6_NDISC_NODETYPE __u8 ndisc_nodetype:2;#endif
@@ -2011,7 +2012,7 @@ static inline void skb_init_secmark(struct sk_buff *skb) { }#endif -static inline void skb_set_queue_mapping (struct sk_buff *skb,u16 queue_mapping) +static inline void skb_set_queue_mapping (struct sk_buff *skb,u8 queue_mapping) { skb->queue_mapping = queue_mapping; }
@@ -2026,22 +2027,27 @@ static inline void skb_copy_queue_mapping(struct sk_buff *to, const struct sk_bu to->queue_mapping = from->queue_mapping; } -static inline void skb_record_rx_queue (struct sk_buff *skb,u16 rx_queue) +static inline void skb_copy_rx_queue_index (struct sk_buff *to,const struct sk_buff *from) { - skb->queue_mapping = rx_queue +1 ; + to->rx_queue_index = from->rx_queue_index; +} + +static inline void skb_record_rx_queue (struct sk_buff *skb,u8 rx_queue) +{ + skb->rx_queue_index = rx_queue +1 ; }static inline u16 skb_get_rx_queue (const struct sk_buff *skb) { -return skb->queue_mapping -1 ; +return skb->rx_queue_index -1 ; }static inline bool skb_rx_queue_recorded (const struct sk_buff *skb) { -return (skb->queue_mapping !=0 ); +return (skb->rx_queue_index !=0 ); } -extern u16 skb_tx_hash (const struct net_device *dev, +extern u8 skb_tx_hash (const struct net_device *dev,const struct sk_buff *skb);#ifdef CONFIG_XFRM
net/core/dev.c +3 -3
@@ -1911,7 +1911,7 @@ out_kfree_skb:static u32 skb_tx_hashrnd; -u16 skb_tx_hash (const struct net_device *dev,const struct sk_buff *skb) +u8 skb_tx_hash (const struct net_device *dev,const struct sk_buff *skb) {u32 hash;
@@ -1929,7 +1929,7 @@ u16 skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb) hash =jhash_1word (hash, skb_tx_hashrnd); -return (u16) (((u64 ) hash * dev->real_num_tx_queues) >>32 ); +return (u8) (((u64 ) hash * dev->real_num_tx_queues) >>32 ); }EXPORT_SYMBOL (skb_tx_hash);
@@ -1950,7 +1950,7 @@ static inline u16 dev_cap_txqueue(struct net_device *dev, u16 queue_index)static struct netdev_queue *dev_pick_tx (struct net_device *dev,struct sk_buff *skb) { -u16 queue_index; +u8 queue_index;struct sock *sk = skb->sk;if (sk_tx_queue_recorded (sk)) {
net/core/skbuff.c +1 -0
@@ -543,6 +543,7 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) new->pkt_type = old->pkt_type; new->ip_summed = old->ip_summed;skb_copy_queue_mapping (new, old); +skb_copy_rx_queue_index (new, old); new->priority = old->priority;#if defined(CONFIG_IP_VS ) || defined(CONFIG_IP_VS_MODULE ) new->ipvs_property = old->ipvs_property;
---
Signature · 1 line
wbr, Oleg.
Quoted 6 lines · Oleg A. Arkhangelsky
Must be applied with "[net-next-2.6 PATCH] Multiqueue support for bonding devices"
Forwarded packet goes more that once throught
dev_queue_xmit()when using bonding or 802.1q VLAN devices, so we've lost rx-tx queue mapping index for real devices.
[...]
The queue mapping will normally be the same, only no longer biased by 1. So I think a better solution would be to maintain that bias on TX as well, or to remove the bias and reserve -1 for unknown RX queue.
We already have hardware that can do RSS across up to 128 RX queues, so an 8-bit limit is uncomfortably close.
Ben.
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
23.02.10, 15:59, "Ben Hutchings" <[email protected]>:
Quoted 3 lines
The queue mapping will normally be the same, only no longer biased by 1. So I think a better solution would be to maintain that bias on TX as well, or to remove the bias and reserve -1 for unknown RX queue.
Second try. Not tested but looks OK.
Must be applied with "[net-next-2.6 PATCH] Multiqueue support for bonding devices"
Forwarded packet goes through dev_queue_xmit() more that once when using bonding or 802.1q VLAN devices, so we've lost rx-tx queue mapping index for real devices. This is because initial queue index value (as it recorded by skb_record_tx_queue()) is overwritten by skb_set_queue_mapping().
--- drivers/net/bnx2.c | 2 +- drivers/net/bnx2x_main.c | 2 +- drivers/net/gianfar.c | 6 +++--- drivers/net/igb/igb_main.c | 2 +- drivers/net/ixgbe/ixgbe_main.c | 6 +++--- drivers/net/mlx4/en_tx.c | 2 +- drivers/net/niu.c | 2 +- drivers/net/qlge/qlge_main.c | 2 +- drivers/net/s2io.c | 2 +- include/linux/skbuff.h | 14 ++------------ net/core/dev.c | 2 +- 11 files changed, 16 insertions(+), 26 deletions(-)
drivers/net/bnx2.c +1 -1
@@ -3199,7 +3199,7 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget) skb->ip_summed =CHECKSUM_UNNECESSARY ; } -skb_record_rx_queue (skb, bnapi - &bp->bnx2_napi[0 ]); +skb_set_queue_mapping (skb, bnapi - &bp->bnx2_napi[0 ]);#ifdef BCM_VLAN if (hw_vlan)
drivers/net/bnx2x_main.c +1 -1
@@ -1681,7 +1681,7 @@ reuse_rx: } } -skb_record_rx_queue (skb, fp->index); +skb_set_queue_mapping (skb, fp->index);#ifdef BCM_VLAN if ((bp->vlgrp != NULL) && (bp->flags & HW_VLAN_RX_FLAG) &&
drivers/net/gianfar.c +3 -3
@@ -1934,7 +1934,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)unsigned int nr_frags, length; - rq = skb->queue_mapping; + rq =skb_get_queue_mapping (skb); tx_queue = priv->tx_queue[rq]; txq =netdev_get_tx_queue (dev, rq); base = tx_queue->tx_bd_base;
@@ -2466,7 +2466,7 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,/* Remove the FCB from the skb */ /* Remove the padded bytes, if there are any */ if (amount_pull) { -skb_record_rx_queue (skb, fcb->rq); +skb_set_queue_mapping (skb, fcb->rq);skb_pull (skb, amount_pull); }
@@ -2549,7 +2549,7 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)/* Remove the FCS from the packet length */ skb_put (skb, pkt_len); rx_queue->stats.rx_bytes += pkt_len; -skb_record_rx_queue (skb, rx_queue->qindex); +skb_set_queue_mapping (skb, rx_queue->qindex);gfar_process_frame (dev, skb, amount_pull); }else {
drivers/net/igb/igb_main.c +1 -1
@@ -3838,7 +3838,7 @@ static netdev_tx_t igb_xmit_frame_adv(struct sk_buff *skb,return NETDEV_TX_OK ; } - r_idx = skb->queue_mapping & (IGB_ABS_MAX_TX_QUEUES -1 ); + r_idx =skb_get_queue_mapping (skb) & (IGB_ABS_MAX_TX_QUEUES -1 ); tx_ring = adapter->multi_tx_table[r_idx];/* This goes back to the question of how to logically map a tx queue
drivers/net/ixgbe/ixgbe_main.c +3 -3
@@ -5636,13 +5636,13 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb, tx_flags |=vlan_tx_tag_get (skb);if (adapter->flags &IXGBE_FLAG_DCB_ENABLED ) { tx_flags &= ~IXGBE_TX_FLAGS_VLAN_PRIO_MASK ; - tx_flags |= ((skb->queue_mapping &0x7 ) <<13 ); + tx_flags |= ((skb_get_queue_mapping (skb) &0x7 ) <<13 ); } tx_flags <<=IXGBE_TX_FLAGS_VLAN_SHIFT ; tx_flags |=IXGBE_TX_FLAGS_VLAN ; }else if (adapter->flags &IXGBE_FLAG_DCB_ENABLED ) {if (skb->priority !=TC_PRIO_CONTROL ) { - tx_flags |= ((skb->queue_mapping &0x7 ) <<13 ); + tx_flags |= ((skb_get_queue_mapping (skb) &0x7 ) <<13 ); tx_flags <<=IXGBE_TX_FLAGS_VLAN_SHIFT ; tx_flags |=IXGBE_TX_FLAGS_VLAN ; }else {
@@ -5651,7 +5651,7 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb, } } - tx_ring = adapter->tx_ring[skb->queue_mapping]; + tx_ring = adapter->tx_ring[skb_get_queue_mapping (skb)];if ((adapter->flags &IXGBE_FLAG_FCOE_ENABLED ) && (skb->protocol ==htons (ETH_P_FCOE ))) {
drivers/net/mlx4/en_tx.c +1 -1
@@ -624,7 +624,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) goto tx_drop; } - tx_ind = skb->queue_mapping; + tx_ind =skb_get_queue_mapping (skb); ring = &priv->tx_ring[tx_ind];if (priv->vlgrp &&vlan_tx_tag_present (skb)) vlan_tag =vlan_tx_tag_get (skb);
drivers/net/niu.c +1 -1
@@ -3516,7 +3516,7 @@ static int niu_process_rx_pkt(struct napi_struct *napi, struct niu *np, rp->rx_bytes += skb->len; skb->protocol =eth_type_trans (skb, np->dev); -skb_record_rx_queue (skb, rp->rx_channel); +skb_set_queue_mapping (skb, rp->rx_channel);napi_gro_receive (napi, skb);return num_rcr;
drivers/net/qlge/qlge_main.c +1 -1
@@ -2525,7 +2525,7 @@ static netdev_tx_t qlge_send(struct sk_buff *skb, struct net_device *ndev)struct ql_adapter *qdev =netdev_priv (ndev);int tso;struct tx_ring *tx_ring; -u32 tx_ring_idx = (u32 ) skb->queue_mapping; +u32 tx_ring_idx = (u32 )skb_get_queue_mapping (skb); tx_ring = &qdev->tx_ring[tx_ring_idx];
drivers/net/s2io.c +1 -1
@@ -7549,7 +7549,7 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp) swstats->mem_freed += skb->truesize; send_up: -skb_record_rx_queue (skb, ring_no); +skb_set_queue_mapping (skb, ring_no);queue_rx_frame (skb,RXD_GET_VLAN_TAG (rxdp->Control_2)); aggregate: sp->mac_control.rings[ring_no].rx_bufs_left -=1 ;
include/linux/skbuff.h +2 -12
@@ -2013,12 +2013,12 @@ static inline void skb_init_secmark(struct sk_buff *skb)static inline void skb_set_queue_mapping (struct sk_buff *skb,u16 queue_mapping) { - skb->queue_mapping = queue_mapping; + skb->queue_mapping = queue_mapping +1 ; }static inline u16 skb_get_queue_mapping (const struct sk_buff *skb) { -return skb->queue_mapping; +return skb->queue_mapping -1 ; }static inline void skb_copy_queue_mapping (struct sk_buff *to,const struct sk_buff *from)
@@ -2026,16 +2026,6 @@ static inline void skb_copy_queue_mapping(struct sk_buff *to, const struct sk_bu to->queue_mapping = from->queue_mapping; } -static inline void skb_record_rx_queue (struct sk_buff *skb,u16 rx_queue) -{ - skb->queue_mapping = rx_queue +1 ; -} - -static inline u16 skb_get_rx_queue (const struct sk_buff *skb) -{ -return skb->queue_mapping -1 ; -} -static inline bool skb_rx_queue_recorded (const struct sk_buff *skb) {return (skb->queue_mapping !=0 );
net/core/dev.c +1 -1
@@ -1916,7 +1916,7 @@ u16 skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb)u32 hash;if (skb_rx_queue_recorded (skb)) { - hash =skb_get_rx_queue (skb); + hash =skb_get_queue_mapping (skb);while (unlikely (hash >= dev->real_num_tx_queues)) hash -= dev->real_num_tx_queues;return hash;
---
Signature · 1 line
wbr, Oleg.
Jeff Kirsher
Acked-byQuoted 29 lines · Oleg A. Arkhangelsky
23.02.10, 15:59, "Ben Hutchings" <[email protected]>:
Quoted 3 lines
The queue mapping will normally be the same, only no longer biased by 1. So I think a better solution would be to maintain that bias on TX as well, or to remove the bias and reserve -1 for unknown RX queue.
Second try. Not tested but looks OK.
Must be applied with "[net-next-2.6 PATCH] Multiqueue support for bonding devices"
Forwarded packet goes through
dev_queue_xmit()more that once when using bonding or 802.1q VLAN devices, so we've lost rx-tx queue mapping index for real devices. This is because initial queue index value (as it recorded byskb_record_tx_queue()) is overwritten byskb_set_queue_mapping().Signed-off-by Oleg A. Arkhangelsky <[email protected]>---
drivers/net/bnx2.c | 2 +-drivers/net/bnx2x_main.c| 2 +-drivers/net/gianfar.c| 6 +++---drivers/net/igb/igb_main.c| 2 +-drivers/net/ixgbe/ixgbe_main.c| 6 +++---drivers/net/mlx4/en_tx.c| 2 +-drivers/net/niu.c| 2 +-drivers/net/qlge/qlge_main.c| 2 +-drivers/net/s2io.c| 2 +-include/linux/skbuff.h| 14 ++------------net/core/dev.c| 2 +-
Quoted 2 lines
11 files changed, 16 insertions(+), 26 deletions(-)
Intel driver changes look fine...
Signature · 2 lines
Cheers, Jeff
David Miller
maintainerFrom: "\"Oleg A. Arkhangelsky\"" <[email protected]>
Date: Tue, 23 Feb 2010 22:36:00 +0300
Quoted 8 lines
23.02.10, 15:59, "Ben Hutchings" <[email protected]>:
Quoted 3 lines
The queue mapping will normally be the same, only no longer biased by 1. So I think a better solution would be to maintain that bias on TX as well, or to remove the bias and reserve -1 for unknown RX queue.
Second try. Not tested but looks OK.
Quoted 8 lines
Must be applied with "[net-next-2.6 PATCH] Multiqueue support for bonding devices"
Forwarded packet goes through
dev_queue_xmit()more that once when using bonding or 802.1q VLAN devices, so we've lost rx-tx queue mapping index for real devices. This is because initial queue index value (as it recorded byskb_record_tx_queue()) is overwritten byskb_set_queue_mapping().Signed-off-by Oleg A. Arkhangelsky <[email protected]>
Your patches are fine, but they are whitespace corrupted by your email client (tabs turned into spaces, etc.) so they won't apply properly.
Please fix this up and resend your patches.
Thanks!
26.02.10, 05:50, "David Miller" <[email protected]>:
Quoted 7 lines
Your patches are fine, but they are whitespace corrupted by your email client (tabs turned into spaces, etc.) so they won't apply properly.
Please fix this up and resend your patches.
Thanks!
I'm sorry, corrected it. By the way additional check was added to return 0 in skb_get_queue_mapping() when skb->queue_mapping = 0. Initial multiqueue support for bonding is also included here.
---
1. Forwarded packet goes through dev_queue_xmit() more that once when using bonding or 802.1q VLAN devices, so we've lost rx-tx queue mapping index for real devices. This is because initial queue index value (as it recorded by skb_record_tx_queue()) is overwritten
by skb_set_queue_mapping().
2. Initial multiqueue support for bonding devices. Make bonding driver multiqueue aware.
--- drivers/net/bnx2.c | 2 +- drivers/net/bnx2x_main.c | 2 +- drivers/net/bonding/bond_main.c | 5 +++-- drivers/net/bonding/bonding.h | 1 + drivers/net/gianfar.c | 6 +++--- drivers/net/igb/igb_main.c | 2 +- drivers/net/ixgbe/ixgbe_main.c | 6 +++--- drivers/net/mlx4/en_tx.c | 2 +- drivers/net/niu.c | 2 +- drivers/net/qlge/qlge_main.c | 2 +- drivers/net/s2io.c | 2 +- include/linux/skbuff.h | 14 ++------------ net/core/dev.c | 2 +- 13 files changed, 20 insertions(+), 28 deletions(-)
drivers/net/bnx2.c +1 -1
@@ -3199,7 +3199,7 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget) skb->ip_summed =CHECKSUM_UNNECESSARY ; } -skb_record_rx_queue (skb, bnapi - &bp->bnx2_napi[0 ]); +skb_set_queue_mapping (skb, bnapi - &bp->bnx2_napi[0 ]);#ifdef BCM_VLAN if (hw_vlan)
drivers/net/bnx2x_main.c +1 -1
@@ -1681,7 +1681,7 @@ reuse_rx: } } -skb_record_rx_queue (skb, fp->index); +skb_set_queue_mapping (skb, fp->index);#ifdef BCM_VLAN if ((bp->vlgrp != NULL) && (bp->flags & HW_VLAN_RX_FLAG) &&
drivers/net/bonding/bond_main.c +3 -2
@@ -4928,8 +4928,9 @@ int bond_create(struct net *net, const char *name)rtnl_lock (); - bond_dev =alloc_netdev (sizeof (struct bonding ), name ? name :"" , - bond_setup); + bond_dev =alloc_netdev_mq (sizeof (struct bonding ), name ? name :"" , + bond_setup, +min_t (u32,BOND_MAX_TX_QUEUES ,num_online_cpus ()));if (!bond_dev) {pr_err ("%s: eek! can't alloc netdev!\n" , name); res = -ENOMEM ;
drivers/net/bonding/bonding.h +1 -0
@@ -29,6 +29,7 @@#define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"#define BOND_MAX_ARP_TARGETS 16 +#define BOND_MAX_TX_QUEUES 8#define IS_UP (dev) \ ((((dev)->flags & IFF_UP) == IFF_UP) && \
drivers/net/gianfar.c +3 -3
@@ -1934,7 +1934,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)unsigned int nr_frags, length; - rq = skb->queue_mapping; + rq =skb_get_queue_mapping (skb); tx_queue = priv->tx_queue[rq]; txq =netdev_get_tx_queue (dev, rq); base = tx_queue->tx_bd_base;
@@ -2466,7 +2466,7 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,/* Remove the FCB from the skb */ /* Remove the padded bytes, if there are any */ if (amount_pull) { -skb_record_rx_queue (skb, fcb->rq); +skb_set_queue_mapping (skb, fcb->rq);skb_pull (skb, amount_pull); }
@@ -2549,7 +2549,7 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)/* Remove the FCS from the packet length */ skb_put (skb, pkt_len); rx_queue->stats.rx_bytes += pkt_len; -skb_record_rx_queue (skb, rx_queue->qindex); +skb_set_queue_mapping (skb, rx_queue->qindex);gfar_process_frame (dev, skb, amount_pull); }else {
drivers/net/igb/igb_main.c +1 -1
@@ -3838,7 +3838,7 @@ static netdev_tx_t igb_xmit_frame_adv(struct sk_buff *skb,return NETDEV_TX_OK ; } - r_idx = skb->queue_mapping & (IGB_ABS_MAX_TX_QUEUES -1 ); + r_idx =skb_get_queue_mapping (skb) & (IGB_ABS_MAX_TX_QUEUES -1 ); tx_ring = adapter->multi_tx_table[r_idx];/* This goes back to the question of how to logically map a tx queue
drivers/net/ixgbe/ixgbe_main.c +3 -3
@@ -5662,13 +5662,13 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb, tx_flags |=vlan_tx_tag_get (skb);if (adapter->flags &IXGBE_FLAG_DCB_ENABLED ) { tx_flags &= ~IXGBE_TX_FLAGS_VLAN_PRIO_MASK ; - tx_flags |= ((skb->queue_mapping &0x7 ) <<13 ); + tx_flags |= ((skb_get_queue_mapping (skb) &0x7 ) <<13 ); } tx_flags <<=IXGBE_TX_FLAGS_VLAN_SHIFT ; tx_flags |=IXGBE_TX_FLAGS_VLAN ; }else if (adapter->flags &IXGBE_FLAG_DCB_ENABLED ) {if (skb->priority !=TC_PRIO_CONTROL ) { - tx_flags |= ((skb->queue_mapping &0x7 ) <<13 ); + tx_flags |= ((skb_get_queue_mapping (skb) &0x7 ) <<13 ); tx_flags <<=IXGBE_TX_FLAGS_VLAN_SHIFT ; tx_flags |=IXGBE_TX_FLAGS_VLAN ; }else {
@@ -5677,7 +5677,7 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb, } } - tx_ring = adapter->tx_ring[skb->queue_mapping]; + tx_ring = adapter->tx_ring[skb_get_queue_mapping (skb)];if ((adapter->flags &IXGBE_FLAG_FCOE_ENABLED ) && (skb->protocol ==htons (ETH_P_FCOE ))) {
drivers/net/mlx4/en_tx.c +1 -1
@@ -624,7 +624,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) goto tx_drop; } - tx_ind = skb->queue_mapping; + tx_ind =skb_get_queue_mapping (skb); ring = &priv->tx_ring[tx_ind];if (priv->vlgrp &&vlan_tx_tag_present (skb)) vlan_tag =vlan_tx_tag_get (skb);
drivers/net/niu.c +1 -1
@@ -3516,7 +3516,7 @@ static int niu_process_rx_pkt(struct napi_struct *napi, struct niu *np, rp->rx_bytes += skb->len; skb->protocol =eth_type_trans (skb, np->dev); -skb_record_rx_queue (skb, rp->rx_channel); +skb_set_queue_mapping (skb, rp->rx_channel);napi_gro_receive (napi, skb);return num_rcr;
drivers/net/qlge/qlge_main.c +1 -1
@@ -2525,7 +2525,7 @@ static netdev_tx_t qlge_send(struct sk_buff *skb, struct net_device *ndev)struct ql_adapter *qdev =netdev_priv (ndev);int tso;struct tx_ring *tx_ring; -u32 tx_ring_idx = (u32 ) skb->queue_mapping; +u32 tx_ring_idx = (u32 )skb_get_queue_mapping (skb); tx_ring = &qdev->tx_ring[tx_ring_idx];
drivers/net/s2io.c +1 -1
@@ -7549,7 +7549,7 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp) swstats->mem_freed += skb->truesize; send_up: -skb_record_rx_queue (skb, ring_no); +skb_set_queue_mapping (skb, ring_no);queue_rx_frame (skb,RXD_GET_VLAN_TAG (rxdp->Control_2)); aggregate: sp->mac_control.rings[ring_no].rx_bufs_left -=1 ;
include/linux/skbuff.h +2 -12
@@ -2013,12 +2013,12 @@ static inline void skb_init_secmark(struct sk_buff *skb)static inline void skb_set_queue_mapping (struct sk_buff *skb,u16 queue_mapping) { - skb->queue_mapping = queue_mapping; + skb->queue_mapping = queue_mapping +1 ; }static inline u16 skb_get_queue_mapping (const struct sk_buff *skb) { -return skb->queue_mapping; +return skb_rx_queue_recorded (skb) ? skb->queue_mapping -1 :0 ; }static inline void skb_copy_queue_mapping (struct sk_buff *to,const struct sk_buff *from)
@@ -2026,16 +2026,6 @@ static inline void skb_copy_queue_mapping(struct sk_buff *to, const struct sk_bu to->queue_mapping = from->queue_mapping; } -static inline void skb_record_rx_queue (struct sk_buff *skb,u16 rx_queue) -{ - skb->queue_mapping = rx_queue +1 ; -} - -static inline u16 skb_get_rx_queue (const struct sk_buff *skb) -{ -return skb->queue_mapping -1 ; -} -static inline bool skb_rx_queue_recorded (const struct sk_buff *skb) {return (skb->queue_mapping !=0 );
net/core/dev.c +1 -1
@@ -1916,7 +1916,7 @@ u16 skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb)u32 hash;if (skb_rx_queue_recorded (skb)) { - hash =skb_get_rx_queue (skb); + hash = skb->queue_mapping -1 ;while (unlikely (hash >= dev->real_num_tx_queues)) hash -= dev->real_num_tx_queues;return hash;
---
Signature · 1 line
wbr, Oleg.
David Miller
maintainerFrom: "\"Oleg A. Arkhangelsky\"" <[email protected]>
Date: Sat, 27 Feb 2010 12:53:02 +0300
Quoted 11 lines
26.02.10, 05:50, "David Miller" <[email protected]>:
Quoted 7 lines
Your patches are fine, but they are whitespace corrupted by your email client (tabs turned into spaces, etc.) so they won't apply properly.
Please fix this up and resend your patches.
Thanks!
I'm sorry, corrected it.
I said "patches", plural.
Both your patches had whitespace issues.
Please resend both patches, as a series, with the whitespace fixed.