X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fnet%2Fhns3%2Fhns3_mp.c;h=999b407f7d24a1bb0d5c02b53fa92a90063f9f92;hb=06d1a5d056b30dd18b1e4abc98c19cde57a8016c;hp=639f46ced87c6823bbd03edd23f392e212ecb5fe;hpb=9570b1fdbdad47cab28dff58a017b0447bf32ed1;p=dpdk.git diff --git a/drivers/net/hns3/hns3_mp.c b/drivers/net/hns3/hns3_mp.c index 639f46ced8..999b407f7d 100644 --- a/drivers/net/hns3/hns3_mp.c +++ b/drivers/net/hns3/hns3_mp.c @@ -1,11 +1,9 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2021 HiSilicon Limited. */ -#include - #include -#include +#include #include #include @@ -14,7 +12,8 @@ #include "hns3_rxtx.h" #include "hns3_mp.h" -static bool hns3_inited; +/* local data for primary or secondary process. */ +static struct hns3_process_local_data process_data; /* * Initialize IPC message. @@ -75,12 +74,13 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer) struct hns3_mp_param *res = (struct hns3_mp_param *)mp_res.param; const struct hns3_mp_param *param = (const struct hns3_mp_param *)mp_msg->param; + eth_tx_prep_t prep = NULL; struct rte_eth_dev *dev; int ret; if (!rte_eth_dev_is_valid_port(param->port_id)) { rte_errno = ENODEV; - PMD_INIT_LOG(ERR, "port %u invalid port ID", param->port_id); + PMD_INIT_LOG(ERR, "port %d invalid port ID", param->port_id); return -rte_errno; } dev = &rte_eth_devices[param->port_id]; @@ -88,20 +88,24 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer) case HNS3_MP_REQ_START_RXTX: PMD_INIT_LOG(INFO, "port %u starting datapath", dev->data->port_id); - rte_mb(); hns3_set_rxtx_function(dev); - mp_init_msg(dev, &mp_res, param->type); - res->result = 0; - ret = rte_mp_reply(&mp_res, peer); break; case HNS3_MP_REQ_STOP_RXTX: PMD_INIT_LOG(INFO, "port %u stopping datapath", dev->data->port_id); hns3_set_rxtx_function(dev); - rte_mb(); - mp_init_msg(dev, &mp_res, param->type); - res->result = 0; - ret = rte_mp_reply(&mp_res, peer); + break; + case HNS3_MP_REQ_START_TX: + PMD_INIT_LOG(INFO, "port %u starting Tx datapath", + dev->data->port_id); + dev->tx_pkt_burst = hns3_get_tx_function(dev, &prep); + dev->tx_pkt_prepare = prep; + break; + case HNS3_MP_REQ_STOP_TX: + PMD_INIT_LOG(INFO, "port %u stopping Tx datapath", + dev->data->port_id); + dev->tx_pkt_burst = hns3_dummy_rxtx_burst; + dev->tx_pkt_prepare = NULL; break; default: rte_errno = EINVAL; @@ -109,9 +113,24 @@ mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer) dev->data->port_id); return -rte_errno; } + + rte_mb(); + mp_init_msg(dev, &mp_res, param->type); + res->result = 0; + ret = rte_mp_reply(&mp_res, peer); + return ret; } +static bool +mp_req_type_is_valid(enum hns3_mp_req_type type) +{ + return type == HNS3_MP_REQ_START_RXTX || + type == HNS3_MP_REQ_STOP_RXTX || + type == HNS3_MP_REQ_START_TX || + type == HNS3_MP_REQ_STOP_TX; +} + /* * Broadcast request of stopping/starting data-path to secondary processes. * @@ -132,9 +151,11 @@ mp_req_on_rxtx(struct rte_eth_dev *dev, enum hns3_mp_req_type type) int ret; int i; - if (!hw->secondary_cnt) + if (rte_eal_process_type() == RTE_PROC_SECONDARY || + __atomic_load_n(&hw->secondary_cnt, __ATOMIC_RELAXED) == 0) return; - if (type != HNS3_MP_REQ_START_RXTX && type != HNS3_MP_REQ_STOP_RXTX) { + + if (!mp_req_type_is_valid(type)) { hns3_err(hw, "port %u unknown request (req_type %d)", dev->data->port_id, type); return; @@ -191,48 +212,97 @@ void hns3_mp_req_stop_rxtx(struct rte_eth_dev *dev) mp_req_on_rxtx(dev, HNS3_MP_REQ_STOP_RXTX); } +void +hns3_mp_req_stop_tx(struct rte_eth_dev *dev) +{ + mp_req_on_rxtx(dev, HNS3_MP_REQ_STOP_TX); +} + +void +hns3_mp_req_start_tx(struct rte_eth_dev *dev) +{ + mp_req_on_rxtx(dev, HNS3_MP_REQ_START_TX); +} + /* * Initialize by primary process. */ -int hns3_mp_init_primary(void) +static int +hns3_mp_init_primary(void) { int ret; - if (!hns3_inited) { - /* primary is allowed to not support IPC */ - ret = rte_mp_action_register(HNS3_MP_NAME, mp_primary_handle); - if (ret && rte_errno != ENOTSUP) - return ret; + if (process_data.init_done) + return 0; - hns3_inited = true; - } + /* primary is allowed to not support IPC */ + ret = rte_mp_action_register(HNS3_MP_NAME, mp_primary_handle); + if (ret && rte_errno != ENOTSUP) + return ret; + + process_data.init_done = true; return 0; } /* - * Un-initialize by primary process. + * Initialize by secondary process. */ -void hns3_mp_uninit_primary(void) +static int +hns3_mp_init_secondary(void) { - if (hns3_inited) - rte_mp_action_unregister(HNS3_MP_NAME); + int ret; + + if (process_data.init_done) + return 0; + + ret = rte_mp_action_register(HNS3_MP_NAME, mp_secondary_handle); + if (ret && rte_errno != ENOTSUP) + return ret; + + process_data.init_done = true; + + return 0; } -/* - * Initialize by secondary process. - */ -int hns3_mp_init_secondary(void) +int +hns3_mp_init(struct rte_eth_dev *dev) { + struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private); int ret; - if (!hns3_inited) { - ret = rte_mp_action_register(HNS3_MP_NAME, mp_secondary_handle); - if (ret) + if (rte_eal_process_type() != RTE_PROC_PRIMARY) { + ret = hns3_mp_init_secondary(); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to init for secondary process, ret = %d", + ret); return ret; - - hns3_inited = true; + } + __atomic_fetch_add(&hw->secondary_cnt, 1, __ATOMIC_RELAXED); + } else { + ret = hns3_mp_init_primary(); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to init for primary process, ret = %d", + ret); + return ret; + } } + process_data.eth_dev_cnt++; + return 0; } + +void hns3_mp_uninit(struct rte_eth_dev *dev) +{ + struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private); + + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED); + + process_data.eth_dev_cnt--; + if (process_data.eth_dev_cnt == 0) { + rte_mp_action_unregister(HNS3_MP_NAME); + process_data.init_done = false; + } +}