diff mbox series

bonding: allow nesting of bonding device

Message ID 20210623032108.51472-1-zhudi21@huawei.com (mailing list archive)
State Accepted
Commit 4d293fe1c69c157c15ac06918a805e5fef036682
Delegated to: Netdev Maintainers
Headers show
Series bonding: allow nesting of bonding device | expand

Checks

Context Check Description
netdev/tree_selection success Guessing tree name failed - patch did not apply

Commit Message

zhudi (J) June 23, 2021, 3:21 a.m. UTC 
From: Di Zhu <zhudi21@huawei.com>

The commit 3c9ef511b9fa ("bonding: avoid adding slave device with
IFF_MASTER flag") fix a crash when add slave device with IFF_MASTER,
but it rejects the scenario of nested bonding device.

As Eric Dumazet described: since there indeed is a usage scenario about
nesting bonding, we should not break it.

So we add a new judgment condition to allow nesting of bonding device.

Fixes: 3c9ef511b9fa ("bonding: avoid adding slave device with IFF_MASTER flag")
Suggested-by: Jay Vosburgh <jay.vosburgh@canonical.com>
Signed-off-by: Di Zhu <zhudi21@huawei.com>
---
 drivers/net/bonding/bond_main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

patchwork-bot+netdevbpf@kernel.org June 23, 2021, 8:50 p.m. UTC | #1 
Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Wed, 23 Jun 2021 11:21:08 +0800 you wrote:
> From: Di Zhu <zhudi21@huawei.com>
> 
> The commit 3c9ef511b9fa ("bonding: avoid adding slave device with
> IFF_MASTER flag") fix a crash when add slave device with IFF_MASTER,
> but it rejects the scenario of nested bonding device.
> 
> As Eric Dumazet described: since there indeed is a usage scenario about
> nesting bonding, we should not break it.
> 
> [...]

Here is the summary with links:
  - bonding: allow nesting of bonding device
    https://git.kernel.org/netdev/net/c/4d293fe1c69c

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
diff mbox series

Patch

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 16840c9bc00d..03b1a93d7fea 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1601,7 +1601,9 @@  int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
 	int link_reporting;
 	int res = 0, i;
 
-	if (slave_dev->flags & IFF_MASTER) {
+	if (slave_dev->flags & IFF_MASTER &&
+	    !netif_is_bond_master(slave_dev)) {
+		NL_SET_ERR_MSG(extack, "Device with IFF_MASTER cannot be enslaved");
 		netdev_err(bond_dev,
 			   "Error: Device with IFF_MASTER cannot be enslaved\n");
 		return -EPERM;