From: Jay Vosburgh <fubar@us•ibm.com>
To: Neil Horman <nhorman@tuxdriver•com>
Cc: netdev@vger•kernel.org, Andy Gospodarek <andy@greyhouse•net>,
"David S. Miller" <davem@davemloft•net>
Subject: Re: [PATCH] bonding: reset queue mapping prior to transmission to physical device (v5)
Date: Fri, 03 Jun 2011 16:31:06 -0700 [thread overview]
Message-ID: <26637.1307143866@death> (raw)
In-Reply-To: <1307133352-4111-1-git-send-email-nhorman@tuxdriver.com>
Neil Horman <nhorman@tuxdriver•com> wrote:
>The bonding driver is multiqueue enabled, in which each queue represents a slave
>to enable optional steering of output frames to given slaves against the default
>output policy. However, it needs to reset the skb->queue_mapping prior to
>queuing to the physical device or the physical slave (if it is multiqueue) could
>wind up transmitting on an unintended tx queue
>
>Change Notes:
>v2) Based on first pass review, updated the patch to restore the origional queue
>mapping that was found in bond_select_queue, rather than simply resetting to
>zero. This preserves the value of queue_mapping when it was set on receive in
>the forwarding case which is desireable.
>
>v3) Fixed spelling an casting error in skb->cb
>
>v4) fixed to store raw queue_mapping to avoid double decrement
>
>v5) Eric D requested that ->cb access be wrapped in a macro.
Shouldn't the change log go below the "---" so it doesn't end up
in the git commit log?
In any event, I looked for ways into bond_dev_queue_xmit without
first passing through bond_select_queue (lest stale cb[] data intrude),
and I don't see any, so I think this is ok.
Signed-off-by: Jay Vosburgh <fubar@us•ibm.com>
-J
>Signed-off-by: Neil Horman <nhorman@tuxdriver•com>
>CC: Jay Vosburgh <fubar@us•ibm.com>
>CC: Andy Gospodarek <andy@greyhouse•net>
>CC: "David S. Miller" <davem@davemloft•net>
>---
> drivers/net/bonding/bond_main.c | 11 +++++++++++
> 1 files changed, 11 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>index 17b4dd9..abf6e19 100644
>--- a/drivers/net/bonding/bond_main.c
>+++ b/drivers/net/bonding/bond_main.c
>@@ -388,6 +388,8 @@ struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr)
> return next;
> }
>
>+#define bond_queue_mapping(skb) (*(u16 *)((skb)->cb))
>+
> /**
> * bond_dev_queue_xmit - Prepare skb for xmit.
> *
>@@ -400,6 +402,9 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
> {
> skb->dev = slave_dev;
> skb->priority = 1;
>+
>+ skb->queue_mapping = bond_queue_mapping(skb);
>+
> if (unlikely(netpoll_tx_running(slave_dev)))
> bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb);
> else
>@@ -4206,6 +4211,7 @@ static inline int bond_slave_override(struct bonding *bond,
> return res;
> }
>
>+
> static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb)
> {
> /*
>@@ -4216,6 +4222,11 @@ static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb)
> */
> u16 txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) : 0;
>
>+ /*
>+ * Save the original txq to restore before passing to the driver
>+ */
>+ bond_queue_mapping(skb) = skb->queue_mapping;
>+
> if (unlikely(txq >= dev->real_num_tx_queues)) {
> do {
> txq -= dev->real_num_tx_queues;
>--
>1.7.3.4
>
---
-Jay Vosburgh, IBM Linux Technology Center, fubar@us•ibm.com
next prev parent reply other threads:[~2011-06-03 23:31 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-02 18:03 [PATCH] bonding: reset queue mapping prior to transmission to physical device Neil Horman
2011-06-02 18:35 ` Ben Hutchings
2011-06-02 18:56 ` Neil Horman
2011-06-02 19:09 ` Ben Hutchings
2011-06-02 19:46 ` Neil Horman
2011-06-02 19:52 ` Nicolas de Pesloüan
2011-06-02 20:04 ` David Miller
2011-06-02 20:13 ` Nicolas de Pesloüan
2011-06-02 20:46 ` David Miller
2011-06-02 20:51 ` Ben Hutchings
2011-06-02 21:10 ` David Miller
2011-06-02 20:13 ` Ben Hutchings
2011-06-03 1:16 ` Neil Horman
2011-06-02 19:59 ` David Miller
2011-06-02 20:07 ` David Miller
2011-06-02 20:22 ` Nicolas de Pesloüan
2011-06-03 1:04 ` Neil Horman
2011-06-03 13:26 ` [PATCH] bonding: reset queue mapping prior to transmission to physical device (v2) Neil Horman
2011-06-03 14:43 ` Ben Hutchings
2011-06-03 17:32 ` [PATCH] bonding: reset queue mapping prior to transmission to physical device (v3) Neil Horman
2011-06-03 17:59 ` Ben Hutchings
2011-06-03 18:36 ` Neil Horman
2011-06-03 19:12 ` Ben Hutchings
2011-06-03 19:23 ` Neil Horman
2011-06-03 19:24 ` [PATCH] bonding: reset queue mapping prior to transmission to physical device (v4) Neil Horman
2011-06-03 19:48 ` Eric Dumazet
2011-06-03 19:57 ` Neil Horman
2011-06-03 20:05 ` Eric Dumazet
2011-06-03 20:35 ` [PATCH] bonding: reset queue mapping prior to transmission to physical device (v5) Neil Horman
2011-06-03 23:31 ` Jay Vosburgh [this message]
2011-06-05 21:32 ` David Miller
2011-06-03 18:06 ` [PATCH] bonding: reset queue mapping prior to transmission to physical device (v3) Jay Vosburgh
2011-06-03 14:59 ` [PATCH] bonding: reset queue mapping prior to transmission to physical device (v2) Vitalii Demianets
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=26637.1307143866@death \
--to=fubar@us$(echo .)ibm.com \
--cc=andy@greyhouse$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nhorman@tuxdriver$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox