R4.1

.gitreview

@@ -13,4 +13,4 @@
 host=review.opencontrail.org
 port=29418
 project=Juniper/contrail-vrouter.git
-defaultbranch=master
+defaultbranch=R4.1

Makefile

@@ -53,6 +53,7 @@ ifneq ($(KERNELRELEASE), )
 	vrouter-y += linux/vrouter_mod.o linux/vhost_dev.o
 	vrouter-y += linux/vr_host_interface.o linux/vr_genetlink.o
 	vrouter-y += linux/vr_mem.o linux/vr_fragment_assembler.o
+	vrouter-y += linux/vr_offloads.o
 
 	vrouter-y += dp-core/vr_message.o dp-core/vr_sandesh.o
 	vrouter-y += dp-core/vr_queue.o dp-core/vr_index_table.o
@@ -74,6 +75,7 @@ ifneq ($(KERNELRELEASE), )
 	ccflags-y += -I$(SANDESH_EXTRA_HEADER_PATH)
 	ccflags-y += -I$(SANDESH_EXTRA_HEADER_PATH)/sandesh/library/c
 	ccflags-y += -g -Wall
+        ccflags-$(CONFIG_RETPOLINE) += -DRETPOLINE
 
 	ifeq ($(shell uname -r | grep 2.6.32|grep -c openstack),1)
 		ccflags-y += -DISRHOSKERNEL

SConscript

@@ -99,12 +99,12 @@ kernel_build_dir = None
 if (PLATFORM.lower() == 'ubuntu' and VERSION.find('14.') == 0):
     if re.search('^4\.', default_kernel_ver):
         print "Warn: kernel version %s not supported for vrouter and dpdk" % default_kernel_ver
-        kernel_build_dir = '/lib/modules/3.13.0-110-generic/build'
+        kernel_build_dir = '/lib/modules/3.13.0-171-generic/build'
         if os.path.isdir(kernel_build_dir):
-            default_kernel_ver = "3.13.0-110-generic"
+            default_kernel_ver = "3.13.0-171-generic"
             print "info: libdpdk will be built against kernel version %s" % default_kernel_ver
         else:
-            print "*** Error: Cannot find kernel v3.13.0-110, build of vrouter will likely fail"
+            print "*** Error: Cannot find kernel v3.13.0-171, build of vrouter will likely fail"
             kernel_build_dir = '/lib/modules/%s/build' % default_kernel_ver
 
 kernel_dir = GetOption('kernel-dir')
@@ -202,6 +202,7 @@ if sys.platform != 'darwin':
             '-lrte_pmd_i40e',
         #    '-lrte_pmd_fm10k',
             '-lrte_pmd_ixgbe',
+            '-lrte_pmd_nfp',
             '-lrte_pmd_e1000',
         #    '-lrte_pmd_mlx4',
         #    '-lrte_pmd_ring',

dp-core/vr_bridge.c

@@ -23,7 +23,6 @@ unsigned int vr_bridge_oentries = 0;
 static vr_htable_t vn_rtable;
 char vr_bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
-struct vr_nexthop *(*vr_bridge_lookup)(unsigned int, struct vr_route_req *);
 int bridge_table_init(struct vr_rtable *, struct rtable_fspec *);
 void bridge_table_deinit(struct vr_rtable *, struct rtable_fspec *, bool);
 struct vr_bridge_entry *vr_find_bridge_entry(struct vr_bridge_entry_key *);
@@ -295,6 +294,15 @@ bridge_table_lookup(unsigned int vrf_id, struct vr_route_req *rt)
     return rt->rtr_nh;
 }
 
