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

Merge branch 'dev' into freebsd13

This commit is contained in:
fengbojiang 2021-09-30 19:58:08 +08:00
parent 4067b6e905 81dd6c7a24
commit 3ae8012231
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.ini
View File

@ -93,7 +93,7 @@ gateway=192.168.1.1
# Multi virtual IPv4/IPv6 net addr, Optional parameters.
# `vip_ifname`: default `f-stack-x`
# `vip_addr`: Separated by semicolons, MAX number 64;
Only support netmask 255.255.255.255, broadcast x.x.x.255 now, hard code in `ff_veth_setvaddr`.
# Only support netmask 255.255.255.255, broadcast x.x.x.255 now, hard code in `ff_veth_setvaddr`.
# `vip_addr6`: Separated by semicolons, MAX number 64.
# `vip_prefix_len`: All addr6 use the same prefix now, default 64.
#vip_ifname=lo0

2
doc/F-Stack_Build_Guide.md
View File

@ -65,7 +65,7 @@ $ make
## Compile dpdk in virtual machine
- f-stack/dpdk/lib/librte_eal/linuxapp/igb_uio/igb_uio.c line 279:
- f-stack/dpdk/kernel/linux/igb_uio/igb_uio.c line 274:
```
- if (pci_intx_mask_supported(udev->pdev)) {

17
lib/ff_dpdk_if.c
View File

@ -77,6 +77,7 @@ static int numa_on;
static unsigned idle_sleep;
static unsigned pkt_tx_delay;
static uint64_t usr_cb_tsc;
static struct rte_timer freebsd_clock;
@ -1281,12 +1282,14 @@ process_packets(uint16_t port_id, uint16_t queue_id, struct rte_mbuf **bufs,
uint16_t len = rte_pktmbuf_data_len(rtem);
if (!pkts_from_ring) {
ff_traffic.rx_packets++;
ff_traffic.rx_bytes += len;
ff_traffic.rx_packets += rtem->nb_segs;
ff_traffic.rx_bytes += rte_pktmbuf_pkt_len(rtem);
}
if (!pkts_from_ring && packet_dispatcher) {
uint64_t cur_tsc = rte_rdtsc();
int ret = (*packet_dispatcher)(data, &len, queue_id, nb_queues);
usr_cb_tsc += rte_rdtsc() - cur_tsc;
if (ret == FF_DISPATCH_RESPONSE) {
rte_pktmbuf_pkt_len(rtem) = rte_pktmbuf_data_len(rtem) = len;
@ -1399,7 +1402,7 @@ process_dispatch_ring(uint16_t port_id, uint16_t queue_id,
process_packets(port_id, queue_id, pkts_burst, nb_rb, ctx, 1);
}
return 0;
return nb_rb;
}
static inline void
@ -1844,6 +1847,7 @@ main_loop(void *arg)
idle = 1;
sys_tsc = 0;
usr_tsc = 0;
usr_cb_tsc = 0;
/*
* TX burst queue drain
@ -1880,7 +1884,7 @@ main_loop(void *arg)
}
#endif
process_dispatch_ring(port_id, queue_id, pkts_burst, ctx);
idle &= !process_dispatch_ring(port_id, queue_id, pkts_burst, ctx);
nb_rx = rte_eth_rx_burst(port_id, queue_id, pkts_burst,
MAX_PKT_BURST);
@ -1925,12 +1929,13 @@ main_loop(void *arg)
end_tsc = idle_sleep_tsc;
}
usr_tsc = usr_cb_tsc;
if (usch_tsc == cur_tsc) {
usr_tsc = idle_sleep_tsc - div_tsc;
usr_tsc += idle_sleep_tsc - div_tsc;
}
if (!idle) {
sys_tsc = div_tsc - cur_tsc;
sys_tsc = div_tsc - cur_tsc - usr_cb_tsc;
ff_top_status.sys_tsc += sys_tsc;
}