| Message ID | 20210728033505.1627-1-zhudi21@huawei.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | bonding: Avoid adding slave devices to inactive bonding | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | warning | 1 maintainers not CCed: andy@greyhouse.net |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 11 this patch: 11 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 30 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 11 this patch: 11 |
| netdev/header_inline | success | Link |
zhudi <zhudi21@huawei.com> wrote: >We need to refuse to add slave devices to the bonding which does >not set IFF_UP flag, otherwise some problems will be caused(such as >bond_set_carrier() will not sync carrier state to upper net device). >The ifenslave command can prevent such use case, but through the sysfs >interface, slave devices can still be added regardless of whether >the bonding is set with IFF_UP flag or not. What specifically happens in the carrier state issue you mention? Are there other specific issues? As far as I can recall, adding interfaces to the bond while the bond is down has worked for a very long time, so I'm concerned that disabling that functionality will have impact on existing configurations. Also, to the best of my knowledge, the currently packaged ifenslave programs are scripts that utilize the sysfs interface. I'm unaware of current usage of the old C ifenslave program (removed from the kernel source in 2013), although the kernel code should still support it. -J >So we introduce a new BOND_OPTFLAG_IFUP flag to avoid adding slave >devices to inactive bonding. > >Signed-off-by: zhudi <zhudi21@huawei.com> >--- > drivers/net/bonding/bond_options.c | 4 +++- > include/net/bond_options.h | 4 +++- > 2 files changed, 6 insertions(+), 2 deletions(-) > >diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c >index 0cf25de6f46d..6d2f44b3528d 100644 >--- a/drivers/net/bonding/bond_options.c >+++ b/drivers/net/bonding/bond_options.c >@@ -387,7 +387,7 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = { > .id = BOND_OPT_SLAVES, > .name = "slaves", > .desc = "Slave membership management", >- .flags = BOND_OPTFLAG_RAWVAL, >+ .flags = BOND_OPTFLAG_RAWVAL | BOND_OPTFLAG_IFUP, > .set = bond_option_slaves_set > }, > [BOND_OPT_TLB_DYNAMIC_LB] = { >@@ -583,6 +583,8 @@ static int bond_opt_check_deps(struct bonding *bond, > return -ENOTEMPTY; > if ((opt->flags & BOND_OPTFLAG_IFDOWN) && (bond->dev->flags & IFF_UP)) > return -EBUSY; >+ if ((opt->flags & BOND_OPTFLAG_IFUP) && !(bond->dev->flags & IFF_UP)) >+ return -EPERM; > > return 0; > } >diff --git a/include/net/bond_options.h b/include/net/bond_options.h >index 9d382f2f0bc5..742f5cc81adf 100644 >--- a/include/net/bond_options.h >+++ b/include/net/bond_options.h >@@ -15,11 +15,13 @@ > * BOND_OPTFLAG_NOSLAVES - check if the bond device is empty before setting > * BOND_OPTFLAG_IFDOWN - check if the bond device is down before setting > * BOND_OPTFLAG_RAWVAL - the option parses the value itself >+ * BOND_OPTFLAG_IFUP - check if the bond device is up before setting > */ > enum { > BOND_OPTFLAG_NOSLAVES = BIT(0), > BOND_OPTFLAG_IFDOWN = BIT(1), >- BOND_OPTFLAG_RAWVAL = BIT(2) >+ BOND_OPTFLAG_RAWVAL = BIT(2), >+ BOND_OPTFLAG_IFUP = BIT(3) > }; > > /* Value type flags: >-- >2.27.0 > --- -Jay Vosburgh, jay.vosburgh@canonical.com
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index 0cf25de6f46d..6d2f44b3528d 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c @@ -387,7 +387,7 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = { .id = BOND_OPT_SLAVES, .name = "slaves", .desc = "Slave membership management", - .flags = BOND_OPTFLAG_RAWVAL, + .flags = BOND_OPTFLAG_RAWVAL | BOND_OPTFLAG_IFUP, .set = bond_option_slaves_set }, [BOND_OPT_TLB_DYNAMIC_LB] = { @@ -583,6 +583,8 @@ static int bond_opt_check_deps(struct bonding *bond, return -ENOTEMPTY; if ((opt->flags & BOND_OPTFLAG_IFDOWN) && (bond->dev->flags & IFF_UP)) return -EBUSY; + if ((opt->flags & BOND_OPTFLAG_IFUP) && !(bond->dev->flags & IFF_UP)) + return -EPERM; return 0; } diff --git a/include/net/bond_options.h b/include/net/bond_options.h index 9d382f2f0bc5..742f5cc81adf 100644 --- a/include/net/bond_options.h +++ b/include/net/bond_options.h @@ -15,11 +15,13 @@ * BOND_OPTFLAG_NOSLAVES - check if the bond device is empty before setting * BOND_OPTFLAG_IFDOWN - check if the bond device is down before setting * BOND_OPTFLAG_RAWVAL - the option parses the value itself + * BOND_OPTFLAG_IFUP - check if the bond device is up before setting */ enum { BOND_OPTFLAG_NOSLAVES = BIT(0), BOND_OPTFLAG_IFDOWN = BIT(1), - BOND_OPTFLAG_RAWVAL = BIT(2) + BOND_OPTFLAG_RAWVAL = BIT(2), + BOND_OPTFLAG_IFUP = BIT(3) }; /* Value type flags:
We need to refuse to add slave devices to the bonding which does not set IFF_UP flag, otherwise some problems will be caused(such as bond_set_carrier() will not sync carrier state to upper net device). The ifenslave command can prevent such use case, but through the sysfs interface, slave devices can still be added regardless of whether the bonding is set with IFF_UP flag or not. So we introduce a new BOND_OPTFLAG_IFUP flag to avoid adding slave devices to inactive bonding. Signed-off-by: zhudi <zhudi21@huawei.com> --- drivers/net/bonding/bond_options.c | 4 +++- include/net/bond_options.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)