Skip to content

bonding: remove bond_next_slave()

Veaceslav Falico netdev 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest9 patches 4 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/9bonding: remove __get_next_port()drivers/net/bonding/bond_3ad.c+9 -250 replies
2/9bonding: remove __get_first_port()drivers/net/bonding/bond_3ad.c+4 -143 replies
3/9bonding: make ad_port_selection_logic() use bond_for_each_slave()drivers/net/bonding/bond_3ad.c+7 -20 replies
4/9bonding: make __get_active_agg() use bond_for_each_slave()drivers/net/bonding/bond_3ad.c+7 -80 replies
5/9bonding: make ad_agg_selection_logic() use bond_for_each_slave()drivers/net/bonding/bond_3ad.c+10 -120 replies
6/9bonding: make bond_3ad_unbind_slave() use bond_for_each_slave()drivers/net/bonding/bond_3ad.c+9 -40 replies
7/9bonding: remove unused __get_next_agg()drivers/net/bonding/bond_3ad.c+0 -220 replies
8/9bonding: don't use bond_next_slave() in bond_info_seq_next()drivers/net/bonding/bond_procfs.c+12 -40 replies
9/9bonding: remove bond_next_slave()drivers/net/bonding/bonding.h+0 -310 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH net-next 0/9] bonding: remove bond_next_slave()

(on top of "[PATCH net-next 0/2] bonding: fix 3ad slave (de)init" - the patchset is essential)

Hi,

As Ben Hutchings and Nikolay Aleksandrov correctly noted - bond_next_slave() already is not O(1), but rather O(n), so it's only useful for one-off operations and shouldn't be used widely - for example, for list traversal, which will take O(n^2) time, which will be disastrous for any hot path with a large number of slaves.

Currently, bond_next_slave() is used several times in 802.3ad and for seq_read - bond_info_seq_next().

The 802.3ad part uses it only in constructs like:

for (X = __get_first_X(); X; X = __get_next_X()) {

where __get_next_X() uses bond_next_slave().

This for can (and should) actually be replaced by the standard

bond_for_each_slave(bond, slave, iter) {
	X = __get_X_by_slave(slave);

it's faster, easier to read, debug and maintain. Also, removes a lot of code lines.

After replacing it, the only user of bond_next_slave() is bond_info_seq_next() - which can, actually, implement it by itself, and not call another function.

So, that way, we can completely remove the bond_next_slave(), cleanup and optimize a bit.

p.s. the 802.3ad code is horrible, both style-wise and from the logical point of view - so I've decided to *not* change anything except that what this patch is intended to provide. The cleanup and some refactoring should be done in another patchset, which I've began to work on already.

Thank you!

CC Jay Vosburgh <[email protected]>
CC Andy Gospodarek <[email protected]>
---
 drivers/net/bonding/bond_3ad.c    | 137 ++++++++++++++------------------------
 drivers/net/bonding/bond_main.c   |   2 +-
 drivers/net/bonding/bond_procfs.c |  16 +++--
 drivers/net/bonding/bonding.h     |  31 ---------
 4 files changed, 62 insertions(+), 124 deletions(-)