From: Maor Gottlieb <maorg@mellanox.com>
To: davem@davemloft.net, jgg@mellanox.com, dledford@redhat.com,
j.vosburgh@gmail.com, vfalico@gmail.com, andy@greyhouse.net,
kuba@kernel.org, jiri@mellanox.com, dsahern@kernel.org
Cc: leonro@mellanox.com, saeedm@mellanox.com,
linux-rdma@vger.kernel.org, netdev@vger.kernel.org,
alexr@mellanox.com, Maor Gottlieb <maorg@mellanox.com>
Subject: [PATCH 05/16] bonding: Add helper function to get the xmit slave based on hash
Date: Sun, 26 Apr 2020 10:17:06 +0300 [thread overview]
Message-ID: <20200426071717.17088-6-maorg@mellanox.com> (raw)
In-Reply-To: <20200426071717.17088-1-maorg@mellanox.com>
Both xor and 802.3ad modes use bond_xmit_hash to get the xmit slave.
Export the logic to helper function so it could be used in the
following patches by the .ndo to get the xmit slave.
Signed-off-by: Maor Gottlieb <maorg@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Jay Vosburgh <jay.vosburgh@canonical.com>
---
drivers/net/bonding/bond_main.c | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 2cb41d480ae2..8e6305955c75 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4185,6 +4185,23 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave)
return ret;
}
+static struct slave *bond_xmit_3ad_xor_slave_get(struct bonding *bond,
+ struct sk_buff *skb,
+ struct bond_up_slave *slaves)
+{
+ struct slave *slave;
+ unsigned int count;
+ u32 hash;
+
+ hash = bond_xmit_hash(bond, skb);
+ count = slaves ? READ_ONCE(slaves->count) : 0;
+ if (unlikely(!count))
+ return NULL;
+
+ slave = slaves->arr[hash % count];
+ return slave;
+}
+
/* Use this Xmit function for 3AD as well as XOR modes. The current
* usable slave array is formed in the control path. The xmit function
* just calculates hash and sends the packet out.
@@ -4193,18 +4210,15 @@ static netdev_tx_t bond_3ad_xor_xmit(struct sk_buff *skb,
struct net_device *dev)
{
struct bonding *bond = netdev_priv(dev);
- struct slave *slave;
struct bond_up_slave *slaves;
- unsigned int count;
+ struct slave *slave;
slaves = rcu_dereference(bond->usable_slaves);
- count = slaves ? READ_ONCE(slaves->count) : 0;
- if (likely(count)) {
- slave = slaves->arr[bond_xmit_hash(bond, skb) % count];
+ slave = bond_xmit_3ad_xor_slave_get(bond, skb, slaves);
+ if (likely(slave))
bond_dev_queue_xmit(bond, skb, slave->dev);
- } else {
+ else
bond_tx_drop(dev, skb);
- }
return NETDEV_TX_OK;
}
--
2.17.2
next prev parent reply other threads:[~2020-04-26 7:17 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-26 7:17 [PATCH 00/16] Add support to get xmit slave Maor Gottlieb
2020-04-26 7:17 ` [PATCH V6 mlx5-next 01/16] net/core: Introduce netdev_get_xmit_slave Maor Gottlieb
2020-04-26 16:03 ` David Ahern
2020-04-26 7:17 ` [PATCH V6 mlx5-next 02/16] bonding: Export skip slave logic to function Maor Gottlieb
2020-04-26 7:17 ` [PATCH V6 mlx5-next 03/16] bonding: Rename slave_arr to usable_slaves Maor Gottlieb
2020-04-26 7:17 ` [PATCH V6 mlx5-next 04/16] bonding/alb: Add helper functions to get the xmit slave Maor Gottlieb
2020-04-26 7:17 ` Maor Gottlieb [this message]
2020-04-26 7:17 ` [PATCH V6 mlx5-next 06/16] bonding: Add helper function to get the xmit slave in rr mode Maor Gottlieb
2020-04-26 7:17 ` [PATCH V6 mlx5-next 07/16] bonding: Add function to get the xmit slave in active-backup mode Maor Gottlieb
2020-04-26 7:17 ` [PATCH V6 mlx5-next 08/16] bonding: Add array of all slaves Maor Gottlieb
2020-04-26 7:17 ` [PATCH V6 mlx5-next 09/16] bonding: Implement ndo_get_xmit_slave Maor Gottlieb
2020-04-26 7:17 ` [PATCH V6 mlx5-next 10/16] RDMA: Group create AH arguments in struct Maor Gottlieb
2020-04-28 8:39 ` Devesh Sharma
2020-04-28 10:17 ` Gal Pressman
2020-04-28 10:51 ` liweihang
2020-04-28 23:15 ` Jason Gunthorpe
2020-04-26 7:17 ` [PATCH V6 mlx5-next 11/16] RDMA/core: Add LAG functionality Maor Gottlieb
2020-04-28 23:15 ` Jason Gunthorpe
2020-04-28 23:30 ` Jason Gunthorpe
2020-04-29 9:01 ` Maor Gottlieb
2020-04-29 15:01 ` Jason Gunthorpe
2020-04-26 7:17 ` [PATCH V6 mlx5-next 12/16] RDMA/core: Get xmit slave for LAG Maor Gottlieb
2020-04-28 23:33 ` Jason Gunthorpe
2020-04-26 7:17 ` [PATCH V6 mlx5-next 13/16] net/mlx5: Change lag mutex lock to spin lock Maor Gottlieb
2020-04-28 23:23 ` Jason Gunthorpe
2020-04-26 7:17 ` [PATCH V6 mlx5-next 14/16] net/mlx5: Add support to get lag physical port Maor Gottlieb
2020-04-26 7:17 ` [PATCH V6 mlx5-next 15/16] RDMA/mlx5: Refactor affinity related code Maor Gottlieb
2020-04-26 7:17 ` [PATCH V6 mlx5-next 16/16] RDMA/mlx5: Set lag tx affinity according to slave Maor Gottlieb
2020-04-26 7:37 ` [PATCH 00/16] Add support to get xmit slave Maor Gottlieb
2020-04-28 20:04 ` Saeed Mahameed
2020-04-28 21:37 ` David Miller
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=20200426071717.17088-6-maorg@mellanox.com \
--to=maorg@mellanox.com \
--cc=alexr@mellanox.com \
--cc=andy@greyhouse.net \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=dsahern@kernel.org \
--cc=j.vosburgh@gmail.com \
--cc=jgg@mellanox.com \
--cc=jiri@mellanox.com \
--cc=kuba@kernel.org \
--cc=leonro@mellanox.com \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
--cc=vfalico@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).