git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/hns3: fix return value for unsupported tuple
[dpdk.git]
/
drivers
/
net
/
softnic
/
rte_eth_softnic_thread.c
diff --git
a/drivers/net/softnic/rte_eth_softnic_thread.c
b/drivers/net/softnic/rte_eth_softnic_thread.c
index
dcfb5eb
..
ec8bef4
100644
(file)
--- a/
drivers/net/softnic/rte_eth_softnic_thread.c
+++ b/
drivers/net/softnic/rte_eth_softnic_thread.c
@@
-18,22
+18,20
@@
#include "rte_eth_softnic_internals.h"
/**
#include "rte_eth_softnic_internals.h"
/**
- * Ma
ster
thread: data plane thread init
+ * Ma
in
thread: data plane thread init
*/
void
softnic_thread_free(struct pmd_internals *softnic)
{
uint32_t i;
*/
void
softnic_thread_free(struct pmd_internals *softnic)
{
uint32_t i;
- RTE_LCORE_FOREACH_
SLAVE
(i) {
+ RTE_LCORE_FOREACH_
WORKER
(i) {
struct softnic_thread *t = &softnic->thread[i];
/* MSGQs */
struct softnic_thread *t = &softnic->thread[i];
/* MSGQs */
- if (t->msgq_req)
- rte_ring_free(t->msgq_req);
+ rte_ring_free(t->msgq_req);
- if (t->msgq_rsp)
- rte_ring_free(t->msgq_rsp);
+ rte_ring_free(t->msgq_rsp);
}
}
}
}
@@
-78,7
+76,7
@@
softnic_thread_init(struct pmd_internals *softnic)
return -1;
}
return -1;
}
- /* Ma
ster
thread records */
+ /* Ma
in
thread records */
t->msgq_req = msgq_req;
t->msgq_rsp = msgq_rsp;
t->service_id = UINT32_MAX;
t->msgq_req = msgq_req;
t->msgq_rsp = msgq_rsp;
t->service_id = UINT32_MAX;
@@
-99,7
+97,7
@@
softnic_thread_init(struct pmd_internals *softnic)
static inline int
thread_is_valid(struct pmd_internals *softnic, uint32_t thread_id)
{
static inline int
thread_is_valid(struct pmd_internals *softnic, uint32_t thread_id)
{
- if (thread_id == rte_get_ma
ster
_lcore())
+ if (thread_id == rte_get_ma
in
_lcore())
return 0; /* FALSE */
if (softnic->params.sc && rte_lcore_has_role(thread_id, ROLE_SERVICE))
return 0; /* FALSE */
if (softnic->params.sc && rte_lcore_has_role(thread_id, ROLE_SERVICE))
@@
-129,14
+127,12
@@
thread_sc_service_up(struct pmd_internals *softnic, uint32_t thread_id)
struct softnic_thread *t = &softnic->thread[thread_id];
struct rte_eth_dev *dev;
int status;
struct softnic_thread *t = &softnic->thread[thread_id];
struct rte_eth_dev *dev;
int status;
- uint16_t port_id;
/* service params */
/* service params */
-
status = rte_eth_dev_get_port_by_name(softnic->params.name, &port_id
);
- if (
status
)
- return
status
;
+
dev = rte_eth_dev_get_by_name(softnic->params.name
);
+ if (
!dev
)
+ return
-EINVAL
;
- dev = &rte_eth_devices[port_id];
snprintf(service_params.name, sizeof(service_params.name), "%s_%u",
softnic->params.name,
thread_id);
snprintf(service_params.name, sizeof(service_params.name), "%s_%u",
softnic->params.name,
thread_id);
@@
-209,7
+205,7
@@
pipeline_is_running(struct pipeline *p)
}
/**
}
/**
- * Ma
ster
thread & data plane threads: message passing
+ * Ma
in
thread & data plane threads: message passing
*/
enum thread_req_type {
THREAD_REQ_PIPELINE_ENABLE = 0,
*/
enum thread_req_type {
THREAD_REQ_PIPELINE_ENABLE = 0,
@@
-243,7
+239,7
@@
struct thread_msg_rsp {
};
/**
};
/**
- * Ma
ster
thread
+ * Ma
in
thread
*/
static struct thread_msg_req *
thread_msg_alloc(void)
*/
static struct thread_msg_req *
thread_msg_alloc(void)
@@
-587,7
+583,7
@@
thread_msg_handle(struct softnic_thread_data *t)
}
/**
}
/**
- * Ma
ster
thread & data plane threads: message passing
+ * Ma
in
thread & data plane threads: message passing
*/
enum pipeline_req_type {
/* Port IN */
*/
enum pipeline_req_type {
/* Port IN */
@@
-753,7
+749,7
@@
struct pipeline_msg_rsp {
};
/**
};
/**
- * Ma
ster
thread
+ * Ma
in
thread
*/
static struct pipeline_msg_req *
pipeline_msg_alloc(void)
*/
static struct pipeline_msg_req *
pipeline_msg_alloc(void)