R3.0

.gitreview

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

SConscript

@@ -6,6 +6,7 @@ import subprocess
 import sys
 import os
 import copy
+import re
 
 AddOption('--kernel-dir', dest = 'kernel-dir', action='store',
           help='Linux kernel source directory for vrouter.ko')
@@ -30,6 +31,10 @@ env.Append(CPPPATH = [env['TOP'] + '/vrouter/sandesh/gen-c'])
 env.Append(CPPPATH = ['#tools'])
 env.Append(CPPPATH = ['#tools/sandesh/library/c'])
 
+# Make Sandesh quiet for production
+if 'production' in env['OPT']:
+    DefaultEnvironment().Append(CPPDEFINES='SANDESH_QUIET')
+
 vr_root = './'
 makefile = vr_root + 'Makefile'
 dp_dir = Dir(vr_root).srcnode().abspath + '/'
@@ -58,6 +63,38 @@ if sys.platform.startswith('freebsd'):
     make_dir = make_dir + '/freebsd'
     env['ENV']['MAKEOBJDIR'] = make_dir
 
+# XXX Temporary/transitional support for Ubuntu14.04.4 w/ kernel v4.*
+#
+# The logic here has to handle two different invocation models:
+# default 'scons' build model; and build via packager.py build. The
+# first is typical for unit-test builds.
+#
+# The second comes via:
+# - common/debian/Makefile in contrail-packaging, which invokes:
+# - debian/contrail/debian/rules.modules in contrail-packages
+# This approach always uses --kernel-dir, which works for vrouter, but
+# libdpdk still defaults to installed version and thus will fail.
+#
+default_kernel_ver = shellCommand("uname -r").strip()
+kernel_build_dir = None
+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-85-generic/build'
+    if os.path.isdir(kernel_build_dir):
+        default_kernel_ver = "3.13.0-85-generic"
+        print "info: libdpdk will be built against kernel version %s" % default_kernel_ver
+    else:
+        print "*** Error: Cannot find kernel v3.13.0-85, build of vrouter will likely fail"
+        kernel_build_dir = '/lib/modules/%s/build' % default_kernel_ver
+
+kernel_dir = GetOption('kernel-dir')
+if kernel_dir:
+    kern_version = shellCommand('cat %s/include/config/kernel.release' % kernel_dir)
+else:
+    kern_version = default_kernel_ver
+    if kernel_build_dir: kernel_dir = kernel_build_dir
+kern_version = kern_version.strip()
+
 if sys.platform != 'darwin':
 
     install_root = GetOption('install_root')
@@ -151,6 +188,12 @@ if sys.platform != 'darwin':
             + ' EXTRA_CFLAGS="' + DPDK_FLAGS + '"' \
             + ' O=' + dpdk_dst_dir \
             + ' '
+
+        # If this var is set, then we need to pass it to make cmd for libdpdk
+        if kernel_build_dir:
+            print "info: Adjusting libdpdk build to use RTE_KERNELDIR=%s" % kernel_build_dir
+            make_cmd += "RTE_KERNELDIR=%s " % kernel_build_dir
+
         dpdk_lib = env.Command('dpdk_lib', None,
             make_cmd + 'config T=' + DPDK_TARGET
             + ' && ' + make_cmd)
@@ -164,13 +207,12 @@ if sys.platform != 'darwin':
 
     for sdir in subdirs:
         env.SConscript(sdir + '/SConscript',
-                       exports=' '.join(exports),
+                       exports = exports,
                        variant_dir = env['TOP'] + '/vrouter/' + sdir,
                        duplicate = 0)
 
     make_cmd = 'cd ' + make_dir + ' && make'
-    if GetOption('kernel-dir'):
-        make_cmd += ' KERNELDIR=' + GetOption('kernel-dir')
+    if kernel_dir: make_cmd += ' KERNELDIR=' + kernel_dir
     make_cmd += ' SANDESH_HEADER_PATH=' + Dir(env['TOP'] + '/vrouter/').abspath
     make_cmd += ' SANDESH_SRC_ROOT=' + '../build/kbuild/'
     make_cmd += ' SANDESH_EXTRA_HEADER_PATH=' + Dir('#tools/').abspath
@@ -206,13 +248,6 @@ if sys.platform != 'darwin':
     if GetOption('clean') and (not COMMAND_LINE_TARGETS or 'vrouter' in COMMAND_LINE_TARGETS):
         os.system(make_cmd + ' clean')
 
-    if GetOption('kernel-dir'):
-        kern_version = shellCommand(
-            'cat %s/include/config/kernel.release' % GetOption('kernel-dir'))
-    else:
-        kern_version = shellCommand('uname -r')
-
-    kern_version = kern_version.strip()
     libmod_dir = install_root
     libmod_dir += '/lib/modules/%s/extra/net/vrouter' % kern_version
     env.Alias('build-kmodule', env.Install(libmod_dir, kern))

dp-core/vr_bridge.c

@@ -39,7 +39,7 @@ struct vr_bridge_entry {
 } __attribute__((packed));
 
 unsigned int vr_bridge_entries = VR_DEF_BRIDGE_ENTRIES;
-unsigned int vr_bridge_oentries = VR_DEF_BRIDGE_OENTRIES;
+unsigned int vr_bridge_oentries = 0;
 static vr_htable_t vn_rtable;
 char vr_bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
