bonding: convert lacp_rate to use the new option API (d3131de7) · Commits · 戴 / test

drivers/net/bonding/bond_main.c

+6 −9

Original line number	Diff line number	Diff line
		@@ -207,12 +207,6 @@ static int bond_mode = BOND_MODE_ROUNDROBIN;
		static int xmit_hashtype = BOND_XMIT_POLICY_LAYER2;
		static int lacp_fast;

		const struct bond_parm_tbl bond_lacp_tbl[] = {
		{ "slow", AD_LACP_SLOW},
		{ "fast", AD_LACP_FAST},
		{ NULL, -1},
		};

		const struct bond_parm_tbl pri_reselect_tbl[] = {
		{ "always", BOND_PRI_RESELECT_ALWAYS},
		{ "better", BOND_PRI_RESELECT_BETTER},
		@@ -4025,12 +4019,15 @@ static int bond_check_params(struct bond_params *params)
		pr_info("lacp_rate param is irrelevant in mode %s\n",
		bond_mode_name(bond_mode));
		} else {
		lacp_fast = bond_parse_parm(lacp_rate, bond_lacp_tbl);
		if (lacp_fast == -1) {
		bond_opt_initstr(&newval, lacp_rate);
		valptr = bond_opt_parse(bond_opt_get(BOND_OPT_LACP_RATE),
		&newval);
		if (!valptr) {
		pr_err("Error: Invalid lacp rate \"%s\"\n",
		lacp_rate == NULL ? "NULL" : lacp_rate);
		lacp_rate);
		return -EINVAL;
		}
		lacp_fast = valptr->value;
		}
		}

drivers/net/bonding/bond_netlink.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -310,7 +310,8 @@ static int bond_changelink(struct net_device *bond_dev,
		int lacp_rate =
		nla_get_u8(data[IFLA_BOND_AD_LACP_RATE]);

		err = bond_option_lacp_rate_set(bond, lacp_rate);
		bond_opt_initval(&newval, lacp_rate);
		err = __bond_opt_set(bond, BOND_OPT_LACP_RATE, &newval);
		if (err)
		return err;
		}

drivers/net/bonding/bond_options.c

+20 −24

Original line number	Diff line number	Diff line
		@@ -72,6 +72,12 @@ static struct bond_opt_value bond_intmax_tbl[] = {
		{ "maxval", INT_MAX, BOND_VALFLAG_MAX},
		};

		static struct bond_opt_value bond_lacp_rate_tbl[] = {
		{ "slow", AD_LACP_SLOW, 0},
		{ "fast", AD_LACP_FAST, 0},
		{ NULL, -1, 0},
		};

		static struct bond_option bond_opts[] = {
		[BOND_OPT_MODE] = {
		.id = BOND_OPT_MODE,
		@@ -149,7 +155,15 @@ static struct bond_option bond_opts[] = {
		.values = bond_intmax_tbl,
		.set = bond_option_updelay_set
		},

		[BOND_OPT_LACP_RATE] = {
		.id = BOND_OPT_LACP_RATE,
		.name = "lacp_rate",
		.desc = "LACPDU tx rate to request from 802.3ad partner",
		.flags = BOND_OPTFLAG_IFDOWN,
		.unsuppmodes = BOND_MODE_ALL_EX(BIT(BOND_MODE_8023AD)),
		.values = bond_lacp_rate_tbl,
		.set = bond_option_lacp_rate_set
		},
		{ }
		};

		@@ -1015,31 +1029,13 @@ int bond_option_pps_set(struct bonding bond, struct bond_opt_value newval)
		return 0;
		}

		int bond_option_lacp_rate_set(struct bonding *bond, int lacp_rate)
		int bond_option_lacp_rate_set(struct bonding *bond,
		struct bond_opt_value *newval)
		{
		if (bond_parm_tbl_lookup(lacp_rate, bond_lacp_tbl) < 0) {
		pr_err("%s: Ignoring invalid LACP rate value %d.\n",
		bond->dev->name, lacp_rate);
		return -EINVAL;
		}

		if (bond->dev->flags & IFF_UP) {
		pr_err("%s: Unable to update LACP rate because interface is up.\n",
		bond->dev->name);
		return -EPERM;
		}

		if (bond->params.mode != BOND_MODE_8023AD) {
		pr_err("%s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
		bond->dev->name);
		return -EPERM;
		}

		bond->params.lacp_fast = lacp_rate;
		pr_info("%s: Setting LACP rate to %s (%llu).\n",
		bond->dev->name, newval->string, newval->value);
		bond->params.lacp_fast = newval->value;
		bond_3ad_update_lacp_rate(bond);
		pr_info("%s: Setting LACP rate to %s (%d).\n",
		bond->dev->name, bond_lacp_tbl[lacp_rate].modename,
		lacp_rate);

		return 0;
		}

drivers/net/bonding/bond_options.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ enum {
		BOND_OPT_ARP_TARGETS,
		BOND_OPT_DOWNDELAY,
		BOND_OPT_UPDELAY,
		BOND_OPT_LACP_RATE,
		BOND_OPT_LAST
		};

		@@ -127,4 +128,6 @@ int bond_option_downdelay_set(struct bonding *bond,
		struct bond_opt_value *newval);
		int bond_option_updelay_set(struct bonding *bond,
		struct bond_opt_value *newval);
		int bond_option_lacp_rate_set(struct bonding *bond,
		struct bond_opt_value *newval);
		#endif /* _BOND_OPTIONS_H */

drivers/net/bonding/bond_sysfs.c

+6 −16

Original line number	Diff line number	Diff line
		@@ -548,10 +548,11 @@ static ssize_t bonding_show_lacp(struct device *d,
		char *buf)
		{
		struct bonding *bond = to_bond(d);
		struct bond_opt_value *val;

		return sprintf(buf, "%s %d\n",
		bond_lacp_tbl[bond->params.lacp_fast].modename,
		bond->params.lacp_fast);
		val = bond_opt_get_val(BOND_OPT_LACP_RATE, bond->params.lacp_fast);

		return sprintf(buf, "%s %d\n", val->string, bond->params.lacp_fast);
		}

		static ssize_t bonding_store_lacp(struct device *d,
		@@ -559,23 +560,12 @@ static ssize_t bonding_store_lacp(struct device *d,
		const char *buf, size_t count)
		{
		struct bonding *bond = to_bond(d);
		int new_value, ret;

		new_value = bond_parse_parm(buf, bond_lacp_tbl);
		if (new_value < 0) {
		pr_err("%s: Ignoring invalid LACP rate value %.*s.\n",
		bond->dev->name, (int)strlen(buf) - 1, buf);
		return -EINVAL;
		}

		if (!rtnl_trylock())
		return restart_syscall();
		int ret;

		ret = bond_option_lacp_rate_set(bond, new_value);
		ret = bond_opt_tryset_rtnl(bond, BOND_OPT_LACP_RATE, (char *)buf);
		if (!ret)
		ret = count;

		rtnl_unlock();
		return ret;
		}
		static DEVICE_ATTR(lacp_rate, S_IRUGO \| S_IWUSR,

Admin message