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

vlan_strip support kni.

This commit is contained in:
fengbojiang 2022-11-12 23:35:29 +08:00
parent 5857f99fe9
commit a329eaf2c0
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/ff_dpdk_if.c
View File

@ -1383,6 +1383,24 @@ pktmbuf_deep_clone(const struct rte_mbuf *md,
return mc; return mc;
} }
static inline void
ff_add_vlan_tag(struct rte_mbuf * rtem)
{
void *data = NULL;
if (rtem->ol_flags & PKT_RX_VLAN_STRIPPED) {
data = rte_pktmbuf_prepend(rtem, sizeof(struct rte_vlan_hdr));
if (data != NULL) {
memmove(data, data + sizeof(struct rte_vlan_hdr), RTE_ETHER_HDR_LEN);
struct rte_ether_hdr *etherhdr = (struct rte_ether_hdr *)data;
struct rte_vlan_hdr *vlanhdr = (struct rte_vlan_hdr *)(data + RTE_ETHER_HDR_LEN);
vlanhdr->vlan_tci = rte_cpu_to_be_16(rtem->vlan_tci);
vlanhdr->eth_proto = etherhdr->ether_type;
etherhdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN);
}
}
}
static inline void static inline void
process_packets(uint16_t port_id, uint16_t queue_id, struct rte_mbuf **bufs, process_packets(uint16_t port_id, uint16_t queue_id, struct rte_mbuf **bufs,
uint16_t count, const struct ff_dpdk_if_context *ctx, int pkts_from_ring) uint16_t count, const struct ff_dpdk_if_context *ctx, int pkts_from_ring)
@ -1414,21 +1432,10 @@ process_packets(uint16_t port_id, uint16_t queue_id, struct rte_mbuf **bufs,
usr_cb_tsc += rte_rdtsc() - cur_tsc; usr_cb_tsc += rte_rdtsc() - cur_tsc;
if (ret == FF_DISPATCH_RESPONSE) { if (ret == FF_DISPATCH_RESPONSE) {
rte_pktmbuf_pkt_len(rtem) = rte_pktmbuf_data_len(rtem) = len; rte_pktmbuf_pkt_len(rtem) = rte_pktmbuf_data_len(rtem) = len;
/* /*
* We have not support vlan out strip * We have not support vlan out strip
*/ */
if (rtem->vlan_tci) { ff_add_vlan_tag(rtem);
data = rte_pktmbuf_prepend(rtem, sizeof(struct rte_vlan_hdr));
if (data != NULL) {
memmove(data, data + sizeof(struct rte_vlan_hdr), RTE_ETHER_HDR_LEN);
struct rte_ether_hdr *etherhdr = (struct rte_ether_hdr *)data;
struct rte_vlan_hdr *vlanhdr = (struct rte_vlan_hdr *)(data + RTE_ETHER_HDR_LEN);
vlanhdr->vlan_tci = rte_cpu_to_be_16(rtem->vlan_tci);
vlanhdr->eth_proto = etherhdr->ether_type;
etherhdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN);
}
}
send_single_packet(rtem, port_id); send_single_packet(rtem, port_id);
continue; continue;
} }
@ -1482,6 +1489,7 @@ process_packets(uint16_t port_id, uint16_t queue_id, struct rte_mbuf **bufs,
mbuf_pool = pktmbuf_pool[qconf->socket_id]; mbuf_pool = pktmbuf_pool[qconf->socket_id];
mbuf_clone = pktmbuf_deep_clone(rtem, mbuf_pool); mbuf_clone = pktmbuf_deep_clone(rtem, mbuf_pool);
if(mbuf_clone) { if(mbuf_clone) {
ff_add_vlan_tag(mbuf_clone);
ff_kni_enqueue(port_id, mbuf_clone); ff_kni_enqueue(port_id, mbuf_clone);
} }
} }
@ -1490,6 +1498,7 @@ process_packets(uint16_t port_id, uint16_t queue_id, struct rte_mbuf **bufs,
#ifdef FF_KNI #ifdef FF_KNI
} else if (enable_kni) { } else if (enable_kni) {
if (knictl_action == FF_KNICTL_ACTION_ALL_TO_KNI){ if (knictl_action == FF_KNICTL_ACTION_ALL_TO_KNI){
ff_add_vlan_tag(rtem);
ff_kni_enqueue(port_id, rtem); ff_kni_enqueue(port_id, rtem);
} else if (knictl_action == FF_KNICTL_ACTION_ALL_TO_FF){ } else if (knictl_action == FF_KNICTL_ACTION_ALL_TO_FF){
ff_veth_input(ctx, rtem); ff_veth_input(ctx, rtem);
@ -1497,7 +1506,8 @@ process_packets(uint16_t port_id, uint16_t queue_id, struct rte_mbuf **bufs,
if (enable_kni && if (enable_kni &&
((filter == FILTER_KNI && kni_accept) || ((filter == FILTER_KNI && kni_accept) ||
(filter == FILTER_UNKNOWN && !kni_accept)) ) { (filter == FILTER_UNKNOWN && !kni_accept)) ) {
ff_kni_enqueue(port_id, rtem); ff_add_vlan_tag(rtem);
ff_kni_enqueue(port_id, rtem);
} else { } else {
ff_veth_input(ctx, rtem); ff_veth_input(ctx, rtem);
} }