@@ -246,6 +246,25 @@ bridge_table_lookup(unsigned int vrf_id, struct vr_route_req *rt)
     return rt->rtr_nh;
 }
 
+struct vr_nexthop *
+__vrouter_bridge_lookup(unsigned int vrf_id, unsigned char *mac)
+{
+    struct vr_route_req rt;
+
+    if (!mac)
+        return NULL;
+
+    rt.rtr_req.rtr_label_flags = 0;
+    rt.rtr_req.rtr_index = VR_BE_INVALID_INDEX;
+    rt.rtr_req.rtr_mac_size = VR_ETHER_ALEN;
+    rt.rtr_req.rtr_mac = mac;
+    /* If multicast L2 packet, use broadcast composite nexthop */
+    if (IS_MAC_BMCAST(rt.rtr_req.rtr_mac))
+        rt.rtr_req.rtr_mac = (int8_t *)vr_bcast_mac;
+   rt.rtr_req.rtr_vrf_id = vrf_id;
+
+    return vr_bridge_lookup(vrf_id,  &rt);
+}
 
 unsigned short
 vr_bridge_route_flags(unsigned int vrf_id, unsigned char *mac)
@@ -263,15 +282,33 @@ vr_bridge_route_flags(unsigned int vrf_id, unsigned char *mac)
     return 0;
 }
 
+unsigned int
+vr_bridge_table_used_total_entries(struct vrouter *router)
+{
+    if (vn_rtable)
+        return vr_htable_used_total_entries(vn_rtable);
+
+    return 0;
+}
+
+unsigned int
+vr_bridge_table_used_oflow_entries(struct vrouter *router)
+{
+    if (vn_rtable)
+        return vr_htable_used_oflow_entries(vn_rtable);
+    return 0;
+}
 
 static int
 bridge_table_get(unsigned int vrf_id, struct vr_route_req *rt)
 {
     struct vr_nexthop *nh;
 
     nh = bridge_table_lookup(vrf_id, rt);
-    if (nh)
+    if (nh) {
         rt->rtr_req.rtr_nh_id = rt->rtr_nh->nh_id;
+        return 0;
+    }
 
     return -ENOENT;
 }
@@ -394,6 +431,9 @@ bridge_table_init(struct vr_rtable *rtable, struct rtable_fspec *fs)
     if (rtable->algo_data)
         return 0;
 
+    if (!vr_bridge_oentries)
+        vr_bridge_oentries = ((vr_bridge_entries / 5) + 1023) & ~1023;
+
     rtable->algo_data = vr_htable_create(vrouter_get(0), vr_bridge_entries,
                 vr_bridge_oentries, sizeof(struct vr_bridge_entry),
                 sizeof(struct vr_bridge_entry_key), 0, bridge_entry_key);
@@ -425,7 +465,7 @@ bridge_table_deinit(struct vr_rtable *rtable, struct rtable_fspec *fs,
     if (!vn_rtable)
         return;
 
-    vr_htable_trav(vn_rtable, 0, bridge_table_entry_free, NULL);
+    vr_htable_reset(vn_rtable, bridge_table_entry_free, NULL);
 
     if (!soft_reset) {
         vr_htable_delete(vn_rtable);
@@ -451,7 +491,8 @@ vr_bridge_input(struct vrouter *router, struct vr_packet *pkt,
     dmac = (int8_t *) pkt_data(pkt);
 
     pull_len = 0;
-    if ((pkt->vp_type == VP_TYPE_IP) || (pkt->vp_type == VP_TYPE_IP6)) {
+    if ((pkt->vp_type == VP_TYPE_IP) || (pkt->vp_type == VP_TYPE_IP6) ||
+            (pkt->vp_type == VP_TYPE_ARP)) {
         pull_len = pkt_get_network_header_off(pkt) - pkt_head_space(pkt);
         if (pull_len && !pkt_pull(pkt, pull_len)) {
             vr_pfree(pkt, VP_DROP_PULL);
@@ -461,7 +502,6 @@ vr_bridge_input(struct vrouter *router, struct vr_packet *pkt,
 
     /* Do the bridge lookup for the packets not meant for "me" */
     if (!fmd->fmd_to_me) {
-
         /*
          * If DHCP packet coming from VM, Trap it to Agent before doing the bridge
          * lookup itself
@@ -478,6 +518,26 @@ vr_bridge_input(struct vrouter *router, struct vr_packet *pkt,
                     return 0;
                 }
             }
+
+            /*
+             * Handle the unicast ARP, coming from VM, not
+             * destined to us. Broadcast ARP requests would be handled
+             * in L2 multicast nexthop. Multicast ARP on fabric
+             * interface also would be handled in L2 multicast nexthop.
+             * Unicast ARP packets on fabric interface would be handled
+             * in plug routines of interface.
+             */
+            if (!IS_MAC_BMCAST(dmac)) {
+                handled = 0;
+                if (pkt->vp_type == VP_TYPE_ARP) {
+                    handled = vr_arp_input(pkt, fmd, dmac);
+                } else if (l4_type == L4_TYPE_NEIGHBOUR_SOLICITATION) {
+                    handled = vr_neighbor_input(pkt, fmd, dmac);
+                }
+
+                if (handled)
+                    return 0;
+            }
         }
 
         rt.rtr_req.rtr_label_flags = 0;