commit 35c7225fb948fd146691638ed181d4b09e6bca13
author Brenden Blanco <bblanco@plumgrid.com> Wed Nov 23 16:26:01 2016 -0800
committer Brenden Blanco <bblanco@plumgrid.com> Wed Nov 23 16:26:01 2016 -0800
tree b25f97c65c121dba1260eb50803e08c23ca15e46
parent 0d5d25eacd54dc28baf64962eb1e002b8c887ac1

Fixup test errors in clang, c api

Some errors seem to have cropped up due to updating kernels and clang
library versions.
1. test_c_api fails on kernels (seen on fedora 4.9) where startup_64
doesn't start at a particular address. Simplify the test to hopefully
work in more systems.
2. The lua and python test_clang did a dereference on a particular bio
field, which has been removed. Pick a different field that is more
uniquitous.
3. test_xlate1 was generating code where the verified pointer spilled.
Rewrite the example to store the result on the stack.

Signed-off-by: Brenden Blanco <bblanco@plumgrid.com>

tests/python/test_clang.py

diff --git a/tests/python/test_clang.py b/tests/python/test_clang.py
index 989c8b8..2d6e5bf 100755
--- a/tests/python/test_clang.py
+++ b/tests/python/test_clang.py
@@ -284,9 +284,9 @@
         text = """
 #include <linux/blkdev.h>
 int trace_entry(struct pt_regs *ctx, struct request *req) {
-    if (!(req->bio->bi_rw & 1))
+    if (!(req->bio->bi_flags & 1))
         return 1;
-    if (((req->bio->bi_rw)))
+    if (((req->bio->bi_flags)))
         return 1;
     return 0;
 }

tests/python/test_xlate1.c

diff --git a/tests/python/test_xlate1.c b/tests/python/test_xlate1.c
index 0af351f..634f196 100644
--- a/tests/python/test_xlate1.c
+++ b/tests/python/test_xlate1.c
@@ -18,7 +18,7 @@
 
   u32 orig_dip = 0;
   u32 orig_sip = 0;
-  struct IPLeaf *xleaf;
+  struct IPLeaf xleaf = {};
 
   ethernet: {
     struct ethernet_t *ethernet = cursor_advance(cursor, sizeof(*ethernet));
@@ -44,11 +44,12 @@
     orig_dip = arp->tpa;
     orig_sip = arp->spa;
     struct IPKey key = {.dip=orig_dip, .sip=orig_sip};
-    xleaf = xlate.lookup(&key);
-    if (xleaf) {
-      arp->tpa = xleaf->xdip;
-      arp->spa = xleaf->xsip;
-      lock_xadd(&xleaf->arp_xlated_pkts, 1);
+    struct IPLeaf *xleafp = xlate.lookup(&key);
+    if (xleafp) {
+      xleaf = *xleafp;
+      arp->tpa = xleaf.xdip;
+      arp->spa = xleaf.xsip;
+      lock_xadd(&xleafp->arp_xlated_pkts, 1);
     }
     goto EOP;
   }
@@ -58,13 +59,14 @@
     orig_dip = ip->dst;
     orig_sip = ip->src;
     struct IPKey key = {.dip=orig_dip, .sip=orig_sip};
-    xleaf = xlate.lookup(&key);
-    if (xleaf) {
-      ip->dst = xleaf->xdip;
-      incr_cksum_l3(&ip->hchecksum, orig_dip, xleaf->xdip);
-      ip->src = xleaf->xsip;
-      incr_cksum_l3(&ip->hchecksum, orig_sip, xleaf->xsip);
-      lock_xadd(&xleaf->ip_xlated_pkts, 1);
+    struct IPLeaf *xleafp = xlate.lookup(&key);
+    if (xleafp) {
+      xleaf = *xleafp;
+      ip->dst = xleaf.xdip;
+      incr_cksum_l3(&ip->hchecksum, orig_dip, xleaf.xdip);
+      ip->src = xleaf.xsip;
+      incr_cksum_l3(&ip->hchecksum, orig_sip, xleaf.xsip);
+      lock_xadd(&xleafp->ip_xlated_pkts, 1);
     }
     switch (ip->nextp) {
       case 6: goto tcp;
@@ -75,18 +77,18 @@
 
   udp: {
     struct udp_t *udp = cursor_advance(cursor, sizeof(*udp));
-    if (xleaf) {
-      incr_cksum_l4(&udp->crc, orig_dip, xleaf->xdip, 1);
-      incr_cksum_l4(&udp->crc, orig_sip, xleaf->xsip, 1);
+    if (xleaf.xdip) {
+      incr_cksum_l4(&udp->crc, orig_dip, xleaf.xdip, 1);
+      incr_cksum_l4(&udp->crc, orig_sip, xleaf.xsip, 1);
     }
     goto EOP;
   }
 
   tcp: {
     struct tcp_t *tcp = cursor_advance(cursor, sizeof(*tcp));
-    if (xleaf) {
-      incr_cksum_l4(&tcp->cksum, orig_dip, xleaf->xdip, 1);
-      incr_cksum_l4(&tcp->cksum, orig_sip, xleaf->xsip, 1);
+    if (xleaf.xdip) {
+      incr_cksum_l4(&tcp->cksum, orig_dip, xleaf.xdip, 1);
+      incr_cksum_l4(&tcp->cksum, orig_sip, xleaf.xsip, 1);
     }
     goto EOP;
   }