cmhi
/
f-stack
mirror of https://github.com/F-Stack/f-stack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some issues of ff msg.

This commit is contained in:
fengbojiang 2021-01-28 22:50:22 +08:00
parent a32da8f0cf
commit 4b7cdbfe03
3 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/ff_dpdk_if.c
View File

@ -1600,17 +1600,33 @@ handle_msg(struct ff_msg *msg, uint16_t proc_id)
handle_default_msg(msg); handle_default_msg(msg);
break; break;
} }
rte_ring_enqueue(msg_ring[proc_id].ring[msg->msg_type], msg); if (rte_ring_enqueue(msg_ring[proc_id].ring[msg->msg_type], msg) < 0) {
if (msg->original_buf) {
rte_free(msg->buf_addr);
msg->buf_addr = msg->original_buf;
msg->buf_len = msg->original_buf_len;
msg->original_buf = NULL;
}
rte_mempool_put(message_pool, msg);
}
} }
static inline int static inline int
process_msg_ring(uint16_t proc_id) process_msg_ring(uint16_t proc_id, struct rte_mbuf **pkts_burst)
{ {
void *msg; /* read msg from ring buf and to process */
int ret = rte_ring_dequeue(msg_ring[proc_id].ring[0], &msg); uint16_t nb_rb;
int i;
if (unlikely(ret == 0)) { nb_rb = rte_ring_dequeue_burst(msg_ring[proc_id].ring[0],
handle_msg((struct ff_msg *)msg, proc_id); (void **)pkts_burst, MAX_PKT_BURST, NULL);
if (likely(nb_rb == 0))
return 0;
for (i = 0; i < nb_rb; ++i) {
handle_msg((struct ff_msg *)pkts_burst[i], proc_id);
} }
return 0; return 0;
@ -1902,7 +1918,7 @@ main_loop(void *arg)
} }
} }
process_msg_ring(qconf->proc_id); process_msg_ring(qconf->proc_id, pkts_burst);
div_tsc = rte_rdtsc(); div_tsc = rte_rdtsc();

7
tools/compat/ff_ipc.c
View File

@ -114,6 +114,13 @@ ff_ipc_msg_free(struct ff_msg *msg)
return -1; return -1;
} }
if (msg->original_buf) {
rte_free(msg->buf_addr);
msg->buf_addr = msg->original_buf;
msg->buf_len = msg->original_buf_len;
msg->original_buf = NULL;
}
rte_mempool_put(message_pool, msg); rte_mempool_put(message_pool, msg);
return 0; return 0;

16
tools/compat/sysctl.c
View File

@ -30,16 +30,6 @@
#include "ff_ipc.h" #include "ff_ipc.h"
#define FREE_FF_MSG(m) do { \
if (m->original_buf) { \
rte_free(m->buf_addr); \
m->buf_addr = m->original_buf; \
m->buf_len = m->original_buf_len; \
m->original_buf = NULL; \
} \
ff_ipc_msg_free(m); \
} while (0);
int int
sysctl(int *name, unsigned namelen, void *old, sysctl(int *name, unsigned namelen, void *old,
size_t *oldlenp, const void *new, size_t newlen) size_t *oldlenp, const void *new, size_t newlen)
@ -64,7 +54,7 @@ sysctl(int *name, unsigned namelen, void *old,
oldlen = *oldlenp; oldlen = *oldlenp;
} }
total_len = namelen + oldlen + newlen; total_len = namelen * sizeof(int) + sizeof(size_t) + oldlen + newlen;
if (total_len > msg->buf_len) { if (total_len > msg->buf_len) {
extra_buf = rte_malloc(NULL, total_len, 0); extra_buf = rte_malloc(NULL, total_len, 0);
if (extra_buf == NULL) { if (extra_buf == NULL) {
@ -123,7 +113,7 @@ sysctl(int *name, unsigned namelen, void *old,
do { do {
if (retmsg != NULL) { if (retmsg != NULL) {
FREE_FF_MSG(retmsg) ff_ipc_msg_free(retmsg);
} }
ret = ff_ipc_recv(&retmsg, msg->msg_type); ret = ff_ipc_recv(&retmsg, msg->msg_type);
if (ret < 0) { if (ret < 0) {
@ -147,7 +137,7 @@ sysctl(int *name, unsigned namelen, void *old,
} }
error: error:
FREE_FF_MSG(msg) ff_ipc_msg_free(msg);
return ret; return ret;
} }