2017-12-19 15:49:01 +00:00
|
|
|
/* SPDX-License-Identifier: BSD-3-Clause
|
|
|
|
* Copyright(c) 2010-2014 Intel Corporation
|
2014-06-25 20:07:43 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <rte_devargs.h>
|
2017-07-07 00:04:18 +00:00
|
|
|
#include <rte_pci.h>
|
2017-10-26 10:06:08 +00:00
|
|
|
#include <rte_bus_pci.h>
|
2014-06-25 20:07:43 +00:00
|
|
|
#include <rte_kvargs.h>
|
|
|
|
|
|
|
|
#include <cmdline_parse.h>
|
|
|
|
#include <cmdline_parse_etheraddr.h>
|
|
|
|
|
|
|
|
#include "rte_eth_bond.h"
|
|
|
|
#include "rte_eth_bond_private.h"
|
|
|
|
|
|
|
|
const char *pmd_bond_init_valid_arguments[] = {
|
|
|
|
PMD_BOND_SLAVE_PORT_KVARG,
|
|
|
|
PMD_BOND_PRIMARY_SLAVE_KVARG,
|
|
|
|
PMD_BOND_MODE_KVARG,
|
|
|
|
PMD_BOND_XMIT_POLICY_KVARG,
|
|
|
|
PMD_BOND_SOCKET_ID_KVARG,
|
|
|
|
PMD_BOND_MAC_ADDR_KVARG,
|
2017-07-19 14:31:17 +00:00
|
|
|
PMD_BOND_AGG_MODE_KVARG,
|
2017-04-11 15:44:19 +00:00
|
|
|
"driver",
|
2014-06-25 20:07:43 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static inline int
|
|
|
|
find_port_id_by_pci_addr(const struct rte_pci_addr *pci_addr)
|
|
|
|
{
|
2016-12-23 15:58:11 +00:00
|
|
|
struct rte_pci_device *pci_dev;
|
2014-06-25 20:07:43 +00:00
|
|
|
struct rte_pci_addr *eth_pci_addr;
|
|
|
|
unsigned i;
|
|
|
|
|
2018-04-05 15:33:20 +00:00
|
|
|
RTE_ETH_FOREACH_DEV(i) {
|
2017-05-15 10:24:03 +00:00
|
|
|
pci_dev = RTE_ETH_DEV_TO_PCI(&rte_eth_devices[i]);
|
2016-12-23 15:58:11 +00:00
|
|
|
eth_pci_addr = &pci_dev->addr;
|
2014-06-25 20:07:43 +00:00
|
|
|
|
|
|
|
if (pci_addr->bus == eth_pci_addr->bus &&
|
|
|
|
pci_addr->devid == eth_pci_addr->devid &&
|
|
|
|
pci_addr->domain == eth_pci_addr->domain &&
|
|
|
|
pci_addr->function == eth_pci_addr->function)
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int
|
|
|
|
find_port_id_by_dev_name(const char *name)
|
|
|
|
{
|
|
|
|
unsigned i;
|
|
|
|
|
2018-04-05 15:33:20 +00:00
|
|
|
RTE_ETH_FOREACH_DEV(i) {
|
2014-06-25 20:07:43 +00:00
|
|
|
if (rte_eth_devices[i].data == NULL)
|
|
|
|
continue;
|
|
|
|
|
2017-06-09 18:36:05 +00:00
|
|
|
if (strcmp(rte_eth_devices[i].device->name, name) == 0)
|
2014-06-25 20:07:43 +00:00
|
|
|
return i;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2017-09-20 18:04:58 +00:00
|
|
|
static inline int
|
2017-10-26 10:06:07 +00:00
|
|
|
bond_pci_addr_cmp(const struct rte_device *dev, const void *_pci_addr)
|
2017-09-20 18:04:58 +00:00
|
|
|
{
|
|
|
|
struct rte_pci_device *pdev;
|
|
|
|
const struct rte_pci_addr *paddr = _pci_addr;
|
|
|
|
|
|
|
|
pdev = RTE_DEV_TO_PCI(*(struct rte_device **)(void *)&dev);
|
|
|
|
return rte_eal_compare_pci_addr(&pdev->addr, paddr);
|
|
|
|
}
|
|
|
|
|
2014-06-25 20:07:43 +00:00
|
|
|
/**
|
|
|
|
* Parses a port identifier string to a port id by pci address, then by name,
|
|
|
|
* and finally port id.
|
|
|
|
*/
|
|
|
|
static inline int
|
|
|
|
parse_port_id(const char *port_str)
|
|
|
|
{
|
|
|
|
struct rte_pci_addr dev_addr;
|
2017-09-20 18:04:58 +00:00
|
|
|
struct rte_bus *pci_bus;
|
|
|
|
struct rte_device *dev;
|
2014-06-25 20:07:43 +00:00
|
|
|
int port_id;
|
|
|
|
|
2017-09-20 18:04:58 +00:00
|
|
|
pci_bus = rte_bus_find_by_name("pci");
|
|
|
|
if (pci_bus == NULL) {
|
|
|
|
RTE_LOG(ERR, PMD, "unable to find PCI bus\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-06-25 20:07:43 +00:00
|
|
|
/* try parsing as pci address, physical devices */
|
2017-09-20 18:04:58 +00:00
|
|
|
if (pci_bus->parse(port_str, &dev_addr) == 0) {
|
2017-10-26 10:06:07 +00:00
|
|
|
dev = pci_bus->find_device(NULL, bond_pci_addr_cmp, &dev_addr);
|
2017-09-20 18:04:58 +00:00
|
|
|
if (dev == NULL) {
|
2018-04-25 15:56:46 +00:00
|
|
|
RTE_BOND_LOG(ERR, "unable to find PCI device");
|
2017-09-20 18:04:58 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2014-06-25 20:07:43 +00:00
|
|
|
port_id = find_port_id_by_pci_addr(&dev_addr);
|
|
|
|
if (port_id < 0)
|
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
/* try parsing as device name, virtual devices */
|
|
|
|
port_id = find_port_id_by_dev_name(port_str);
|
|
|
|
if (port_id < 0) {
|
|
|
|
char *end;
|
|
|
|
errno = 0;
|
|
|
|
|
|
|
|
/* try parsing as port id */
|
|
|
|
port_id = strtol(port_str, &end, 10);
|
|
|
|
if (*end != 0 || errno != 0)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (port_id < 0 || port_id > RTE_MAX_ETHPORTS) {
|
2014-11-24 16:33:41 +00:00
|
|
|
RTE_BOND_LOG(ERR, "Slave port specified (%s) outside expected range",
|
2014-06-25 20:07:43 +00:00
|
|
|
port_str);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return port_id;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-12 10:33:03 +00:00
|
|
|
bond_ethdev_parse_slave_port_kvarg(const char *key,
|
2014-06-25 20:07:43 +00:00
|
|
|
const char *value, void *extra_args)
|
|
|
|
{
|
|
|
|
struct bond_ethdev_slave_ports *slave_ports;
|
|
|
|
|
|
|
|
if (value == NULL || extra_args == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
slave_ports = extra_args;
|
|
|
|
|
|
|
|
if (strcmp(key, PMD_BOND_SLAVE_PORT_KVARG) == 0) {
|
|
|
|
int port_id = parse_port_id(value);
|
2014-11-24 16:33:41 +00:00
|
|
|
if (port_id < 0) {
|
2018-04-25 15:56:46 +00:00
|
|
|
RTE_BOND_LOG(ERR, "Invalid slave port value (%s) specified",
|
|
|
|
value);
|
2014-06-25 20:07:43 +00:00
|
|
|
return -1;
|
2014-11-24 16:33:41 +00:00
|
|
|
} else
|
2014-06-25 20:07:43 +00:00
|
|
|
slave_ports->slaves[slave_ports->slave_count++] =
|
2017-09-29 07:17:24 +00:00
|
|
|
port_id;
|
2014-06-25 20:07:43 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
bond_ethdev_parse_slave_mode_kvarg(const char *key __rte_unused,
|
|
|
|
const char *value, void *extra_args)
|
|
|
|
{
|
|
|
|
uint8_t *mode;
|
|
|
|
char *endptr;
|
|
|
|
|
|
|
|
if (value == NULL || extra_args == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
mode = extra_args;
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
*mode = strtol(value, &endptr, 10);
|
|
|
|
if (*endptr != 0 || errno != 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* validate mode value */
|
|
|
|
switch (*mode) {
|
|
|
|
case BONDING_MODE_ROUND_ROBIN:
|
|
|
|
case BONDING_MODE_ACTIVE_BACKUP:
|
|
|
|
case BONDING_MODE_BALANCE:
|
|
|
|
case BONDING_MODE_BROADCAST:
|
2014-11-27 18:01:10 +00:00
|
|
|
case BONDING_MODE_8023AD:
|
2015-02-20 16:09:22 +00:00
|
|
|
case BONDING_MODE_TLB:
|
2015-02-20 16:09:19 +00:00
|
|
|
case BONDING_MODE_ALB:
|
2014-06-25 20:07:43 +00:00
|
|
|
return 0;
|
|
|
|
default:
|
2014-11-24 16:33:41 +00:00
|
|
|
RTE_BOND_LOG(ERR, "Invalid slave mode value (%s) specified", value);
|
2014-06-25 20:07:43 +00:00
|
|
|
return -1;
|
2017-07-19 14:31:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
bond_ethdev_parse_slave_agg_mode_kvarg(const char *key __rte_unused,
|
|
|
|
const char *value, void *extra_args)
|
|
|
|
{
|
|
|
|
uint8_t *agg_mode;
|
|
|
|
|
|
|
|
if (value == NULL || extra_args == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
agg_mode = extra_args;
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
if (strncmp(value, "stable", 6) == 0)
|
|
|
|
*agg_mode = AGG_STABLE;
|
|
|
|
|
|
|
|
if (strncmp(value, "bandwidth", 9) == 0)
|
|
|
|
*agg_mode = AGG_BANDWIDTH;
|
|
|
|
|
|
|
|
if (strncmp(value, "count", 5) == 0)
|
|
|
|
*agg_mode = AGG_COUNT;
|
|
|
|
|
|
|
|
switch (*agg_mode) {
|
|
|
|
case AGG_STABLE:
|
|
|
|
case AGG_BANDWIDTH:
|
|
|
|
case AGG_COUNT:
|
|
|
|
return 0;
|
|
|
|
default:
|
|
|
|
RTE_BOND_LOG(ERR, "Invalid agg mode value stable/bandwidth/count");
|
|
|
|
return -1;
|
2014-06-25 20:07:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
bond_ethdev_parse_socket_id_kvarg(const char *key __rte_unused,
|
|
|
|
const char *value, void *extra_args)
|
|
|
|
{
|
|
|
|
int socket_id;
|
|
|
|
char *endptr;
|
|
|
|
|
|
|
|
if (value == NULL || extra_args == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
socket_id = (uint8_t)strtol(value, &endptr, 10);
|
|
|
|
if (*endptr != 0 || errno != 0)
|
|
|
|
return -1;
|
|
|
|
|
2017-06-21 05:07:32 +00:00
|
|
|
/* validate socket id value */
|
|
|
|
if (socket_id >= 0) {
|
2014-06-25 20:07:43 +00:00
|
|
|
*(uint8_t *)extra_args = (uint8_t)socket_id;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
bond_ethdev_parse_primary_slave_port_id_kvarg(const char *key __rte_unused,
|
|
|
|
const char *value, void *extra_args)
|
|
|
|
{
|
|
|
|
int primary_slave_port_id;
|
|
|
|
|
|
|
|
if (value == NULL || extra_args == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
primary_slave_port_id = parse_port_id(value);
|
|
|
|
if (primary_slave_port_id < 0)
|
|
|
|
return -1;
|
|
|
|
|
net/bonding: fix primary slave port id storage type
primary_slave_port_id is uint16_t which needs to be correctly stored
with the same data type of input parameter in bond_ethdev_configure.
In powerpc, creating bond pmd results in below error due to wrong
cast on input param. This is reproducible, only when using shared
libraries.
sudo -E LD_LIBRARY_PATH=$PWD/$RTE_TARGET/lib $RTE_TARGET/app/testpmd \
-l 0,8 --socket-mem=1024,1024 \
--vdev 'net_tap0,iface=dpdktap0' --vdev 'net_tap1,iface=dpdktap1' \
--vdev 'net_bonding0,mode=1,slave=0,slave=1,primary=0,socket_id=1' \
-d $RTE_TARGET/lib/librte_pmd_tap.so \
-d $RTE_TARGET/lib/librte_mempool_ring.so -- --forward-mode=rxonly
Configuring Port 0 (socket 0)
PMD: net_tap0: 0x70a854070280: TX configured queues number: 1
PMD: net_tap0: 0x70a854070280: RX configured queues number: 1
Port 0: 86:EA:6D:52:3E:DB
Configuring Port 1 (socket 0)
PMD: net_tap1: 0x70a854074300: TX configured queues number: 1
PMD: net_tap1: 0x70a854074300: RX configured queues number: 1
Port 1: 42:9A:B8:49:B6:00
Configuring Port 2 (socket 1)
EAL: Failed to set primary slave port 7424 on bonded device net_bonding0
Fail to configure port 2
EAL: Error - exiting with code: 1
Cause: Start ports failed
Fixes: f8244c6399 ("ethdev: increase port id range")
Cc: stable@dpdk.org
Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
2018-03-06 09:37:04 +00:00
|
|
|
*(uint16_t *)extra_args = (uint16_t)primary_slave_port_id;
|
2014-06-25 20:07:43 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
bond_ethdev_parse_balance_xmit_policy_kvarg(const char *key __rte_unused,
|
|
|
|
const char *value, void *extra_args)
|
|
|
|
{
|
|
|
|
uint8_t *xmit_policy;
|
|
|
|
|
|
|
|
if (value == NULL || extra_args == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
xmit_policy = extra_args;
|
|
|
|
|
|
|
|
if (strcmp(PMD_BOND_XMIT_POLICY_LAYER2_KVARG, value) == 0)
|
|
|
|
*xmit_policy = BALANCE_XMIT_POLICY_LAYER2;
|
|
|
|
else if (strcmp(PMD_BOND_XMIT_POLICY_LAYER23_KVARG, value) == 0)
|
|
|
|
*xmit_policy = BALANCE_XMIT_POLICY_LAYER23;
|
|
|
|
else if (strcmp(PMD_BOND_XMIT_POLICY_LAYER34_KVARG, value) == 0)
|
|
|
|
*xmit_policy = BALANCE_XMIT_POLICY_LAYER34;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
bond_ethdev_parse_bond_mac_addr_kvarg(const char *key __rte_unused,
|
|
|
|
const char *value, void *extra_args)
|
|
|
|
{
|
|
|
|
if (value == NULL || extra_args == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* Parse MAC */
|
2014-12-05 14:19:07 +00:00
|
|
|
return cmdline_parse_etheraddr(NULL, value, extra_args,
|
2019-05-21 16:13:03 +00:00
|
|
|
sizeof(struct rte_ether_addr));
|
2014-06-25 20:07:43 +00:00
|
|
|
}
|
2014-11-24 16:33:41 +00:00
|
|
|
|
|
|
|
int
|
|
|
|
bond_ethdev_parse_time_ms_kvarg(const char *key __rte_unused,
|
|
|
|
const char *value, void *extra_args)
|
|
|
|
{
|
|
|
|
uint32_t time_ms;
|
|
|
|
char *endptr;
|
|
|
|
|
|
|
|
if (value == NULL || extra_args == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
time_ms = (uint32_t)strtol(value, &endptr, 10);
|
|
|
|
if (*endptr != 0 || errno != 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
*(uint32_t *)extra_args = time_ms;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|