From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id BF1FD1B5E5 for ; Thu, 10 Jan 2019 12:36:49 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jan 2019 03:36:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,461,1539673200"; d="scan'208";a="124854204" Received: from silpixa00382658.ir.intel.com (HELO silpixa00382658.ger.corp.intel.com) ([10.237.223.75]) by FMSMGA003.fm.intel.com with ESMTP; 10 Jan 2019 03:36:47 -0800 From: Cristian Dumitrescu To: dev@dpdk.org Cc: thomas@monjalon.net, Jasvinder Singh Date: Thu, 10 Jan 2019 11:36:47 +0000 Message-Id: <20190110113647.117569-1-cristian.dumitrescu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190103160432.147027-1-cristian.dumitrescu@intel.com> References: <20190103160432.147027-1-cristian.dumitrescu@intel.com> Subject: [dpdk-dev] [PATCH v2] net/softnic: add support for service cores X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2019 11:36:50 -0000 Signed-off-by: Cristian Dumitrescu Signed-off-by: Jasvinder Singh --- Changes in V2: -fixed compilation for some 32-bit targets by removing the need for function pointer conversion drivers/net/softnic/rte_eth_softnic.c | 11 ++ drivers/net/softnic/rte_eth_softnic.h | 20 +++ .../net/softnic/rte_eth_softnic_internals.h | 6 +- .../net/softnic/rte_eth_softnic_pipeline.c | 13 ++ drivers/net/softnic/rte_eth_softnic_thread.c | 166 ++++++++++++++---- 5 files changed, 181 insertions(+), 35 deletions(-) diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c index 14d4a1030..32b001fd3 100644 --- a/drivers/net/softnic/rte_eth_softnic.c +++ b/drivers/net/softnic/rte_eth_softnic.c @@ -22,6 +22,7 @@ #define PMD_PARAM_FIRMWARE "firmware" #define PMD_PARAM_CONN_PORT "conn_port" #define PMD_PARAM_CPU_ID "cpu_id" +#define PMD_PARAM_SC "sc" #define PMD_PARAM_TM_N_QUEUES "tm_n_queues" #define PMD_PARAM_TM_QSIZE0 "tm_qsize0" #define PMD_PARAM_TM_QSIZE1 "tm_qsize1" @@ -32,6 +33,7 @@ static const char * const pmd_valid_args[] = { PMD_PARAM_FIRMWARE, PMD_PARAM_CONN_PORT, PMD_PARAM_CPU_ID, + PMD_PARAM_SC, PMD_PARAM_TM_N_QUEUES, PMD_PARAM_TM_QSIZE0, PMD_PARAM_TM_QSIZE1, @@ -426,6 +428,7 @@ pmd_parse_args(struct pmd_params *p, const char *params) memset(p, 0, sizeof(*p)); p->firmware = SOFTNIC_FIRMWARE; p->cpu_id = SOFTNIC_CPU_ID; + p->sc = SOFTNIC_SC; p->tm.n_queues = SOFTNIC_TM_N_QUEUES; p->tm.qsize[0] = SOFTNIC_TM_QUEUE_SIZE; p->tm.qsize[1] = SOFTNIC_TM_QUEUE_SIZE; @@ -456,6 +459,14 @@ pmd_parse_args(struct pmd_params *p, const char *params) goto out_free; } + /* Service cores (optional) */ + if (rte_kvargs_count(kvlist, PMD_PARAM_SC) == 1) { + ret = rte_kvargs_process(kvlist, PMD_PARAM_SC, + &get_uint32, &p->sc); + if (ret < 0) + goto out_free; + } + /* TM number of queues (optional) */ if (rte_kvargs_count(kvlist, PMD_PARAM_TM_N_QUEUES) == 1) { ret = rte_kvargs_process(kvlist, PMD_PARAM_TM_N_QUEUES, diff --git a/drivers/net/softnic/rte_eth_softnic.h b/drivers/net/softnic/rte_eth_softnic.h index 048dfe6bf..e8ba2bcaa 100644 --- a/drivers/net/softnic/rte_eth_softnic.h +++ b/drivers/net/softnic/rte_eth_softnic.h @@ -26,6 +26,26 @@ extern "C" { #define SOFTNIC_CPU_ID 0 #endif +/** + * Service cores: + * + * 0 = The current device is run explicitly by the application. The firmware + * creates one or several pipelines for the current device and maps them to + * CPU cores that should not be service cores. The application is required + * to call rte_pmd_softnic_run() for the current device on each of these CPU + * cores in order to make the current device work. + * + * 1 = The current device is run on the service cores transparently to the + * application. The firmware creates one or several pipelines for the + * current device and maps them to CPU cores that should be service cores. + * Each of these service cores is calling rte_pmd_softnic_run() for the + * current device in order to make the current device work. The application + * is not allowed to call rte_pmd_softnic_run() for the current device. + */ +#ifndef SOFTNIC_SC +#define SOFTNIC_SC 1 +#endif + /** Traffic Manager: Number of scheduler queues. */ #ifndef SOFTNIC_TM_N_QUEUES #define SOFTNIC_TM_N_QUEUES (64 * 1024) diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h index 31698b9f0..3bc1de852 100644 --- a/drivers/net/softnic/rte_eth_softnic_internals.h +++ b/drivers/net/softnic/rte_eth_softnic_internals.h @@ -38,6 +38,7 @@ struct pmd_params { const char *firmware; uint16_t conn_port; uint32_t cpu_id; + int sc; /**< Service cores. */ /** Traffic Management (TM) */ struct { @@ -547,7 +548,7 @@ struct softnic_thread { struct rte_ring *msgq_req; struct rte_ring *msgq_rsp; - uint32_t enabled; + uint32_t service_id; }; /** @@ -843,6 +844,9 @@ softnic_pipeline_free(struct pmd_internals *p); void softnic_pipeline_disable_all(struct pmd_internals *p); +uint32_t +softnic_pipeline_thread_count(struct pmd_internals *p, uint32_t thread_id); + struct pipeline * softnic_pipeline_find(struct pmd_internals *p, const char *name); diff --git a/drivers/net/softnic/rte_eth_softnic_pipeline.c b/drivers/net/softnic/rte_eth_softnic_pipeline.c index 5e180f8f7..308fd1534 100644 --- a/drivers/net/softnic/rte_eth_softnic_pipeline.c +++ b/drivers/net/softnic/rte_eth_softnic_pipeline.c @@ -108,6 +108,19 @@ softnic_pipeline_disable_all(struct pmd_internals *p) pipeline->name); } +uint32_t +softnic_pipeline_thread_count(struct pmd_internals *p, uint32_t thread_id) +{ + struct pipeline *pipeline; + uint32_t count = 0; + + TAILQ_FOREACH(pipeline, &p->pipeline_list, node) + if ((pipeline->enabled) && (pipeline->thread_id == thread_id)) + count++; + + return count; +} + struct pipeline * softnic_pipeline_find(struct pmd_internals *p, const char *name) diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c index 4572adfa6..57989a5aa 100644 --- a/drivers/net/softnic/rte_eth_softnic_thread.c +++ b/drivers/net/softnic/rte_eth_softnic_thread.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -41,7 +42,7 @@ softnic_thread_init(struct pmd_internals *softnic) { uint32_t i; - RTE_LCORE_FOREACH_SLAVE(i) { + for (i = 0; i < RTE_MAX_LCORE; i++) { char ring_name[NAME_MAX]; struct rte_ring *msgq_req, *msgq_rsp; struct softnic_thread *t = &softnic->thread[i]; @@ -80,7 +81,7 @@ softnic_thread_init(struct pmd_internals *softnic) /* Master thread records */ t->msgq_req = msgq_req; t->msgq_rsp = msgq_rsp; - t->enabled = 1; + t->service_id = UINT32_MAX; /* Data plane thread records */ t_data->n_pipelines = 0; @@ -95,6 +96,25 @@ softnic_thread_init(struct pmd_internals *softnic) return 0; } +static inline int +thread_is_valid(struct pmd_internals *softnic, uint32_t thread_id) +{ + struct rte_config *cfg = rte_eal_get_configuration(); + enum rte_lcore_role_t role; + + if ((thread_id >= RTE_MAX_LCORE) || + (thread_id == cfg->master_lcore)) + return 0; /* FALSE */ + + role = cfg->lcore_role[thread_id]; + + if ((softnic->params.sc && (role == ROLE_SERVICE)) || + (!softnic->params.sc && (role == ROLE_RTE))) + return 1; /* TRUE */ + + return 0; /* FALSE */ +} + static inline int thread_is_running(uint32_t thread_id) { @@ -104,6 +124,78 @@ thread_is_running(uint32_t thread_id) return (thread_state == RUNNING)? 1 : 0; } +static int32_t +rte_pmd_softnic_run_internal(void *arg); + +static inline int +thread_sc_service_up(struct pmd_internals *softnic, uint32_t thread_id) +{ + struct rte_service_spec service_params; + struct softnic_thread *t = &softnic->thread[thread_id]; + struct rte_eth_dev *dev; + int status; + uint16_t port_id; + + /* service params */ + rte_eth_dev_get_port_by_name(softnic->params.name, &port_id); + dev = &rte_eth_devices[port_id]; + snprintf(service_params.name, sizeof(service_params.name), "%s_%u", + softnic->params.name, + thread_id); + service_params.callback = rte_pmd_softnic_run_internal; + service_params.callback_userdata = dev; + service_params.capabilities = 0; + service_params.socket_id = (int)softnic->params.cpu_id; + + /* service register */ + status = rte_service_component_register(&service_params, &t->service_id); + if (status) + return status; + + status = rte_service_component_runstate_set(t->service_id, 1); + if (status) { + rte_service_component_unregister(t->service_id); + t->service_id = UINT32_MAX; + return status; + } + + status = rte_service_runstate_set(t->service_id, 1); + if (status) { + rte_service_component_runstate_set(t->service_id, 0); + rte_service_component_unregister(t->service_id); + t->service_id = UINT32_MAX; + return status; + } + + /* service map to thread */ + status = rte_service_map_lcore_set(t->service_id, thread_id, 1); + if (status) { + rte_service_runstate_set(t->service_id, 0); + rte_service_component_runstate_set(t->service_id, 0); + rte_service_component_unregister(t->service_id); + t->service_id = UINT32_MAX; + return status; + } + + return 0; +} + +static inline void +thread_sc_service_down(struct pmd_internals *softnic, uint32_t thread_id) +{ + struct softnic_thread *t = &softnic->thread[thread_id]; + + /* service unmap from thread */ + rte_service_map_lcore_set(t->service_id, thread_id, 0); + + /* service unregister */ + rte_service_runstate_set(t->service_id, 0); + rte_service_component_runstate_set(t->service_id, 0); + rte_service_component_unregister(t->service_id); + + t->service_id = UINT32_MAX; +} + /** * Pipeline is running when: * (A) Pipeline is mapped to a data plane thread AND @@ -200,32 +292,34 @@ softnic_thread_pipeline_enable(struct pmd_internals *softnic, const char *pipeline_name) { struct pipeline *p = softnic_pipeline_find(softnic, pipeline_name); - struct softnic_thread *t; struct thread_msg_req *req; struct thread_msg_rsp *rsp; - uint32_t i; + uint32_t n_pipelines, i; int status; /* Check input params */ - if ((thread_id >= RTE_MAX_LCORE) || + if (!thread_is_valid(softnic, thread_id) || (p == NULL) || (p->n_ports_in == 0) || (p->n_ports_out == 0) || - (p->n_tables == 0)) + (p->n_tables == 0) || + p->enabled) return -1; - t = &softnic->thread[thread_id]; - if ((t->enabled == 0) || - p->enabled) + n_pipelines = softnic_pipeline_thread_count(softnic, thread_id); + if (n_pipelines >= THREAD_PIPELINES_MAX) return -1; + if (softnic->params.sc && (n_pipelines == 0)) { + status = thread_sc_service_up(softnic, thread_id); + if (status) + return status; + } + if (!thread_is_running(thread_id)) { struct softnic_thread_data *td = &softnic->thread_data[thread_id]; struct pipeline_data *tdp = &td->pipeline_data[td->n_pipelines]; - if (td->n_pipelines >= THREAD_PIPELINES_MAX) - return -1; - /* Data plane thread */ td->p[td->n_pipelines] = p->p; @@ -292,26 +386,20 @@ softnic_thread_pipeline_disable(struct pmd_internals *softnic, const char *pipeline_name) { struct pipeline *p = softnic_pipeline_find(softnic, pipeline_name); - struct softnic_thread *t; struct thread_msg_req *req; struct thread_msg_rsp *rsp; + uint32_t n_pipelines; int status; /* Check input params */ - if ((thread_id >= RTE_MAX_LCORE) || - (p == NULL)) - return -1; - - t = &softnic->thread[thread_id]; - if (t->enabled == 0) + if (!thread_is_valid(softnic, thread_id) || + (p == NULL) || + (p->enabled && (p->thread_id != thread_id))) return -1; if (p->enabled == 0) return 0; - if (p->thread_id != thread_id) - return -1; - if (!thread_is_running(thread_id)) { struct softnic_thread_data *td = &softnic->thread_data[thread_id]; uint32_t i; @@ -341,6 +429,9 @@ softnic_thread_pipeline_disable(struct pmd_internals *softnic, break; } + if (softnic->params.sc && (td->n_pipelines == 0)) + thread_sc_service_down(softnic, thread_id); + return 0; } @@ -370,6 +461,10 @@ softnic_thread_pipeline_disable(struct pmd_internals *softnic, p->enabled = 0; + n_pipelines = softnic_pipeline_thread_count(softnic, thread_id); + if (softnic->params.sc && (n_pipelines == 0)) + thread_sc_service_down(softnic, thread_id); + return 0; } @@ -409,11 +504,6 @@ thread_msg_handle_pipeline_enable(struct softnic_thread_data *t, uint32_t i; /* Request */ - if (t->n_pipelines >= THREAD_PIPELINES_MAX) { - rsp->status = -1; - return rsp; - } - t->p[t->n_pipelines] = req->pipeline_enable.p; p->p = req->pipeline_enable.p; @@ -2938,18 +3028,14 @@ pipeline_msg_handle(struct pipeline_data *p) /** * Data plane threads: main */ -int -rte_pmd_softnic_run(uint16_t port_id) +static int32_t +rte_pmd_softnic_run_internal(void *arg) { - struct rte_eth_dev *dev = &rte_eth_devices[port_id]; + struct rte_eth_dev *dev = arg; struct pmd_internals *softnic; struct softnic_thread_data *t; uint32_t thread_id, j; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG - RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, 0); -#endif - softnic = dev->data->dev_private; thread_id = rte_lcore_id(); t = &softnic->thread_data[thread_id]; @@ -3003,3 +3089,15 @@ rte_pmd_softnic_run(uint16_t port_id) return 0; } + +int +rte_pmd_softnic_run(uint16_t port_id) +{ + struct rte_eth_dev *dev = &rte_eth_devices[port_id]; + +#ifdef RTE_LIBRTE_ETHDEV_DEBUG + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, 0); +#endif + + return (int)rte_pmd_softnic_run_internal(dev); +} -- 2.17.1