Secondary process control operations could reach memory
not shared by primary process. Restrict the API to only
those things that should work by reading shared state.
Fixes: 2efb58cbab6e ("bond: new link bonding library")
Cc: [email protected]
Bugzilla ID: 1900
Reported-by: Weijun Pan <[email protected]>
Signed-off-by: Stephen Hemminger <[email protected]>
---
drivers/net/bonding/rte_eth_bond_8023ad.c | 18 +++++++++++++++++
drivers/net/bonding/rte_eth_bond_api.c | 24 +++++++++++++++++++++++
drivers/net/bonding/rte_eth_bond_pmd.c | 18 +++++++++++++++--
3 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c
b/drivers/net/bonding/rte_eth_bond_8023ad.c
index d1f30229d0..29d4de0e1d 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -1440,6 +1440,9 @@ rte_eth_bond_8023ad_agg_selection_set(uint16_t port_id,
if (valid_bonding_port_id(port_id) != 0)
return -EINVAL;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -ENOTSUP;
+
bond_dev = &rte_eth_devices[port_id];
internals = bond_dev->data->dev_private;
@@ -1509,6 +1512,9 @@ rte_eth_bond_8023ad_setup(uint16_t port_id,
struct rte_eth_dev *bond_dev;
int err;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -ENOTSUP;
+
err = bond_8023ad_setup_validate(port_id, conf);
if (err != 0)
return err;
@@ -1532,6 +1538,9 @@ rte_eth_bond_8023ad_member_info(uint16_t port_id,
uint16_t member_id,
struct bond_dev_private *internals;
struct port *port;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -ENOTSUP;
+
if (info == NULL || valid_bonding_port_id(port_id) != 0 ||
rte_eth_bond_mode_get(port_id) != BONDING_MODE_8023AD)
return -EINVAL;
@@ -1564,6 +1573,9 @@ bond_8023ad_ext_validate(uint16_t port_id, uint16_t
member_id)
struct bond_dev_private *internals;
struct mode8023ad_private *mode4;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -ENOTSUP;
+
if (rte_eth_bond_mode_get(port_id) != BONDING_MODE_8023AD)
return -EINVAL;
@@ -1728,6 +1740,9 @@ rte_eth_bond_8023ad_dedicated_queues_enable(uint16_t port)
struct rte_eth_dev *dev;
struct bond_dev_private *internals;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -ENOTSUP;
+
if (valid_bonding_port_id(port) != 0)
return -EINVAL;
@@ -1757,6 +1772,9 @@ rte_eth_bond_8023ad_dedicated_queues_disable(uint16_t
port)
struct rte_eth_dev *dev;
struct bond_dev_private *internals;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -ENOTSUP;
+
if (valid_bonding_port_id(port) != 0)
return -EINVAL;
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index d9b6f1c417..505dd86dd8 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -159,6 +159,9 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t
socket_id)
char devargs[52];
int ret;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -ENOTSUP;
+
if (name == NULL) {
RTE_BOND_LOG(ERR, "Invalid name specified");
return -EINVAL;
@@ -643,6 +646,9 @@ rte_eth_bond_member_add(uint16_t bonding_port_id, uint16_t
member_port_id)
int retval;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -ENOTSUP;
+
if (valid_bonding_port_id(bonding_port_id) != 0)
return -1;
@@ -781,6 +787,9 @@ rte_eth_bond_member_remove(uint16_t bonding_port_id,
uint16_t member_port_id)
struct bond_dev_private *internals;
int retval;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -ENOTSUP;
+
if (valid_bonding_port_id(bonding_port_id) != 0)
return -1;
@@ -834,6 +843,9 @@ rte_eth_bond_primary_set(uint16_t bonding_port_id, uint16_t
member_port_id)
{
struct bond_dev_private *internals;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -ENOTSUP;
+
if (valid_bonding_port_id(bonding_port_id) != 0)
return -1;
@@ -924,6 +936,9 @@ rte_eth_bond_mac_address_set(uint16_t bonding_port_id,
struct rte_eth_dev *bonding_eth_dev;
struct bond_dev_private *internals;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -ENOTSUP;
+
if (valid_bonding_port_id(bonding_port_id) != 0)
return -1;
@@ -950,6 +965,9 @@ rte_eth_bond_mac_address_reset(uint16_t bonding_port_id)
struct rte_eth_dev *bonding_eth_dev;
struct bond_dev_private *internals;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -ENOTSUP;
+
if (valid_bonding_port_id(bonding_port_id) != 0)
return -1;
@@ -991,6 +1009,9 @@ rte_eth_bond_xmit_policy_set(uint16_t bonding_port_id,
uint8_t policy)
{
struct bond_dev_private *internals;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -ENOTSUP;
+
if (valid_bonding_port_id(bonding_port_id) != 0)
return -1;
@@ -1036,6 +1057,9 @@ rte_eth_bond_link_monitoring_set(uint16_t
bonding_port_id, uint32_t internal_ms)
{
struct bond_dev_private *internals;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -ENOTSUP;
+
if (valid_bonding_port_id(bonding_port_id) != 0)
return -1;
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
index 6f3c13d6fb..0e18ded4a5 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -3695,12 +3695,26 @@ bond_ethdev_priv_dump(struct rte_eth_dev *dev, FILE *f)
const struct bond_dev_private *internals = dev->data->dev_private;
dump_basic(dev, f);
- if (internals->mode == BONDING_MODE_8023AD)
+
+ /* LACP state machine data is private to the primary process. */
+ if (internals->mode == BONDING_MODE_8023AD &&
+ rte_eal_process_type() == RTE_PROC_PRIMARY)
dump_lacp(dev->data->port_id, f);
return 0;
}
+/* Restricted set of ops allowed in secondary process. */
+static const struct eth_dev_ops secondary_dev_ops = {
+ .dev_close = bond_ethdev_close,
+ .dev_infos_get = bond_ethdev_info,
+ .link_update = bond_ethdev_link_update,
+ .stats_get = bond_ethdev_stats_get,
+ .reta_query = bond_ethdev_rss_reta_query,
+ .rss_hash_conf_get = bond_ethdev_rss_hash_conf_get,
+ .eth_dev_priv_dump = bond_ethdev_priv_dump,
+};
+
const struct eth_dev_ops default_dev_ops = {
.dev_start = bond_ethdev_start,
.dev_stop = bond_ethdev_stop,
@@ -3885,7 +3899,7 @@ bond_probe(struct rte_vdev_device *dev)
return -1;
}
- eth_dev->dev_ops = &default_dev_ops;
+ eth_dev->dev_ops = &secondary_dev_ops;
eth_dev->device = &dev->device;
/*
--
2.53.0