+struct vr_nexthop *
+vr_bridge_lookup(unsigned int vrf_id, struct vr_route_req *rt)
+{
+    if (!vn_rtable)
+        return NULL;
+
+    return bridge_table_lookup(vrf_id, rt);
+}
+
 static struct vr_bridge_entry *
 bridge_lookup(uint8_t *mac, struct vr_forwarding_md *fmd)
 {
@@ -484,14 +492,15 @@ bridge_table_dump(struct vr_rtable * __unsued, struct vr_route_req *rt)
     struct vr_message_dumper *dumper;
     char *mac;
 
+    if (rt->rtr_req.rtr_mac_size != VR_ETHER_ALEN)
+        return -EINVAL;
+
     dumper = vr_message_dump_init(&rt->rtr_req);
     if (!dumper) {
         ret = -ENOMEM;
         goto generate_response;
     }
 
-    if (rt->rtr_req.rtr_mac_size != VR_ETHER_ALEN)
-        return -EINVAL;
 
     mac = (char *)(((vr_route_req *)(dumper->dump_req))->rtr_mac);
     if (!mac) {
@@ -622,6 +631,13 @@ bridge_table_init(struct vr_rtable *rtable, struct rtable_fspec *fs)
     if (!vr_bridge_oentries)
         vr_bridge_oentries = ((vr_bridge_entries / 5) + 1023) & ~1023;
 
+    if (!vr_bridge_table && vr_huge_page_mem_get) {
+        vr_bridge_table = vr_huge_page_mem_get(VR_BRIDGE_TABLE_SIZE +
+                VR_BRIDGE_OFLOW_TABLE_SIZE);
+        if (vr_bridge_table)
+            vr_bridge_otable = vr_bridge_table + VR_BRIDGE_TABLE_SIZE;
+    }
+
     rtable->algo_data = vr_htable_attach(vrouter_get(0), vr_bridge_entries,
                 vr_bridge_table, vr_bridge_oentries, vr_bridge_otable,
                 sizeof(struct vr_bridge_entry),
@@ -641,7 +657,6 @@ bridge_table_init(struct vr_rtable *rtable, struct rtable_fspec *fs)
     rtable->algo_get = bridge_table_get;
     rtable->algo_dump = bridge_table_dump;
 
-    vr_bridge_lookup = bridge_table_lookup;
     vn_rtable = rtable->algo_data;
 
     return 0;
@@ -887,6 +902,9 @@ vr_bridge_input(struct vrouter *router, struct vr_packet *pkt,
             }
         }
 
+        if (IS_MAC_BMCAST(dmac) && (pkt->vp_if->vif_mcast_vrf != 65535))
+            fmd->fmd_dvrf = pkt->vp_if->vif_mcast_vrf;
+
         be = bridge_lookup(dmac, fmd);
         if (be)
             nh = be->be_nh;

dp-core/vr_datapath.c

@@ -20,7 +20,7 @@ vr_get_proxy_mac(struct vr_packet *pkt, struct vr_forwarding_md *fmd,
         struct vr_route_req *rt, unsigned char *dmac)
 {
     bool from_fabric, stitched, flood, over_lay, hosted_vm;
-    bool to_gateway, no_proxy, to_vcp, ecmp_src;
+    bool to_gateway, no_proxy, to_vcp;
 
     unsigned char *resp_mac;
     struct vr_nexthop *nh = NULL, *l3_nh = NULL;
@@ -29,7 +29,7 @@ vr_get_proxy_mac(struct vr_packet *pkt, struct vr_forwarding_md *fmd,
 
     over_lay = true;
     from_fabric = stitched = flood = hosted_vm = false;
-    to_gateway = to_vcp = no_proxy = ecmp_src = false;
+    to_gateway = to_vcp = no_proxy = false;
 
     stats = vr_inet_vrf_stats(fmd->fmd_dvrf, pkt->vp_cpu);
     /* here we will not check for stats, but will check before use */
@@ -84,13 +84,6 @@ vr_get_proxy_mac(struct vr_packet *pkt, struct vr_forwarding_md *fmd,
     if (vr_hosted_nexthop(nh))
         hosted_vm = true;
 
-    /* If ECMP source, we force routing */
-    if (fmd->fmd_ecmp_src_nh_index != -1) {
-        resp_mac = vif->vif_mac;
-        fmd->fmd_ecmp_src_nh_index = -1;
-        ecmp_src = true;
-    }
-
 
     /*
      * situations that are handled here (from_fabric)
@@ -107,38 +100,6 @@ vr_get_proxy_mac(struct vr_packet *pkt, struct vr_forwarding_md *fmd,
      * . arp request from the uplink port of a vcp
      */
     if (from_fabric) {
-        if (ecmp_src) {
-
-            /*
-             * If a Multicast ARP request, it is not answered on Fabric
-             * side
-             */
-            if (IS_MAC_BMCAST(dmac))
-                return MR_DROP;
-
-            /*
-             * If unicast and not stiched, we do not have enough
-             * information what to respond. We can not even flood,
-             * probably because this need to be answered with Vrouter
-             * Mac in source Vrouter itself. So we drop this
-             */
-            if (!stitched)
-                return MR_DROP;
-
-            /*
-             * If our stiched mac does not match, we will let the VM
-             * decide what to do with request
-             */
-            if (!VR_MAC_CMP(dmac, rt->rtr_req.rtr_mac))
-                return MR_FLOOD;
-
-            /*
-             * Very likely response need to go with stiched mac. But
-             * below conditions might override
-             */
-            resp_mac = rt->rtr_req.rtr_mac;
-        }
-
         if (flood && !stitched) {
             if (stats)
                 stats->vrf_arp_physical_flood++;