| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <559A6EB1.6080000@gmail.com>
Date: Mon, 06 Jul 2015 17:34:01 +0530
From: GMAIL <ranamazharp@...il.com>
To: Jay Vosburgh <jay.vosburgh@...onical.com>
CC: netdev@...r.kernel.org, vfalico@...il.com,
gospo@...ulusnetworks.com, davem@...emloft.net,
sanket.shah@...eroam.com, mazhar.rana@...eroam.com,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] bonding: "primary_reselect" with "failure" is not
working properly
On Friday 03 July 2015 11:46 PM, Jay Vosburgh wrote:
> GMAIL <ranamazharp@...il.com> wrote:
>
>> Hi Jay,
>>
>> On Friday 03 July 2015 02:12 AM, Jay Vosburgh wrote:
>>
>>> [ added netdev to cc ]
>>>
>>> Mazhar Rana <ranamazharp@...il.com> wrote:
>>>
>>>> When "primary_reselect" is set to "failure", primary interface should
>>>> not become active until current active slave is up. But if we set first
>>> I think you mean "until current active slave is down" here, not
>>> "up."
>> Yes, It should be "up", grammatical mistake
> "down," right?
Yes, "Down".
>
> [...]
>> Below is the updated version of your patch. Any Comments or suggestions ?
> [...]
>> static struct slave *bond_find_best_slave(struct bonding *bond)
>> {
>> - struct slave *slave, *bestslave = NULL, *primary;
>> + struct slave *slave = NULL, *bestslave = NULL, *primary;
>> struct list_head *iter;
>> int mintime = bond->params.updelay;
>> primary = rtnl_dereference(bond->primary_slave);
>> - if (primary && primary->link == BOND_LINK_UP &&
>> - bond_should_change_active(bond))
>> - return primary;
>> + if (primary && primary->link == BOND_LINK_UP)
>> + slave = bond_choose_primary_or_current(bond);
>> +
>> + if (slave)
>> + return slave;
>> bond_for_each_slave(bond, slave, iter) {
>> if (slave->link == BOND_LINK_UP)
> I think this will misbehave in the case that curr is up and
> available, but primary is NULL (this can happen when the primary option
> is cleared). In this case, the above code will not call
> bond_choose_primary_or_current, and will then run the loop to find a new
> curr, which may select a different slave unnecessarily.
>
> How does the following look? I prefer to make the call to
> choose_primary_or_current unconditional, and have it decide if the
> search loop should be run. In this version, _choose_ tests curr if prim
> is not suitable. Compile tested only.
>
> Thoughts?
>
> -J
>
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index 19eb990..1e35e25 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -689,40 +689,57 @@ out:
>
> }
>
> -static bool bond_should_change_active(struct bonding *bond)
> +static struct slave *bond_choose_primary_or_current(struct bonding *bond)
> {
> struct slave *prim = rtnl_dereference(bond->primary_slave);
> struct slave *curr = rtnl_dereference(bond->curr_active_slave);
>
> - if (!prim || !curr || curr->link != BOND_LINK_UP)
> - return true;
> + if (!prim || !prim->link == BOND_LINK_UP) {
> + if (!curr || !curr->link == BOND_LINK_UP)
> + return NULL;
> + return curr;
> + }
> +
> if (bond->force_primary) {
> bond->force_primary = false;
> - return true;
> + return prim;
> + }
> +
> + if (!curr || curr->link != BOND_LINK_UP)
> + return prim;
> +
> + /* At this point, prim and curr are both up */
> + switch (bond->params.primary_reselect) {
> + case BOND_PRI_RESELECT_ALWAYS:
> + return prim;
> + case BOND_PRI_RESELECT_BETTER:
> + if (prim->speed < curr->speed)
> + return curr;
> + if (prim->speed == curr->speed && prim->duplex <= curr->duplex)
> + return curr;
> + return prim;
> + case BOND_PRI_RESELECT_FAILURE:
> + return curr;
> + default:
> + netdev_err(bond->dev, "impossible primary_reselect %d\n",
> + bond->params.primary_reselect);
> + return curr;
> }
> - if (bond->params.primary_reselect == BOND_PRI_RESELECT_BETTER &&
> - (prim->speed < curr->speed ||
> - (prim->speed == curr->speed && prim->duplex <= curr->duplex)))
> - return false;
> - if (bond->params.primary_reselect == BOND_PRI_RESELECT_FAILURE)
> - return false;
> - return true;
> }
>
> /**
> - * find_best_interface - select the best available slave to be the active one
> + * bond_find_best_slave - select the best available slave to be the active one
> * @bond: our bonding struct
> */
> static struct slave *bond_find_best_slave(struct bonding *bond)
> {
> - struct slave *slave, *bestslave = NULL, *primary;
> + struct slave *slave, *bestslave = NULL;
> struct list_head *iter;
> int mintime = bond->params.updelay;
>
> - primary = rtnl_dereference(bond->primary_slave);
> - if (primary && primary->link == BOND_LINK_UP &&
> - bond_should_change_active(bond))
> - return primary;
> + slave = bond_choose_primary_or_current(bond);
> + if (slave)
> + return slave;
>
> bond_for_each_slave(bond, slave, iter) {
> if (slave->link == BOND_LINK_UP)
>
> ---
> -Jay Vosburgh, jay.vosburgh@...onical.com
Looks good, added cosmetic changes for more readability,
it might save some instructions :)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 19eb990..317a494 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -689,40 +689,57 @@ out:
}
-static bool bond_should_change_active(struct bonding *bond)
+static struct slave *bond_choose_primary_or_current(struct bonding *bond)
{
struct slave *prim = rtnl_dereference(bond->primary_slave);
struct slave *curr = rtnl_dereference(bond->curr_active_slave);
- if (!prim || !curr || curr->link != BOND_LINK_UP)
- return true;
+ if (!prim || prim->link != BOND_LINK_UP) {
+ if (!curr || curr->link != BOND_LINK_UP)
+ return NULL;
+ return curr;
+ }
+
if (bond->force_primary) {
bond->force_primary = false;
- return true;
+ return prim;
+ }
+
+ if (!curr || curr->link != BOND_LINK_UP)
+ return prim;
+
+ /* At this point, prim and curr are both up */
+ switch (bond->params.primary_reselect) {
+ case BOND_PRI_RESELECT_ALWAYS:
+ return prim;
+ case BOND_PRI_RESELECT_BETTER:
+ if (prim->speed < curr->speed)
+ return curr;
+ if (prim->speed == curr->speed && prim->duplex <= curr->duplex)
+ return curr;
+ return prim;
+ case BOND_PRI_RESELECT_FAILURE:
+ return curr;
+ default:
+ netdev_err(bond->dev, "impossible primary_reselect %d\n",
+ bond->params.primary_reselect);
+ return curr;
}
- if (bond->params.primary_reselect == BOND_PRI_RESELECT_BETTER &&
- (prim->speed < curr->speed ||
- (prim->speed == curr->speed && prim->duplex <= curr->duplex)))
- return false;
- if (bond->params.primary_reselect == BOND_PRI_RESELECT_FAILURE)
- return false;
- return true;
}
/**
- * find_best_interface - select the best available slave to be the active one
+ * bond_find_best_slave - select the best available slave to be the active one
* @bond: our bonding struct
*/
static struct slave *bond_find_best_slave(struct bonding *bond)
{
- struct slave *slave, *bestslave = NULL, *primary;
+ struct slave *slave, *bestslave = NULL;
struct list_head *iter;
int mintime = bond->params.updelay;
- primary = rtnl_dereference(bond->primary_slave);
- if (primary && primary->link == BOND_LINK_UP &&
- bond_should_change_active(bond))
- return primary;
+ slave = bond_choose_primary_or_current(bond);
+ if (slave)
+ return slave;
bond_for_each_slave(bond, slave, iter) {
if (slave->link == BOND_LINK_UP)
---
Regards,
Mazhar Rana
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists