| From foo@baz Thu Jun 8 09:17:40 CEST 2017 |
| From: "Mintz, Yuval" <Yuval.Mintz@cavium.com> |
| Date: Thu, 1 Jun 2017 15:57:56 +0300 |
| Subject: bnx2x: Fix Multi-Cos |
| |
| From: "Mintz, Yuval" <Yuval.Mintz@cavium.com> |
| |
| |
| [ Upstream commit 3968d38917eb9bd0cd391265f6c9c538d9b33ffa ] |
| |
| Apparently multi-cos isn't working for bnx2x quite some time - |
| driver implements ndo_select_queue() to allow queue-selection |
| for FCoE, but the regular L2 flow would cause it to modulo the |
| fallback's result by the number of queues. |
| The fallback would return a queue matching the needed tc |
| [via __skb_tx_hash()], but since the modulo is by the number of TSS |
| queues where number of TCs is not accounted, transmission would always |
| be done by a queue configured into using TC0. |
| |
| Fixes: ada7c19e6d27 ("bnx2x: use XPS if possible for bnx2x_select_queue instead of pure hash") |
| Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c |
| +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c |
| @@ -1929,7 +1929,7 @@ u16 bnx2x_select_queue(struct net_device |
| } |
| |
| /* select a non-FCoE queue */ |
| - return fallback(dev, skb) % BNX2X_NUM_ETH_QUEUES(bp); |
| + return fallback(dev, skb) % (BNX2X_NUM_ETH_QUEUES(bp) * bp->max_cos); |
| } |
| |
| void bnx2x_set_num_queues(struct bnx2x *bp) |
