Merge branch 'bonding_netlink_lacp'
Jonathan Toppins says: ==================== add netlink support for new lacp bonding parameters This is a resubmit of Mahesh's last 3 bonding patches from this series (http://marc.info/?l=linux-netdev&m=142432864626179&w=2) with one additional kernel patch which adds the netlink bits. I have noted any modifications I did to the original patches just above my signoff line. Patch 5 is the iproute2 support for these bonding options. All patches were coded against the net-next branch of their respective projects. v2: * rebased * only send these new parameters via netlink when bond is in mode 4 * fixed ad_actor_sys_prio to be 0xFFFF by default even when the bond is initially created in mode 0 and switched to mode 4 v3: * reverted changes to bond_option_ad_actor_system_set() from v1 in Mahesh's patch "bonding: Allow userspace to set actors' macaddr in an AD-system." Instead implementing all setting in the option specific set function as Nik suggested. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
32f89e5c1a
|
@ -51,6 +51,7 @@ Table of Contents
|
|||
3.4 Configuring Bonding Manually via Sysfs
|
||||
3.5 Configuration with Interfaces Support
|
||||
3.6 Overriding Configuration for Special Cases
|
||||
3.7 Configuring LACP for 802.3ad mode in a more secure way
|
||||
|
||||
4. Querying Bonding Configuration
|
||||
4.1 Bonding Configuration
|
||||
|
@ -178,6 +179,27 @@ active_slave
|
|||
active slave, or the empty string if there is no active slave or
|
||||
the current mode does not use an active slave.
|
||||
|
||||
ad_actor_sys_prio
|
||||
|
||||
In an AD system, this specifies the system priority. The allowed range
|
||||
is 1 - 65535. If the value is not specified, it takes 65535 as the
|
||||
default value.
|
||||
|
||||
This parameter has effect only in 802.3ad mode and is available through
|
||||
SysFs interface.
|
||||
|
||||
ad_actor_system
|
||||
|
||||
In an AD system, this specifies the mac-address for the actor in
|
||||
protocol packet exchanges (LACPDUs). The value cannot be NULL or
|
||||
multicast. It is preferred to have the local-admin bit set for this
|
||||
mac but driver does not enforce it. If the value is not given then
|
||||
system defaults to using the masters' mac address as actors' system
|
||||
address.
|
||||
|
||||
This parameter has effect only in 802.3ad mode and is available through
|
||||
SysFs interface.
|
||||
|
||||
ad_select
|
||||
|
||||
Specifies the 802.3ad aggregation selection logic to use. The
|
||||
|
@ -220,6 +242,21 @@ ad_select
|
|||
|
||||
This option was added in bonding version 3.4.0.
|
||||
|
||||
ad_user_port_key
|
||||
|
||||
In an AD system, the port-key has three parts as shown below -
|
||||
|
||||
Bits Use
|
||||
00 Duplex
|
||||
01-05 Speed
|
||||
06-15 User-defined
|
||||
|
||||
This defines the upper 10 bits of the port key. The values can be
|
||||
from 0 - 1023. If not given, the system defaults to 0.
|
||||
|
||||
This parameter has effect only in 802.3ad mode and is available through
|
||||
SysFs interface.
|
||||
|
||||
all_slaves_active
|
||||
|
||||
Specifies that duplicate frames (received on inactive ports) should be
|
||||
|
@ -1622,6 +1659,53 @@ output port selection.
|
|||
This feature first appeared in bonding driver version 3.7.0 and support for
|
||||
output slave selection was limited to round-robin and active-backup modes.
|
||||
|
||||
3.7 Configuring LACP for 802.3ad mode in a more secure way
|
||||
----------------------------------------------------------
|
||||
|
||||
When using 802.3ad bonding mode, the Actor (host) and Partner (switch)
|
||||
exchange LACPDUs. These LACPDUs cannot be sniffed, because they are
|
||||
destined to link local mac addresses (which switches/bridges are not
|
||||
supposed to forward). However, most of the values are easily predictable
|
||||
or are simply the machine's MAC address (which is trivially known to all
|
||||
other hosts in the same L2). This implies that other machines in the L2
|
||||
domain can spoof LACPDU packets from other hosts to the switch and potentially
|
||||
cause mayhem by joining (from the point of view of the switch) another
|
||||
machine's aggregate, thus receiving a portion of that hosts incoming
|
||||
traffic and / or spoofing traffic from that machine themselves (potentially
|
||||
even successfully terminating some portion of flows). Though this is not
|
||||
a likely scenario, one could avoid this possibility by simply configuring
|
||||
few bonding parameters:
|
||||
|
||||
(a) ad_actor_system : You can set a random mac-address that can be used for
|
||||
these LACPDU exchanges. The value can not be either NULL or Multicast.
|
||||
Also it's preferable to set the local-admin bit. Following shell code
|
||||
generates a random mac-address as described above.
|
||||
|
||||
# sys_mac_addr=$(printf '%02x:%02x:%02x:%02x:%02x:%02x' \
|
||||
$(( (RANDOM & 0xFE) | 0x02 )) \
|
||||
$(( RANDOM & 0xFF )) \
|
||||
$(( RANDOM & 0xFF )) \
|
||||
$(( RANDOM & 0xFF )) \
|
||||
$(( RANDOM & 0xFF )) \
|
||||
$(( RANDOM & 0xFF )))
|
||||
# echo $sys_mac_addr > /sys/class/net/bond0/bonding/ad_actor_system
|
||||
|
||||
(b) ad_actor_sys_prio : Randomize the system priority. The default value
|
||||
is 65535, but system can take the value from 1 - 65535. Following shell
|
||||
code generates random priority and sets it.
|
||||
|
||||
# sys_prio=$(( 1 + RANDOM + RANDOM ))
|
||||
# echo $sys_prio > /sys/class/net/bond0/bonding/ad_actor_sys_prio
|
||||
|
||||
(c) ad_user_port_key : Use the user portion of the port-key. The default
|
||||
keeps this empty. These are the upper 10 bits of the port-key and value
|
||||
ranges from 0 - 1023. Following shell code generates these 10 bits and
|
||||
sets it.
|
||||
|
||||
# usr_port_key=$(( RANDOM & 0x3FF ))
|
||||
# echo $usr_port_key > /sys/class/net/bond0/bonding/ad_user_port_key
|
||||
|
||||
|
||||
4 Querying Bonding Configuration
|
||||
=================================
|
||||
|
||||
|
|
|
@ -75,10 +75,10 @@
|
|||
/* Port Key definitions
|
||||
* key is determined according to the link speed, duplex and
|
||||
* user key (which is yet not supported)
|
||||
* --------------------------------------------------------------
|
||||
* Port key : | User key | Speed | Duplex |
|
||||
* --------------------------------------------------------------
|
||||
* 16 6 1 0
|
||||
* --------------------------------------------------------------
|
||||
* Port key | User key (10 bits) | Speed (5 bits) | Duplex|
|
||||
* --------------------------------------------------------------
|
||||
* |15 6|5 1|0
|
||||
*/
|
||||
#define AD_DUPLEX_KEY_MASKS 0x1
|
||||
#define AD_SPEED_KEY_MASKS 0x3E
|
||||
|
@ -1908,8 +1908,14 @@ void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution)
|
|||
|
||||
BOND_AD_INFO(bond).aggregator_identifier = 0;
|
||||
|
||||
BOND_AD_INFO(bond).system.sys_priority = 0xFFFF;
|
||||
BOND_AD_INFO(bond).system.sys_mac_addr = *((struct mac_addr *)bond->dev->dev_addr);
|
||||
BOND_AD_INFO(bond).system.sys_priority =
|
||||
bond->params.ad_actor_sys_prio;
|
||||
if (is_zero_ether_addr(bond->params.ad_actor_system))
|
||||
BOND_AD_INFO(bond).system.sys_mac_addr =
|
||||
*((struct mac_addr *)bond->dev->dev_addr);
|
||||
else
|
||||
BOND_AD_INFO(bond).system.sys_mac_addr =
|
||||
*((struct mac_addr *)bond->params.ad_actor_system);
|
||||
|
||||
/* initialize how many times this module is called in one
|
||||
* second (should be about every 100ms)
|
||||
|
@ -1945,10 +1951,10 @@ void bond_3ad_bind_slave(struct slave *slave)
|
|||
|
||||
port->slave = slave;
|
||||
port->actor_port_number = SLAVE_AD_INFO(slave)->id;
|
||||
/* key is determined according to the link speed, duplex and user key(which
|
||||
* is yet not supported)
|
||||
/* key is determined according to the link speed, duplex and
|
||||
* user key
|
||||
*/
|
||||
port->actor_admin_port_key = 0;
|
||||
port->actor_admin_port_key = bond->params.ad_user_port_key << 6;
|
||||
port->actor_admin_port_key |= __get_duplex(port);
|
||||
port->actor_admin_port_key |= (__get_link_speed(port) << 1);
|
||||
port->actor_oper_port_key = port->actor_admin_port_key;
|
||||
|
@ -1959,6 +1965,8 @@ void bond_3ad_bind_slave(struct slave *slave)
|
|||
port->sm_vars &= ~AD_PORT_LACP_ENABLED;
|
||||
/* actor system is the bond's system */
|
||||
port->actor_system = BOND_AD_INFO(bond).system.sys_mac_addr;
|
||||
port->actor_system_priority =
|
||||
BOND_AD_INFO(bond).system.sys_priority;
|
||||
/* tx timer(to verify that no more than MAX_TX_IN_SECOND
|
||||
* lacpdu's are sent in one second)
|
||||
*/
|
||||
|
|
|
@ -4140,6 +4140,8 @@ static int bond_check_params(struct bond_params *params)
|
|||
struct bond_opt_value newval;
|
||||
const struct bond_opt_value *valptr;
|
||||
int arp_all_targets_value;
|
||||
u16 ad_actor_sys_prio = 0;
|
||||
u16 ad_user_port_key = 0;
|
||||
|
||||
/* Convert string parameters. */
|
||||
if (mode) {
|
||||
|
@ -4434,6 +4436,24 @@ static int bond_check_params(struct bond_params *params)
|
|||
fail_over_mac_value = BOND_FOM_NONE;
|
||||
}
|
||||
|
||||
bond_opt_initstr(&newval, "default");
|
||||
valptr = bond_opt_parse(
|
||||
bond_opt_get(BOND_OPT_AD_ACTOR_SYS_PRIO),
|
||||
&newval);
|
||||
if (!valptr) {
|
||||
pr_err("Error: No ad_actor_sys_prio default value");
|
||||
return -EINVAL;
|
||||
}
|
||||
ad_actor_sys_prio = valptr->value;
|
||||
|
||||
valptr = bond_opt_parse(bond_opt_get(BOND_OPT_AD_USER_PORT_KEY),
|
||||
&newval);
|
||||
if (!valptr) {
|
||||
pr_err("Error: No ad_user_port_key default value");
|
||||
return -EINVAL;
|
||||
}
|
||||
ad_user_port_key = valptr->value;
|
||||
|
||||
if (lp_interval == 0) {
|
||||
pr_warn("Warning: ip_interval must be between 1 and %d, so it was reset to %d\n",
|
||||
INT_MAX, BOND_ALB_DEFAULT_LP_INTERVAL);
|
||||
|
@ -4462,6 +4482,9 @@ static int bond_check_params(struct bond_params *params)
|
|||
params->lp_interval = lp_interval;
|
||||
params->packets_per_slave = packets_per_slave;
|
||||
params->tlb_dynamic_lb = 1; /* Default value */
|
||||
params->ad_actor_sys_prio = ad_actor_sys_prio;
|
||||
eth_zero_addr(params->ad_actor_system);
|
||||
params->ad_user_port_key = ad_user_port_key;
|
||||
if (packets_per_slave > 0) {
|
||||
params->reciprocal_packets_per_slave =
|
||||
reciprocal_value(packets_per_slave);
|
||||
|
|
|
@ -94,6 +94,10 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {
|
|||
[IFLA_BOND_AD_LACP_RATE] = { .type = NLA_U8 },
|
||||
[IFLA_BOND_AD_SELECT] = { .type = NLA_U8 },
|
||||
[IFLA_BOND_AD_INFO] = { .type = NLA_NESTED },
|
||||
[IFLA_BOND_AD_ACTOR_SYS_PRIO] = { .type = NLA_U16 },
|
||||
[IFLA_BOND_AD_USER_PORT_KEY] = { .type = NLA_U16 },
|
||||
[IFLA_BOND_AD_ACTOR_SYSTEM] = { .type = NLA_BINARY,
|
||||
.len = ETH_ALEN },
|
||||
};
|
||||
|
||||
static const struct nla_policy bond_slave_policy[IFLA_BOND_SLAVE_MAX + 1] = {
|
||||
|
@ -379,6 +383,36 @@ static int bond_changelink(struct net_device *bond_dev,
|
|||
if (err)
|
||||
return err;
|
||||
}
|
||||
if (data[IFLA_BOND_AD_ACTOR_SYS_PRIO]) {
|
||||
int actor_sys_prio =
|
||||
nla_get_u16(data[IFLA_BOND_AD_ACTOR_SYS_PRIO]);
|
||||
|
||||
bond_opt_initval(&newval, actor_sys_prio);
|
||||
err = __bond_opt_set(bond, BOND_OPT_AD_ACTOR_SYS_PRIO, &newval);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
||||
if (data[IFLA_BOND_AD_USER_PORT_KEY]) {
|
||||
int port_key =
|
||||
nla_get_u16(data[IFLA_BOND_AD_USER_PORT_KEY]);
|
||||
|
||||
bond_opt_initval(&newval, port_key);
|
||||
err = __bond_opt_set(bond, BOND_OPT_AD_USER_PORT_KEY, &newval);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
||||
if (data[IFLA_BOND_AD_ACTOR_SYSTEM]) {
|
||||
if (nla_len(data[IFLA_BOND_AD_ACTOR_SYSTEM]) != ETH_ALEN)
|
||||
return -EINVAL;
|
||||
|
||||
bond_opt_initval(&newval,
|
||||
nla_get_be64(data[IFLA_BOND_AD_ACTOR_SYSTEM]));
|
||||
err = __bond_opt_set(bond, BOND_OPT_AD_ACTOR_SYSTEM, &newval);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -426,6 +460,9 @@ static size_t bond_get_size(const struct net_device *bond_dev)
|
|||
nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_INFO_ACTOR_KEY */
|
||||
nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_INFO_PARTNER_KEY*/
|
||||
nla_total_size(ETH_ALEN) + /* IFLA_BOND_AD_INFO_PARTNER_MAC*/
|
||||
nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_ACTOR_SYS_PRIO */
|
||||
nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_USER_PORT_KEY */
|
||||
nla_total_size(ETH_ALEN) + /* IFLA_BOND_AD_ACTOR_SYSTEM */
|
||||
0;
|
||||
}
|
||||
|
||||
|
@ -551,6 +588,19 @@ static int bond_fill_info(struct sk_buff *skb,
|
|||
if (BOND_MODE(bond) == BOND_MODE_8023AD) {
|
||||
struct ad_info info;
|
||||
|
||||
if (nla_put_u16(skb, IFLA_BOND_AD_ACTOR_SYS_PRIO,
|
||||
bond->params.ad_actor_sys_prio))
|
||||
goto nla_put_failure;
|
||||
|
||||
if (nla_put_u16(skb, IFLA_BOND_AD_USER_PORT_KEY,
|
||||
bond->params.ad_user_port_key))
|
||||
goto nla_put_failure;
|
||||
|
||||
if (nla_put(skb, IFLA_BOND_AD_ACTOR_SYSTEM,
|
||||
sizeof(bond->params.ad_actor_system),
|
||||
&bond->params.ad_actor_system))
|
||||
goto nla_put_failure;
|
||||
|
||||
if (!bond_3ad_get_active_agg_info(bond, &info)) {
|
||||
struct nlattr *nest;
|
||||
|
||||
|
|
|
@ -70,6 +70,12 @@ static int bond_option_slaves_set(struct bonding *bond,
|
|||
const struct bond_opt_value *newval);
|
||||
static int bond_option_tlb_dynamic_lb_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval);
|
||||
static int bond_option_ad_actor_sys_prio_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval);
|
||||
static int bond_option_ad_actor_system_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval);
|
||||
static int bond_option_ad_user_port_key_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval);
|
||||
|
||||
|
||||
static const struct bond_opt_value bond_mode_tbl[] = {
|
||||
|
@ -186,6 +192,18 @@ static const struct bond_opt_value bond_tlb_dynamic_lb_tbl[] = {
|
|||
{ NULL, -1, 0}
|
||||
};
|
||||
|
||||
static const struct bond_opt_value bond_ad_actor_sys_prio_tbl[] = {
|
||||
{ "minval", 1, BOND_VALFLAG_MIN},
|
||||
{ "maxval", 65535, BOND_VALFLAG_MAX | BOND_VALFLAG_DEFAULT},
|
||||
{ NULL, -1, 0},
|
||||
};
|
||||
|
||||
static const struct bond_opt_value bond_ad_user_port_key_tbl[] = {
|
||||
{ "minval", 0, BOND_VALFLAG_MIN | BOND_VALFLAG_DEFAULT},
|
||||
{ "maxval", 1023, BOND_VALFLAG_MAX},
|
||||
{ NULL, -1, 0},
|
||||
};
|
||||
|
||||
static const struct bond_option bond_opts[BOND_OPT_LAST] = {
|
||||
[BOND_OPT_MODE] = {
|
||||
.id = BOND_OPT_MODE,
|
||||
|
@ -379,6 +397,29 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = {
|
|||
.values = bond_tlb_dynamic_lb_tbl,
|
||||
.flags = BOND_OPTFLAG_IFDOWN,
|
||||
.set = bond_option_tlb_dynamic_lb_set,
|
||||
},
|
||||
[BOND_OPT_AD_ACTOR_SYS_PRIO] = {
|
||||
.id = BOND_OPT_AD_ACTOR_SYS_PRIO,
|
||||
.name = "ad_actor_sys_prio",
|
||||
.unsuppmodes = BOND_MODE_ALL_EX(BIT(BOND_MODE_8023AD)),
|
||||
.flags = BOND_OPTFLAG_IFDOWN,
|
||||
.values = bond_ad_actor_sys_prio_tbl,
|
||||
.set = bond_option_ad_actor_sys_prio_set,
|
||||
},
|
||||
[BOND_OPT_AD_ACTOR_SYSTEM] = {
|
||||
.id = BOND_OPT_AD_ACTOR_SYSTEM,
|
||||
.name = "ad_actor_system",
|
||||
.unsuppmodes = BOND_MODE_ALL_EX(BIT(BOND_MODE_8023AD)),
|
||||
.flags = BOND_OPTFLAG_RAWVAL | BOND_OPTFLAG_IFDOWN,
|
||||
.set = bond_option_ad_actor_system_set,
|
||||
},
|
||||
[BOND_OPT_AD_USER_PORT_KEY] = {
|
||||
.id = BOND_OPT_AD_USER_PORT_KEY,
|
||||
.name = "ad_user_port_key",
|
||||
.unsuppmodes = BOND_MODE_ALL_EX(BIT(BOND_MODE_8023AD)),
|
||||
.flags = BOND_OPTFLAG_IFDOWN,
|
||||
.values = bond_ad_user_port_key_tbl,
|
||||
.set = bond_option_ad_user_port_key_set,
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -1349,3 +1390,53 @@ static int bond_option_tlb_dynamic_lb_set(struct bonding *bond,
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int bond_option_ad_actor_sys_prio_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
netdev_info(bond->dev, "Setting ad_actor_sys_prio to %llu\n",
|
||||
newval->value);
|
||||
|
||||
bond->params.ad_actor_sys_prio = newval->value;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int bond_option_ad_actor_system_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
u8 macaddr[ETH_ALEN];
|
||||
u8 *mac;
|
||||
int i;
|
||||
|
||||
if (newval->string) {
|
||||
i = sscanf(newval->string, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
|
||||
&macaddr[0], &macaddr[1], &macaddr[2],
|
||||
&macaddr[3], &macaddr[4], &macaddr[5]);
|
||||
if (i != ETH_ALEN)
|
||||
goto err;
|
||||
mac = macaddr;
|
||||
} else {
|
||||
mac = (u8 *)&newval->value;
|
||||
}
|
||||
|
||||
if (!is_valid_ether_addr(mac))
|
||||
goto err;
|
||||
|
||||
netdev_info(bond->dev, "Setting ad_actor_system to %pM\n", mac);
|
||||
ether_addr_copy(bond->params.ad_actor_system, mac);
|
||||
return 0;
|
||||
|
||||
err:
|
||||
netdev_err(bond->dev, "Invalid MAC address.\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int bond_option_ad_user_port_key_set(struct bonding *bond,
|
||||
const struct bond_opt_value *newval)
|
||||
{
|
||||
netdev_info(bond->dev, "Setting ad_user_port_key to %llu\n",
|
||||
newval->value);
|
||||
|
||||
bond->params.ad_user_port_key = newval->value;
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -135,6 +135,10 @@ static void bond_info_show_master(struct seq_file *seq)
|
|||
bond->params.ad_select);
|
||||
seq_printf(seq, "Aggregator selection policy (ad_select): %s\n",
|
||||
optval->string);
|
||||
seq_printf(seq, "System priority: %d\n",
|
||||
BOND_AD_INFO(bond).system.sys_priority);
|
||||
seq_printf(seq, "System MAC address: %pM\n",
|
||||
&BOND_AD_INFO(bond).system.sys_mac_addr);
|
||||
|
||||
if (__bond_3ad_get_active_agg_info(bond, &ad_info)) {
|
||||
seq_printf(seq, "bond %s has no active aggregator\n",
|
||||
|
@ -198,6 +202,8 @@ static void bond_info_show_slave(struct seq_file *seq,
|
|||
seq_puts(seq, "details actor lacp pdu:\n");
|
||||
seq_printf(seq, " system priority: %d\n",
|
||||
port->actor_system_priority);
|
||||
seq_printf(seq, " system mac address: %pM\n",
|
||||
&port->actor_system);
|
||||
seq_printf(seq, " port key: %d\n",
|
||||
port->actor_oper_port_key);
|
||||
seq_printf(seq, " port priority: %d\n",
|
||||
|
@ -210,6 +216,8 @@ static void bond_info_show_slave(struct seq_file *seq,
|
|||
seq_puts(seq, "details partner lacp pdu:\n");
|
||||
seq_printf(seq, " system priority: %d\n",
|
||||
port->partner_oper.system_priority);
|
||||
seq_printf(seq, " system mac address: %pM\n",
|
||||
&port->partner_oper.system);
|
||||
seq_printf(seq, " oper key: %d\n",
|
||||
port->partner_oper.key);
|
||||
seq_printf(seq, " port priority: %d\n",
|
||||
|
|
|
@ -692,6 +692,49 @@ static ssize_t bonding_show_packets_per_slave(struct device *d,
|
|||
static DEVICE_ATTR(packets_per_slave, S_IRUGO | S_IWUSR,
|
||||
bonding_show_packets_per_slave, bonding_sysfs_store_option);
|
||||
|
||||
static ssize_t bonding_show_ad_actor_sys_prio(struct device *d,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if (BOND_MODE(bond) == BOND_MODE_8023AD)
|
||||
return sprintf(buf, "%hu\n", bond->params.ad_actor_sys_prio);
|
||||
|
||||
return 0;
|
||||
}
|
||||
static DEVICE_ATTR(ad_actor_sys_prio, S_IRUGO | S_IWUSR,
|
||||
bonding_show_ad_actor_sys_prio, bonding_sysfs_store_option);
|
||||
|
||||
static ssize_t bonding_show_ad_actor_system(struct device *d,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if (BOND_MODE(bond) == BOND_MODE_8023AD)
|
||||
return sprintf(buf, "%pM\n", bond->params.ad_actor_system);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static DEVICE_ATTR(ad_actor_system, S_IRUGO | S_IWUSR,
|
||||
bonding_show_ad_actor_system, bonding_sysfs_store_option);
|
||||
|
||||
static ssize_t bonding_show_ad_user_port_key(struct device *d,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
struct bonding *bond = to_bond(d);
|
||||
|
||||
if (BOND_MODE(bond) == BOND_MODE_8023AD)
|
||||
return sprintf(buf, "%hu\n", bond->params.ad_user_port_key);
|
||||
|
||||
return 0;
|
||||
}
|
||||
static DEVICE_ATTR(ad_user_port_key, S_IRUGO | S_IWUSR,
|
||||
bonding_show_ad_user_port_key, bonding_sysfs_store_option);
|
||||
|
||||
static struct attribute *per_bond_attrs[] = {
|
||||
&dev_attr_slaves.attr,
|
||||
&dev_attr_mode.attr,
|
||||
|
@ -725,6 +768,9 @@ static struct attribute *per_bond_attrs[] = {
|
|||
&dev_attr_lp_interval.attr,
|
||||
&dev_attr_packets_per_slave.attr,
|
||||
&dev_attr_tlb_dynamic_lb.attr,
|
||||
&dev_attr_ad_actor_sys_prio.attr,
|
||||
&dev_attr_ad_actor_system.attr,
|
||||
&dev_attr_ad_user_port_key.attr,
|
||||
NULL,
|
||||
};
|
||||
|
||||
|
|
|
@ -63,6 +63,9 @@ enum {
|
|||
BOND_OPT_LP_INTERVAL,
|
||||
BOND_OPT_SLAVES,
|
||||
BOND_OPT_TLB_DYNAMIC_LB,
|
||||
BOND_OPT_AD_ACTOR_SYS_PRIO,
|
||||
BOND_OPT_AD_ACTOR_SYSTEM,
|
||||
BOND_OPT_AD_USER_PORT_KEY,
|
||||
BOND_OPT_LAST
|
||||
};
|
||||
|
||||
|
|
|
@ -136,6 +136,9 @@ struct bond_params {
|
|||
int packets_per_slave;
|
||||
int tlb_dynamic_lb;
|
||||
struct reciprocal_value reciprocal_packets_per_slave;
|
||||
u16 ad_actor_sys_prio;
|
||||
u16 ad_user_port_key;
|
||||
u8 ad_actor_system[ETH_ALEN];
|
||||
};
|
||||
|
||||
struct bond_parm_tbl {
|
||||
|
|
|
@ -417,6 +417,9 @@ enum {
|
|||
IFLA_BOND_AD_LACP_RATE,
|
||||
IFLA_BOND_AD_SELECT,
|
||||
IFLA_BOND_AD_INFO,
|
||||
IFLA_BOND_AD_ACTOR_SYS_PRIO,
|
||||
IFLA_BOND_AD_USER_PORT_KEY,
|
||||
IFLA_BOND_AD_ACTOR_SYSTEM,
|
||||
__IFLA_BOND_MAX,
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue