Merge branch 'master' into dev

vlan bug fix

lib/ff_api.symlist

@@ -53,3 +53,4 @@ ff_dup2
 ff_next_mbuf
 ff_mbuf_mtod
 ff_rte_frm_extcl
+ff_mbuf_set_vlan_info

lib/ff_dpdk_if.c

@@ -820,11 +820,6 @@ ff_veth_input(const struct ff_dpdk_if_context *ctx, struct rte_mbuf *pkt)
         }
     }
 
-    /*
-     * FIXME: should we save pkt->vlan_tci
-     * if (pkt->ol_flags & PKT_RX_VLAN_PKT)
-     */
-
     void *data = rte_pktmbuf_mtod(pkt, void*);
     uint16_t len = rte_pktmbuf_data_len(pkt);
 
@@ -834,6 +829,10 @@ ff_veth_input(const struct ff_dpdk_if_context *ctx, struct rte_mbuf *pkt)
         return;
     }
 
+    if (pkt->ol_flags & PKT_RX_VLAN_STRIPPED) {
+        ff_mbuf_set_vlan_info(hdr, pkt->vlan_tci);
+    }
+
     struct rte_mbuf *pn = pkt->next;
     void *prev = hdr;
     while(pn != NULL) {
@@ -860,16 +859,22 @@ protocol_filter(const void *data, uint16_t len)
         return FILTER_UNKNOWN;
 
     const struct ether_hdr *hdr;
+    const struct vlan_hdr *vlanhdr;
     hdr = (const struct ether_hdr *)data;
-    uint16_t eth_frame_type = rte_be_to_cpu_16(hdr->ether_type);
+    uint16_t ether_type = rte_be_to_cpu_16(hdr->ether_type);
 
-    if(eth_frame_type == ETHER_TYPE_ARP)
+    if (ether_type == ETHER_TYPE_VLAN) {
+        vlanhdr = (struct vlan_hdr *)(data + sizeof(struct ether_hdr));
+        ether_type = rte_be_to_cpu_16(vlanhdr->eth_proto);
+    }
+
+    if(ether_type == ETHER_TYPE_ARP)
         return FILTER_ARP;
 
 #ifdef INET6
-    if (eth_frame_type == ETHER_TYPE_IPv6) {
+    if (ether_type == ETHER_TYPE_IPv6) {
         return ff_kni_proto_filter(data + ETHER_HDR_LEN,
-            len - ETHER_HDR_LEN, eth_frame_type);
+            len - ETHER_HDR_LEN, ether_type);
     }
 #endif
 
@@ -880,11 +885,11 @@ protocol_filter(const void *data, uint16_t len)
         return FILTER_UNKNOWN;
     }
 
-    if(eth_frame_type != ETHER_TYPE_IPv4)
+    if(ether_type != ETHER_TYPE_IPv4)
         return FILTER_UNKNOWN;
 
     return ff_kni_proto_filter(data + ETHER_HDR_LEN,
-        len - ETHER_HDR_LEN, eth_frame_type);
+        len - ETHER_HDR_LEN, ether_type);
 #endif
 }
 

lib/ff_veth.c

@@ -205,7 +205,6 @@ ff_mbuf_gethdr(void *pkt, uint16_t total, void *data,
             CSUM_DATA_VALID | CSUM_PSEUDO_HDR;
         m->m_pkthdr.csum_data = 0xffff;
     }
-
     return (void *)m;
 }
 
@@ -457,4 +456,11 @@ void* ff_rte_frm_extcl(void* mbuf)
         return NULL;
 }
 
+void
+ff_mbuf_set_vlan_info(void *hdr, uint16_t vlan_tci) {
+    struct mbuf *m = (struct mbuf *)hdr;
+    m->m_pkthdr.ether_vtag = vlan_tci;
+    m->m_flags |= M_VLANTAG;
+    return;
+}
 

lib/ff_veth.h

@@ -48,5 +48,6 @@ void ff_veth_process_packet(void *arg, void *m);
 
 void *ff_veth_softc_to_hostc(void *softc);
 
+void ff_mbuf_set_vlan_info(void *hdr, uint16_t vlan_tci);
 
 #endif /* ifndef _FSTACK_VETH_H */