From 4cd3ac8d2028781288e0d01dcef6d79c712eccec Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Wed, 2 Nov 2022 21:17:38 +0100
Subject: [PATCH 01/50] README: remove travis badge for now

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 39415647..c1d42a2b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 # Virtualized TCP Acceleration Service
 
-[![Build Status](https://travis-ci.org/tcp-acceleration-service/tas.svg?branch=master)](https://travis-ci.org/tcp-acceleration-service/tas)
 [![Documentation Status](https://readthedocs.org/projects/tas/badge/?version=latest)](https://tas.readthedocs.io/en/latest/?badge=latest)
 
 

From 4e865eb6c5037a961939bfd8575bd43b1176d011 Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Thu, 21 Jul 2022 22:39:45 +0200
Subject: [PATCH 02/50] Makefile: disable Werror by default

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3ff8e5a9..9f77c600 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 
 CPPFLAGS += -Iinclude/
 CPPFLAGS += $(EXTRA_CPPFLAGS)
-CFLAGS += -std=gnu99 -O3 -g -Wall -Werror -march=native -fno-omit-frame-pointer -Wno-address-of-packed-member
+CFLAGS += -std=gnu99 -O3 -g -Wall -march=native -fno-omit-frame-pointer
 CFLAGS += $(EXTRA_CFLAGS)
 CFLAGS_SHARED += $(CFLAGS) -fPIC
 LDFLAGS += -pthread -g

From 666fc8c6b0d43d1ec20eab05072f984023e0b70c Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Thu, 21 Jul 2022 22:40:49 +0200
Subject: [PATCH 03/50] tas/fast: rename qman_ -> tas_qman_ to avoid dpdk
 namespace collision

Some library in dpdk seems to use qman as the function prefix and at least one
of the functions is named identically, so we get linker errors with those dpdk
versions.
---
 tas/fast/fast_flows.c | 10 +++++-----
 tas/fast/fastemu.c    |  9 ++++-----
 tas/fast/internal.h   |  8 ++++----
 tas/fast/qman.c       | 11 ++++++-----
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tas/fast/fast_flows.c b/tas/fast/fast_flows.c
index ee924c7a..1bf4dea2 100644
--- a/tas/fast/fast_flows.c
+++ b/tas/fast/fast_flows.c
@@ -129,7 +129,7 @@ int fast_flows_qman(struct dataplane_context *ctx, uint32_t vm_id, uint32_t queu
     }
 
     /* clear queue manager queue */
-    if (qman_set(&ctx->qman, vm_id, flow_id, 0, 0, 0,
+    if (tas_qman_set(&ctx->qman, vm_id, flow_id, 0, 0, 0,
           QMAN_SET_RATE | QMAN_SET_MAXCHUNK | QMAN_SET_AVAIL) != 0)
     {
       fprintf(stderr, "flast_flows_qman: qman_set clear failed, UNEXPECTED\n");
@@ -218,7 +218,7 @@ int fast_flows_qman_fwd(struct dataplane_context *ctx,
   avail = tcp_txavail(fs, NULL);
 
   /* re-arm queue manager */
-  if (qman_set(&ctx->qman, vm_id, flow_id, fs->tx_rate, avail, TCP_MSS,
+  if (tas_qman_set(&ctx->qman, vm_id, flow_id, fs->tx_rate, avail, TCP_MSS,
         QMAN_SET_RATE | QMAN_SET_MAXCHUNK | QMAN_SET_AVAIL) != 0)
   {
     fprintf(stderr, "fast_flows_qman_fwd: qman_set failed, UNEXPECTED\n");
@@ -623,7 +623,7 @@ int fast_flows_packet(struct dataplane_context *ctx,
   new_avail = tcp_txavail(fs, NULL);
   if (new_avail > old_avail) {
     /* update qman queue */
-    if (qman_set(&ctx->qman, fs->vm_id, flow_id, fs->tx_rate, new_avail -
+    if (tas_qman_set(&ctx->qman, fs->vm_id, flow_id, fs->tx_rate, new_avail -
           old_avail, TCP_MSS, QMAN_SET_RATE | QMAN_SET_MAXCHUNK
           | QMAN_ADD_AVAIL) != 0)
     {
@@ -745,7 +745,7 @@ int fast_flows_bump(struct dataplane_context *ctx, uint32_t flow_id,
 
   /* update queue manager queue */
   if (old_avail < new_avail) {
-    if (qman_set(&ctx->qman, fs->vm_id, flow_id, fs->tx_rate, new_avail -
+    if (tas_qman_set(&ctx->qman, fs->vm_id, flow_id, fs->tx_rate, new_avail -
           old_avail, TCP_MSS, QMAN_SET_RATE | QMAN_SET_MAXCHUNK
           | QMAN_ADD_AVAIL) != 0)
     {
@@ -822,7 +822,7 @@ void fast_flows_retransmit(struct dataplane_context *ctx, uint32_t flow_id)
 
   /* update queue manager */
   if (new_avail > old_avail) {
-    if (qman_set(&ctx->qman, fs->vm_id, flow_id, fs->tx_rate, new_avail - old_avail,
+    if (tas_qman_set(&ctx->qman, fs->vm_id, flow_id, fs->tx_rate, new_avail - old_avail,
           TCP_MSS, QMAN_SET_RATE | QMAN_SET_MAXCHUNK | QMAN_ADD_AVAIL) != 0)
     {
       fprintf(stderr, "flast_flows_bump: qman_set 1 failed, UNEXPECTED\n");
diff --git a/tas/fast/fastemu.c b/tas/fast/fastemu.c
index d1c24884..7424e909 100644
--- a/tas/fast/fastemu.c
+++ b/tas/fast/fastemu.c
@@ -144,8 +144,7 @@ int dataplane_context_init(struct dataplane_context *ctx)
   }
 
   /* initialize queue manager */
-  if (qman_thread_init(ctx) != 0)
-  {
+  if (tas_qman_thread_init(ctx) != 0) {
     fprintf(stderr, "initializing qman thread failed\n");
     return -1;
   }
@@ -238,7 +237,7 @@ void dataplane_loop(struct dataplane_context *ctx)
     if (!was_idle)
       ctx->loadmon_cyc_busy += cyc - prev_cyc;
 
-    ts = qman_timestamp(cyc);
+    ts = tas_qman_timestamp(cyc);
 
     STATS_TS(start);
   
@@ -299,7 +298,7 @@ static void dataplane_block(struct dataplane_context *ctx, uint32_t ts)
     return;
   }
 
-  max_timeout = qman_next_ts(&ctx->qman, ts);
+  max_timeout = tas_qman_next_ts(&ctx->qman, ts);
 
   ret = rte_epoll_wait(RTE_EPOLL_PER_THREAD, event, 2,
                        max_timeout == (uint32_t)-1 ? -1 : max_timeout / 1000);
@@ -608,7 +607,7 @@ static unsigned poll_qman(struct dataplane_context *ctx, uint32_t ts)
   max = bufcache_prealloc(ctx, max, &handles);
 
   /* poll queue manager */
-  ret = qman_poll(ctx, max, vq_ids, fq_ids, q_bytes);
+  ret = tas_qman_poll(ctx, max, vq_ids, fq_ids, q_bytes);
 
   if (ret <= 0)
   {
diff --git a/tas/fast/internal.h b/tas/fast/internal.h
index 72eec789..7c6ea5b6 100644
--- a/tas/fast/internal.h
+++ b/tas/fast/internal.h
@@ -68,13 +68,13 @@ extern volatile unsigned fp_scale_to;
 #define IDXLIST_INVAL (-1U)
 
 /** Qman functions */
-int qman_thread_init(struct dataplane_context *ctx);
+int tas_qman_thread_init(struct dataplane_context *ctx);
 int qman_poll(struct dataplane_context *ctx, unsigned num, unsigned *vm_id, 
     unsigned *q_ids, uint16_t *q_bytes);
-int qman_set(struct qman_thread *t, uint32_t vm_id, uint32_t flow_id, uint32_t rate,
+int tas_qman_set(struct qman_thread *t, uint32_t vm_id, uint32_t flow_id, uint32_t rate,
     uint32_t avail, uint16_t max_chunk, uint8_t flags);
-uint32_t qman_timestamp(uint64_t tsc);
-uint32_t qman_next_ts(struct qman_thread *t, uint32_t cur_ts);
+uint32_t tas_qman_timestamp(uint64_t tsc);
+uint32_t tas_qman_next_ts(struct qman_thread *t, uint32_t cur_ts);
 /** Helper functions for unit tests */
 uint32_t qman_vm_get_avail(struct dataplane_context *ctx, uint32_t vm_id);
 void qman_free_vm_cont(struct dataplane_context *ctx);
diff --git a/tas/fast/qman.c b/tas/fast/qman.c
index eeeed644..8480ae24 100644
--- a/tas/fast/qman.c
+++ b/tas/fast/qman.c
@@ -178,7 +178,7 @@ static inline uint32_t flow_queue_new_ts(struct qman_thread *t, struct flow_queu
 /*****************************************************************************/
 /* Top level queue manager */
 
-int qman_thread_init(struct dataplane_context *ctx)
+int tas_qman_thread_init(struct dataplane_context *ctx)
 {
   struct qman_thread *t = &ctx->qman;
 
@@ -195,7 +195,7 @@ int qman_thread_init(struct dataplane_context *ctx)
   return 0;
 }
 
-int qman_poll(struct dataplane_context *ctx, unsigned num, unsigned *vm_ids,
+int tas_qman_poll(struct dataplane_context *ctx, unsigned num, unsigned *vm_ids,
               unsigned *q_ids, uint16_t *q_bytes)
 {
   int ret;
@@ -207,7 +207,7 @@ int qman_poll(struct dataplane_context *ctx, unsigned num, unsigned *vm_ids,
   return ret;
 }
 
-int qman_set(struct qman_thread *t, uint32_t vm_id, uint32_t flow_id, uint32_t rate,
+int tas_qman_set(struct qman_thread *t, uint32_t vm_id, uint32_t flow_id, uint32_t rate,
              uint32_t avail, uint16_t max_chunk, uint8_t flags)
 {
   int ret;
@@ -216,7 +216,7 @@ int qman_set(struct qman_thread *t, uint32_t vm_id, uint32_t flow_id, uint32_t r
   return ret;
 }
 
-uint32_t qman_next_ts(struct qman_thread *t, uint32_t cur_ts)
+uint32_t tas_qman_next_ts(struct qman_thread *t, uint32_t cur_ts)
 {
   struct vm_queue *vq;
   struct flow_qman *fqman;
@@ -260,7 +260,7 @@ uint32_t qman_next_ts(struct qman_thread *t, uint32_t cur_ts)
   return -1;
 }
 
-uint32_t qman_timestamp(uint64_t cycles)
+uint32_t tas_qman_timestamp(uint64_t cycles)
 {
   static uint64_t freq = 0;
 
@@ -579,6 +579,7 @@ int flowcont_init(struct vm_queue *vq)
 
 static inline int flow_qman_poll(struct qman_thread *t, struct vm_queue *vqueue, 
     struct flow_qman *fqman, unsigned num, unsigned *q_ids, uint16_t *q_bytes)
+
 {
   unsigned x, y;
   uint32_t ts = timestamp();

From 7bdcf726431beb40e68d11a90390b409f4c9d072 Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Thu, 23 Sep 2021 09:04:22 +0200
Subject: [PATCH 04/50] Makefile: use pkg-config for dpdk flags

Previously we had the flags hard-coded in the makefile, which is tricky
with different DPDK versions. pkg-config is only used if the DPDK flags
are not manually set beforehand, so this behavior can be overridden.
---
 Makefile | 36 ++++--------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/Makefile b/Makefile
index 9f77c600..3a8e472e 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ LDFLAGS += $(EXTRA_LDFLAGS)
 LDLIBS += -lm -lpthread -lrt -ldl
 LDLIBS += $(EXTRA_LDLIBS)
 
+PKG_CONFIG ?= pkg-config
 PREFIX ?= /usr/local
 SBINDIR ?= $(PREFIX)/sbin
 LIBDIR ?= $(PREFIX)/lib
@@ -22,38 +23,9 @@ INCDIR ?= $(PREFIX)/include
 ##############################################################################
 # DPDK configuration
 
-# Prefix for dpdk
-RTE_SDK ?= /usr/
-# mpdts to compile
-DPDK_PMDS ?= ixgbe i40e tap virtio
-
-DPDK_CPPFLAGS += -I$(RTE_SDK)/include -I$(RTE_SDK)/include/dpdk \
-  -I$(RTE_SDK)/include/x86_64-linux-gnu/dpdk/
-DPDK_LDFLAGS+= -L$(RTE_SDK)/lib/
-DPDK_LDLIBS+= \
-  -Wl,--whole-archive \
-   $(addprefix -lrte_pmd_,$(DPDK_PMDS)) \
-  -lrte_eal \
-  -lrte_mempool \
-  -lrte_mempool_ring \
-  -lrte_hash \
-  -lrte_ring \
-  -lrte_kvargs \
-  -lrte_ethdev \
-  -lrte_mbuf \
-  -lnuma \
-  -lrte_bus_pci \
-  -lrte_pci \
-  -lrte_cmdline \
-  -lrte_timer \
-  -lrte_net \
-  -lrte_kni \
-  -lrte_bus_vdev \
-  -lrte_gso \
-  -Wl,--no-whole-archive \
-  -ldl \
-  $(EXTRA_LIBS_DPDK)
-
+DPDK_CPPFLAGS ?= $(shell $(PKG_CONFIG) --cflags libdpdk)
+DPDK_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs-only-l libdpdk)
+DPDK_LDLIBS ?= $(shell $(PKG_CONFIG) --libs-only-L --libs-only-other libdpdk)
 
 ##############################################################################
 

From 28d22875560f308964dc9266fc006433182bd61e Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Thu, 21 Jul 2022 22:43:32 +0200
Subject: [PATCH 05/50] Makefile: use --static and --libs for pkg-config with
 dpdk

---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3a8e472e..0d0ae80c 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,7 @@ INCDIR ?= $(PREFIX)/include
 # DPDK configuration
 
 DPDK_CPPFLAGS ?= $(shell $(PKG_CONFIG) --cflags libdpdk)
-DPDK_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs-only-l libdpdk)
-DPDK_LDLIBS ?= $(shell $(PKG_CONFIG) --libs-only-L --libs-only-other libdpdk)
+DPDK_LDLIBS ?= $(shell $(PKG_CONFIG) --static --libs libdpdk)
 
 ##############################################################################
 

From 82ee9afdf3a8317a491bb3bf995b3da7c1fc9ce7 Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Thu, 21 Jul 2022 22:45:52 +0200
Subject: [PATCH 06/50] Makefile: disable address-of-packed-member warning in
 newer gccs

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 0d0ae80c..bfb87c45 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@
 CPPFLAGS += -Iinclude/
 CPPFLAGS += $(EXTRA_CPPFLAGS)
 CFLAGS += -std=gnu99 -O3 -g -Wall -march=native -fno-omit-frame-pointer
+CFLAGS += -Wno-address-of-packed-member
 CFLAGS += $(EXTRA_CFLAGS)
 CFLAGS_SHARED += $(CFLAGS) -fPIC
 LDFLAGS += -pthread -g

From aeffc1027c8e8307e69a2d0157cbdd390a5e655f Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Thu, 21 Jul 2022 22:34:27 +0200
Subject: [PATCH 07/50] tas/fast: replace deprecated macro wtih
 RTE_LCORE_FOREACH_WORKER(i)

---
 tas/tas.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tas/tas.c b/tas/tas.c
index c7042c22..a8309c02 100644
--- a/tas/tas.c
+++ b/tas/tas.c
@@ -221,7 +221,7 @@ static int start_threads(void)
   }
 
   /* start common threads */
-  RTE_LCORE_FOREACH_SLAVE(core) {
+  RTE_LCORE_FOREACH_WORKER(core) {
     if (threads_launched < fp_cores_max) {
       arg = (void *) (uintptr_t) threads_launched;
       if (rte_eal_remote_launch(common_thread, arg, core) != 0) {

From 27427533ace48572c91fcae2ff053c102492e222 Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Wed, 2 Nov 2022 16:16:20 +0100
Subject: [PATCH 08/50] README: update with new dpdk instructions

---
 README.md | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c1d42a2b..a1ab0fbb 100644
--- a/README.md
+++ b/README.md
@@ -9,16 +9,36 @@ virtualized environments.
 ## Building
 Requirements:
   * vTAS is built on top of Intel DPDK for direct access to the NIC. We have
-    tested this version with dpdk versions (17.11.9, 18.11.5, 19.11).
+    tested this version with dpdk version 21.
 
-Assuming that dpdk is installed in `~/dpdk-inst` vTAS can be built as follows:
+Assuming that dpdk is installed through the system package manager, the
+following suffices to build TAS:
 ```
-make RTE_SDK=~/dpdk-inst
+make
 ```
 
 This will build the vTAS service (binary `tas/tas`), client libraries (in
 `lib/`), and a few debugging tools (in `tools/`).
 
+
+### Using Separate DPDK Build
+
+The Makefile uses `pkg-config` to locate the dpdk libraries and headers. If you
+want to build TAS against a non-system dpdk version, the
+`PKG_CONFIG_PATH` environmental variable can point pkg-config to the right dpdk
+location. For example, with dpdk installed in `/local/antoinek/dpdk` I set
+
+```
+PKG_CONFIG_PATH=/local/antoinek/dpdk/usr/local/lib/x86_64-linux-gnu/pkgconfig/
+```
+
+Instead of manually exporting the environment variable every time, it can also
+be set by creating a `Makefile.local` file including the following line:
+
+```
+PKG_CONFIG= PKG_CONFIG_PATH=/local/antoinek/dpdk/usr/local/lib/x86_64-linux-gnu/pkgconfig/ pkg-config
+```
+
 ## Running
 
 Before running vTAS the following steps are necessary:

From 540893da6ae95d936ad8c041c55e2fa76c66b127 Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Tue, 5 Oct 2021 22:13:38 +0200
Subject: [PATCH 09/50] tas: ensure accept requests are processed in order

---
 tas/slow/internal.h |  5 ++++-
 tas/slow/tcp.c      | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/tas/slow/internal.h b/tas/slow/internal.h
index d489cd3c..81cd5e45 100644
--- a/tas/slow/internal.h
+++ b/tas/slow/internal.h
@@ -589,8 +589,11 @@ struct listener {
     uint16_t *backlog_fgs;
   /**@}*/
 
-  /** List of waiting connections from accept calls */
+  /** List of waiting connections from accept calls (head) */
   struct connection *wait_conns;
+  /** List of waiting connections from accept calls (tail) */
+  struct connection *wait_conns_last;
+
   /** Listener port */
   uint16_t port;
   /** Flags: see #nicif_connection_flags */
diff --git a/tas/slow/tcp.c b/tas/slow/tcp.c
index 9fe8b7bc..7e608677 100644
--- a/tas/slow/tcp.c
+++ b/tas/slow/tcp.c
@@ -298,6 +298,7 @@ int tcp_listen(struct app_context *ctx, uint64_t opaque, uint16_t local_port,
   lst->opaque = opaque;
   lst->port = local_port;
   lst->wait_conns = NULL;
+  lst->wait_conns_last = NULL;
   lst->backlog_len = backlog;
   lst->backlog_pos = 0;
   lst->backlog_used = 0;
@@ -339,8 +340,14 @@ int tcp_accept(struct app_context *ctx, uint64_t opaque,
   conn->flags = listen->flags;
   conn->cnt_tx_pending = 0;
 
-  conn->ht_next = listen->wait_conns;
-  listen->wait_conns = conn;
+  conn->ht_next = NULL;
+  if (listen->wait_conns == NULL) {
+    listen->wait_conns = conn;
+    listen->wait_conns_last = conn;
+  } else {
+    listen->wait_conns_last->ht_next = conn;
+    listen->wait_conns_last = conn;
+  }
 
   if (listen->backlog_used > 0) {
     listener_accept(listen);
@@ -960,6 +967,9 @@ static void listener_accept(struct listener *l)
   }
 
   l->wait_conns = c->ht_next;
+  if (l->wait_conns == NULL) {
+    l->wait_conns_last = NULL;
+  }
   conn_register(c);
   nbqueue_enq(&conn_async_q, &c->comp.el);
 

From c16173ea92deef6345eb28d9d3eeab629e91dff7 Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Tue, 5 Oct 2021 22:19:21 +0200
Subject: [PATCH 10/50] lib/sockets: fix spurious wakeups and accepts returning
 nothing

---
 lib/sockets/context.c  |  21 +---
 lib/sockets/control.c  | 230 +++++++++++++++++++++++------------------
 lib/sockets/internal.h |  18 ++--
 tas/config.c           |   1 +
 4 files changed, 142 insertions(+), 128 deletions(-)

diff --git a/lib/sockets/context.c b/lib/sockets/context.c
index 651cd494..94e0587d 100644
--- a/lib/sockets/context.c
+++ b/lib/sockets/context.c
@@ -192,20 +192,6 @@ static inline void ev_listen_open(struct flextcp_context *ctx,
 static inline void ev_listen_newconn(struct flextcp_context *ctx,
     struct flextcp_event *ev)
 {
-  struct flextcp_listener *l;
-  struct socket *s;
-
-  l = ev->ev.listen_newconn.listener;
-  s = (struct socket *)
-    ((uint8_t *) l - offsetof(struct socket, data.listener.l));
-
-  socket_lock(s);
-
-  assert(s->type == SOCK_LISTENER);
-
-  flextcp_epoll_set(s, EPOLLIN);
-
-  socket_unlock(s);
 }
 
 static inline void ev_listen_accept(struct flextcp_context *ctx,
@@ -218,13 +204,13 @@ static inline void ev_listen_accept(struct flextcp_context *ctx,
   s = (struct socket *)
     ((uint8_t *) c - offsetof(struct socket, data.connection.c));
 
-  socket_lock(s);
-
   assert(s->type == SOCK_CONNECTION);
-  assert(s->data.connection.status == SOC_CONNECTING);
   sl = s->data.connection.listener;
   assert(sl != NULL);
 
+  socket_lock(sl);
+  socket_lock(s);
+  assert(s->data.connection.status == SOC_CONNECTING);
   flextcp_epoll_set(sl, EPOLLIN);
 
   if (ev->ev.listen_accept.status == 0) {
@@ -236,6 +222,7 @@ static inline void ev_listen_accept(struct flextcp_context *ctx,
   }
 
   socket_unlock(s);
+  socket_unlock(sl);
 }
 
 static inline void ev_conn_open(struct flextcp_context *ctx,
diff --git a/lib/sockets/control.c b/lib/sockets/control.c
index 8f6f4635..c930c629 100644
--- a/lib/sockets/control.c
+++ b/lib/sockets/control.c
@@ -364,11 +364,60 @@ int tas_connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen)
   return ret;
 }
 
+/** Enqueue accept requests for backlog. Lock on s has to be held. */
+static int enqueue_accept(struct flextcp_context *ctx, struct socket *s)
+{
+  int newfd;
+  struct socket *ns;
+  struct socket_listen *l = &s->data.listener;
+  struct socket_backlog *bl;
+
+  /* try to fill backlog */
+  while (l->backlog_num != l->backlog_len) {
+    /* allocate socket structure */
+    if ((newfd = flextcp_fd_salloc(&ns)) < 0) {
+      break;
+    }
+
+    ns->type = SOCK_CONNECTION;
+    ns->flags = 0;
+    ns->data.connection.status = SOC_CONNECTING;
+    ns->data.connection.listener = s;
+    ns->data.connection.rx_len_1 = 0;
+    ns->data.connection.rx_len_2 = 0;
+    ns->data.connection.ctx = ctx;
+
+    bl = l->backlog + ((l->backlog_next + l->backlog_num) % l->backlog_len);
+    bl->s = ns;
+    bl->fd = newfd;
+
+    /* send accept request to kernel */
+    if (flextcp_listen_accept(ctx, &l->l, &ns->data.connection.c) != 0)
+    {
+      /* TODO: check error code... */
+      flextcp_fd_close(newfd);
+      break;
+    }
+
+    socket_unlock(ns);
+    l->backlog_num = l->backlog_num + 1;
+  }
+
+  if (l->backlog_num == 0) {
+    errno = ENOBUFS;
+    return -1;
+  }
+
+  return 0;
+}
+
 int tas_listen(int sockfd, int backlog)
 {
   struct socket *s;
+  struct socket_backlog *bl;
+  struct socket_listen *l;
   struct flextcp_context *ctx;
-  int ret = 0, block;
+  int block;
   uint32_t flags = 0;
 
   if (flextcp_fd_slookup(sockfd, &s) != 0) {
@@ -379,16 +428,14 @@ int tas_listen(int sockfd, int backlog)
   /* socket already used */
   if (s->type != SOCK_SOCKET) {
     errno = EOPNOTSUPP;
-    ret = -1;
-    goto out;
+    goto err;
   }
 
   /* socket not bound */
   /* TODO: technically sohuld probably bind to an ephemeral port */
   if ((s->flags & SOF_BOUND) != SOF_BOUND) {
     errno = EADDRINUSE;
-    ret = -1;
-    goto out;
+    goto err;
   }
 
   /* pass on reuseport flags */
@@ -401,21 +448,28 @@ int tas_listen(int sockfd, int backlog)
     backlog = 8;
   }
 
+  if ((bl = calloc(backlog, sizeof(*bl))) == NULL) {
+    errno = ENOMEM;
+    goto err;
+  }
+
   /* open flextcp listener */
   ctx = flextcp_sockctx_get();
   if (flextcp_listen_open(ctx, &s->data.listener.l, ntohs(s->addr.sin_port),
         backlog, flags))
   {
-    /* TODO */
+    free (bl);
     errno = ECONNREFUSED;
-    ret = -1;
-    goto out;
+    goto err_bl;
   }
 
   s->type = SOCK_LISTENER;
-  s->data.listener.backlog = backlog;
-  s->data.listener.status = SOL_OPENING;
-  s->data.listener.pending = NULL;
+  l = &s->data.listener;
+  l->backlog = bl;
+  l->backlog_len = backlog;
+  l->backlog_next = 0;
+  l->backlog_num = 0;
+  l->status = SOL_OPENING;
 
   /* wait for listen to complete */
   block = 0;
@@ -430,29 +484,41 @@ int tas_listen(int sockfd, int backlog)
 
   /* check whether listen failed */
   if (s->data.listener.status == SOL_FAILED) {
-    /* TODO */
     errno = ENOBUFS;
-    ret = -1;
-    goto out;
+    goto err_bl;
+  }
+
+  /* enqueue accepts */
+  if (enqueue_accept(ctx, s)) {
+    goto err_close;
   }
 
-out:
   flextcp_fd_srelease(sockfd, s);
-  return ret;
+  return 0;
+
+err_close:
+  /* TODO: close listener */
+err_bl:
+  free(bl);
+err:
+  flextcp_fd_srelease(sockfd, s);
+  return -1;
 }
 
 int tas_accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen,
     int flags)
 {
   struct socket *s, *ns;
+  struct socket_listen *sl;
   struct flextcp_context *ctx;
-  struct socket_pending *sp, *spp;
+  struct socket_backlog *bl;
   int ret = 0, nonblock = 0, cloexec = 0, newfd, block;
 
   if (flextcp_fd_slookup(sockfd, &s) != 0) {
     errno = EBADF;
     return -1;
   }
+  sl = &s->data.listener;
 
   /* validate flags */
   if ((flags & SOCK_NONBLOCK) == SOCK_NONBLOCK) {
@@ -477,112 +543,72 @@ int tas_accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen,
   }
 
   ctx = flextcp_sockctx_get();
-
-  /* lookup pending connection for this context/thread */
-  for (sp = s->data.listener.pending; sp != NULL; sp = sp->next) {
-    if (sp->ctx == ctx) {
-      break;
-    }
-  }
-
-  /* if there is no pending request, send out a request */
-  if (sp == NULL) {
-    if ((sp = malloc(sizeof(*sp))) == NULL) {
-      errno = ENOMEM;
-      ret = -1;
-      goto out;
-    }
-
-    /* allocate socket structure */
-    if ((newfd = flextcp_fd_salloc(&ns)) < 0) {
-      free(sp);
-      ret = -1;
-      goto out;
-    }
-
-    ns->type = SOCK_CONNECTION;
-    ns->flags = (nonblock ? SOF_NONBLOCK : 0) | (cloexec ? SOF_CLOEXEC : 0);
-    ns->data.connection.status = SOC_CONNECTING;
-    ns->data.connection.listener = s;
-    ns->data.connection.rx_len_1 = 0;
-    ns->data.connection.rx_len_2 = 0;
-    ns->data.connection.ctx = ctx;
-
-    sp->fd = newfd;
-    sp->s = ns;
-    sp->ctx = ctx;
-    sp->next = NULL;
-
-    /* send accept request to kernel */
-    if (flextcp_listen_accept(ctx, &s->data.listener.l,
-          &ns->data.connection.c) != 0)
-    {
-      /* TODO */
+  block = 0;
+  while (1) {
+    /* grab next pending accept */
+    if (sl->backlog_num == 0 && enqueue_accept(ctx, s)) {
       errno = ENOBUFS;
       ret = -1;
-      free(sp);
-      flextcp_fd_close(newfd);
-      free(s);
       goto out;
     }
+    bl = sl->backlog + sl->backlog_next;
+    ns = bl->s;
+    newfd = bl->fd;
 
-    /* append entry to pending list */
-    spp = s->data.listener.pending;
-    if (spp == NULL) {
-      s->data.listener.pending = sp;
+    socket_lock(ns);
+    if (ns->data.connection.status != SOC_CONNECTING) {
+      /* connection is ready */
+      break;
     } else {
-      while (spp->next != NULL) {
-        spp = spp->next;
-      }
-      spp->next = sp;
-    }
-  } else {
-    ns = sp->s;
-    newfd = sp->fd;
-  }
+      /* connection is still pending */
+      socket_unlock(ns);
 
-  /* check if connection is still pending */
-  if (ns->data.connection.status == SOC_CONNECTING) {
-    flextcp_epoll_clear(s, EPOLLIN);
-    if ((s->flags & SOF_NONBLOCK) == SOF_NONBLOCK) {
-      /* if non-blocking, just return */
-      errno = EAGAIN;
-      ret = -1;
-      flextcp_fd_srelease(newfd, ns);
-      goto out;
-    } else {
-      /* if this is blocking, wait for connection to complete */
-      block = 0;
-      do {
-        socket_unlock(ns);
+      if ((s->flags & SOF_NONBLOCK) == SOF_NONBLOCK) {
+        /* if non-blocking, just return */
+        errno = EAGAIN;
+        ret = -1;
+        goto out;
+      } else {
+        /* if this is blocking, wait for a connection to complete */
         socket_unlock(s);
+
         if (block)
           flextcp_context_wait(ctx, -1);
         flextcp_sockctx_poll(ctx);
         block = 1;
+
         socket_lock(s);
-        socket_lock(ns);
-      } while (ns->data.connection.status == SOC_CONNECTING);
+      }
     }
   }
 
   /* connection is opened now */
   assert(ns->data.connection.status == SOC_CONNECTED);
 
-  /* remove entry from pending list */
-  if (s->data.listener.pending == sp) {
-    s->data.listener.pending = sp->next;
+  if (cloexec)
+    ns->flags |= SOF_CLOEXEC;
+  if (nonblock)
+    ns->flags |= SOF_NONBLOCK;
+
+  /* remove this connection from backlog now */
+  sl->backlog_next = (sl->backlog_next + 1) % sl->backlog_len;
+  --sl->backlog_num;
+
+  flextcp_fd_srelease(newfd, ns);
+
+  /* refill backlog */
+  enqueue_accept(ctx, s);
+
+  /* clear epollin on listening socket if no more connections */
+  if (!sl->backlog_num) {
+    flextcp_epoll_clear(s, EPOLLIN);
   } else {
-    spp = s->data.listener.pending;
-    assert(spp != NULL);
-    while (spp->next != sp) {
-      assert(spp->next != NULL);
-      spp = spp->next;
-    }
-    spp->next = sp->next;
+    struct socket *next = sl->backlog[sl->backlog_next].s;
+    socket_lock(next);
+    if (next->data.connection.status == SOC_CONNECTING)
+      flextcp_epoll_clear(s, EPOLLIN);
+    socket_unlock(next);
   }
-  free(sp);
-  flextcp_fd_srelease(newfd, ns);
 
   // fill in addr if given
   if(addr != NULL) {
diff --git a/lib/sockets/internal.h b/lib/sockets/internal.h
index 6dffd380..431996c5 100644
--- a/lib/sockets/internal.h
+++ b/lib/sockets/internal.h
@@ -70,13 +70,6 @@ enum conn_stflags {
   CSTF_TXCLOSED_ACK = 4,
 };
 
-struct socket_pending {
-  struct socket *s;
-  struct flextcp_context *ctx;
-  struct socket_pending *next;
-  int fd;
-};
-
 struct socket_conn {
   struct flextcp_connection c;
   uint8_t status;
@@ -91,10 +84,17 @@ struct socket_conn {
   int move_status;
 };
 
+struct socket_backlog {
+  struct socket *s;
+  int fd;
+};
+
 struct socket_listen {
   struct flextcp_listener l;
-  struct socket_pending *pending;
-  int backlog;
+  struct socket_backlog *backlog;
+  int backlog_len;
+  int backlog_next;
+  int backlog_num;
   uint8_t status;
 };
 
diff --git a/tas/config.c b/tas/config.c
index aaaea9a8..5c0a9497 100644
--- a/tas/config.c
+++ b/tas/config.c
@@ -505,6 +505,7 @@ int config_parse(struct configuration *c, int argc, char *argv[])
       case CP_FP_NO_INTS:
         c->fp_interrupts = 0;
         c->fp_poll_interval_tas = UINT32_MAX;
+        c->fp_poll_interval_app = UINT32_MAX;
         break;
       case CP_FP_NO_XSUMOFFLOAD:
         c->fp_xsumoffload = 0;

From c9c1e8f1030fddeeeb797521261824ce1c54082d Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Tue, 5 Oct 2021 22:20:19 +0200
Subject: [PATCH 11/50] lib/sockets: ignore TCP_DEFER_ACCEPT option

---
 lib/sockets/control.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/sockets/control.c b/lib/sockets/control.c
index c930c629..8baae030 100644
--- a/lib/sockets/control.c
+++ b/lib/sockets/control.c
@@ -851,7 +851,8 @@ int tas_setsockopt(int sockfd, int level, int optname, const void *optval,
   } else if (level == SOL_SOCKET && optname == SO_PRIORITY) {
     /* ignore silently */
   } else if (level == IPPROTO_TCP && (optname == TCP_KEEPIDLE ||
-       optname == TCP_KEEPINTVL || optname == TCP_KEEPCNT)) {
+       optname == TCP_KEEPINTVL || optname == TCP_KEEPCNT ||
+       optname == TCP_DEFER_ACCEPT)) {
     /* ignore silently */
   } else if (level == SOL_SOCKET && optname == SO_LINGER) {
     fprintf(stderr, "flextcp setsockopt: SO_LINGER not implemented\n");

From 430e693d28c723be0caa41f962855153ac70e6c4 Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Tue, 5 Oct 2021 22:20:54 +0200
Subject: [PATCH 12/50] lib/sockets: do not return error for SO_LINGER

---
 lib/sockets/control.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/sockets/control.c b/lib/sockets/control.c
index 8baae030..00dc4c42 100644
--- a/lib/sockets/control.c
+++ b/lib/sockets/control.c
@@ -855,10 +855,7 @@ int tas_setsockopt(int sockfd, int level, int optname, const void *optval,
        optname == TCP_DEFER_ACCEPT)) {
     /* ignore silently */
   } else if (level == SOL_SOCKET && optname == SO_LINGER) {
-    fprintf(stderr, "flextcp setsockopt: SO_LINGER not implemented\n");
-    errno = ENOPROTOOPT;
-    ret = -1;
-    goto out;
+    fprintf(stderr, "flextcp setsockopt: warning SO_LINGER not implemented\n");
   } else {
     /* unknown option */
     fprintf(stderr, "flextcp setsockopt: unknown level optname combination "

From aaa7bf6f7f775155310a2f230aa464adac190bd4 Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Sun, 15 Jan 2023 21:46:29 +0100
Subject: [PATCH 13/50] tas/fast: replace depracated RX/TX offload flags

PKT_TX_ -> RTE_MBUF_F_TX_
PKT_RX_ -> RTE_MBUF_F_RX_
---
 tas/fast/network.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tas/fast/network.h b/tas/fast/network.h
index 8df48ca4..cf624ff4 100644
--- a/tas/fast/network.h
+++ b/tas/fast/network.h
@@ -180,7 +180,8 @@ static inline uint16_t network_buf_tcpxsums(struct network_buf_handle *bh, uint8
   /*mb->l2_len = l2l;
   mb->l3_len = l3l;
   mb->l4_len = 0;*/
-  mb->ol_flags = PKT_TX_IPV4 | PKT_TX_IP_CKSUM | PKT_TX_TCP_CKSUM;
+  mb->ol_flags = RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
+    RTE_MBUF_F_TX_TCP_CKSUM;
 
   return network_ip_phdr_xsum(ip_s, ip_d, ip_proto, l3_paylen);
 }
@@ -189,7 +190,8 @@ static inline int network_buf_flowgroup(struct network_buf_handle *bh,
     uint16_t *fg, uint16_t core)
 {
   struct rte_mbuf *mb = (struct rte_mbuf *) bh;
-  if (!(mb->ol_flags & PKT_RX_RSS_HASH)) {
+
+  if (!(mb->ol_flags & RTE_MBUF_F_RX_RSS_HASH)) {
     *fg = core;
     return 0;
   }

From bea808b60c51622117d86e18c257a831ace7187d Mon Sep 17 00:00:00 2001
From: Rajath Shashidhara <rajaths@cs.utexas.edu>
Date: Tue, 22 Jun 2021 18:31:49 +0000
Subject: [PATCH 14/50] init flow steering even when autoscaling disabled

Signed-off-by: Rajath Shashidhara <rajaths@cs.utexas.edu>
---
 tas/fast/network.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tas/fast/network.c b/tas/fast/network.c
index f49e9c88..25ac4310 100644
--- a/tas/fast/network.c
+++ b/tas/fast/network.c
@@ -270,6 +270,7 @@ int network_thread_init(struct dataplane_context *ctx)
       }
     }
 
+    /* setting up RETA failed */
     if (reta_setup() != 0) {
       fprintf(stderr, "RETA setup failed\n");
       goto error_tx_queue;

From 9ba189cd6bdcaac737b33a056f9c8bd742abda94 Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Mon, 16 Jan 2023 20:51:43 +0100
Subject: [PATCH 15/50] tests/full: update for dpdk versions 21+

Explicitly disable PCI and telemetry through EAL parameters. Also mount tmpfs
for /var/run where EAL tries to create sockets etc.
---
 tests/full/fulltest.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/full/fulltest.c b/tests/full/fulltest.c
index bba8be07..a37ec165 100644
--- a/tests/full/fulltest.c
+++ b/tests/full/fulltest.c
@@ -104,6 +104,7 @@ static pid_t start_tas(void)
         "--fp-no-autoscale", "--fp-no-hugepages", "--dpdk-extra=--vdev",
         "--dpdk-extra=eth_tap0,iface=vethtas1",
         "--dpdk-extra=--no-shconf", "--dpdk-extra=--no-huge",
+        "--dpdk-extra=--no-pci", "--dpdk-extra=--no-telemetry",
         "--ip-addr=192.168.1.1/24", readyfdopt, NULL);
 
     perror("exec failed");
@@ -221,6 +222,12 @@ static int run_child(int (*tas_entry)(void *), int (*linux_entry)(void *),
       return 1;
     }
 
+    /* dpdk stores control files/sockets in /var/run */
+    if (mount("tmpfs", "/var/run", "tmpfs", 0, "") != 0) {
+      perror("mounting /var/run failed");
+      return 1;
+    }
+
     umask(0022);
 
     /* start tas */

From c9c1188b388af26b055944d6ce018d13270b2c99 Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Mon, 16 Jan 2023 21:07:59 +0100
Subject: [PATCH 16/50] tests: add full netperf test

(currently still broken)
---
 tests/full/netperf/rules.mk | 51 +++++++++++++++++++++++++++++++++++++
 tests/full/rules.mk         |  3 +++
 2 files changed, 54 insertions(+)
 create mode 100644 tests/full/netperf/rules.mk

diff --git a/tests/full/netperf/rules.mk b/tests/full/netperf/rules.mk
new file mode 100644
index 00000000..b39d9e90
--- /dev/null
+++ b/tests/full/netperf/rules.mk
@@ -0,0 +1,51 @@
+include mk/subdir_pre.mk
+
+ft_netperf_parentdir := $(TEST_DISTFILES)/full-netperf
+
+###################################
+# Build netperf
+
+ft_netperf_ver := 2.7.0
+ft_netperf_tar := $(ft_netperf_parentdir)/netperf-$(ft_netperf_ver).tar.gz
+ft_netperf_build := $(ft_netperf_parentdir)/netperf-netperf-$(ft_netperf_ver)
+ft_netperf_server := $(ft_netperf_build)/src/netserver
+ft_netperf_client := $(ft_netperf_build)/src/netperf
+
+# Download netperf tarball
+$(ft_netperf_tar):
+	mkdir -p $(dir $@)
+	wget -O $@ https://github.com/HewlettPackard/netperf/archive/refs/tags/netperf-$(ft_netperf_ver).tar.gz
+
+# Extract netperf tarball
+$(ft_netperf_build): $(ft_netperf_tar)
+	tar xf $< -C $(ft_netperf_parentdir)
+	touch $(@)
+
+# Build netperf
+$(ft_netperf_server) $(ft_netperf_client): $(ft_netperf_build)
+	(cd $(ft_netperf_build) && ./configure CFLAGS=-fcommon)
+	$(MAKE) -C $(ft_netperf_build)
+	touch $(ft_netperf_server) $(ft_netperf_client)
+
+###################################
+
+tests-full-netperf: $(ft_netperf_server) $(ft_netperf_client)
+tests-full: tests-full-netperf
+
+run-tests-full-netperf-server: tests-full-netperf test-full-wrapdeps
+	$(FTWRAP) -d 500 \
+		-P '$(ft_netperf_server)' \
+		-c '$(ft_netperf_client) -H $$TAS_IP -l 100 -t TCP_STREAM'
+
+run-tests-full-netperf-client: tests-full-netperf test-full-wrapdeps
+	$(FTWRAP) -d 500 \
+		-C '$(ft_netperf_server)' \
+		-p '$(ft_netperf_client) -H $$LINUX_IP -l 100 -t TCP_STREAM'
+
+run-tests-full-netperf: run-tests-full-netperf-server run-tests-full-netperf-client
+run-tests-full: run-tests-full-netperf
+
+.PHONY: tests-full-netperf run-tests-full-netperf \
+    run-tests-full-netperf-server run-tests-full-netperf-client
+
+include mk/subdir_post.mk
diff --git a/tests/full/rules.mk b/tests/full/rules.mk
index cb077cd7..1b995f3d 100644
--- a/tests/full/rules.mk
+++ b/tests/full/rules.mk
@@ -39,6 +39,9 @@ include $(dir)/rules.mk
 dir := $(d)/lighttpd
 include $(dir)/rules.mk
 
+dir := $(d)/netperf
+include $(dir)/rules.mk
+
 #########################
 
 DEPS += $(FULLTEST_OBJS:.o=.d) $(FTWRAP_OBJS:.o=.d)

From 1453518005500ae6e3ff10130863fdc71eff44d0 Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Mon, 16 Jan 2023 23:46:06 +0100
Subject: [PATCH 17/50] lib/sockets: hardcode getopt(SOL_TCP, TCP_INFO /
 TCP_MAXSEG)

Prints warning but does not return correct value.
---
 lib/sockets/control.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/sockets/control.c b/lib/sockets/control.c
index 00dc4c42..e971eedd 100644
--- a/lib/sockets/control.c
+++ b/lib/sockets/control.c
@@ -775,6 +775,15 @@ int tas_getsockopt(int sockfd, int level, int optname, void *optval,
     errno = ENOPROTOOPT;
     ret = -1;
     goto out;
+  } else if (level == SOL_TCP && optname == TCP_MAXSEG) {
+    fprintf(stderr, "flextcp getsockopt: warning TCP_MAXSEG hardcoded\n");
+    res = 1460;
+  } else if (level == SOL_TCP && optname == TCP_INFO) {
+    fprintf(stderr, "flextcp getsockopt: warning TCP_INFO hardcoded\n");
+    len = MIN(*optlen, sizeof(struct tcp_info));
+    memset(optval, 0, len);
+    *optlen = len;
+    goto out;
   } else {
     /* unknown option */
     fprintf(stderr, "flextcp getsockopt: unknown level optname combination "

From 6100514e96a4437b290422a01b553e9a6a8118aa Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Mon, 16 Jan 2023 23:49:13 +0100
Subject: [PATCH 18/50] tests/full/netperf: add patch for tolerating short
 send()

Netperf assumes that any send not returning the full amount has failed.
According to the socket spec this is definitely broken. While we could
implement this behavior in our libsocket, that may well cause performance
issues for other cases. So for now, we patch netperf.
---
 tests/full/netperf/netperf-shortsend.patch | 70 ++++++++++++++++++++++
 tests/full/netperf/rules.mk                |  2 +
 2 files changed, 72 insertions(+)
 create mode 100644 tests/full/netperf/netperf-shortsend.patch

diff --git a/tests/full/netperf/netperf-shortsend.patch b/tests/full/netperf/netperf-shortsend.patch
new file mode 100644
index 00000000..c9c7ab65
--- /dev/null
+++ b/tests/full/netperf/netperf-shortsend.patch
@@ -0,0 +1,70 @@
+Only in netperf-netperf-2.7.0: config.h
+Only in netperf-netperf-2.7.0: config.log
+Only in netperf-netperf-2.7.0: config.status
+Only in netperf-netperf-2.7.0/doc/examples: Makefile
+Only in netperf-netperf-2.7.0/doc: Makefile
+Only in netperf-netperf-2.7.0: Makefile
+Only in netperf-netperf-2.7.0: netperf.spec
+Only in netperf-netperf-2.7.0/src: .deps
+Only in netperf-netperf-2.7.0/src: dscp.o
+Only in netperf-netperf-2.7.0/src: Makefile
+Only in netperf-netperf-2.7.0/src/missing: .deps
+Only in netperf-netperf-2.7.0/src/missing/m4: Makefile
+Only in netperf-netperf-2.7.0/src/missing: Makefile
+Only in netperf-netperf-2.7.0/src: netcpu_procstat.o
+Only in netperf-netperf-2.7.0/src: netlib.o
+Only in netperf-netperf-2.7.0/src: netperf
+Only in netperf-netperf-2.7.0/src: netperf.o
+Only in netperf-netperf-2.7.0/src: netperf_version.h
+Only in netperf-netperf-2.7.0/src: netserver
+Only in netperf-netperf-2.7.0/src: netserver.o
+Only in netperf-netperf-2.7.0/src: netsh.o
+Only in netperf-netperf-2.7.0/src: nettest_bsd.o
+Only in netperf-netperf-2.7.0/src: nettest_dlpi.o
+diff -ur netperf-netperf-2.7.0.orig/src/nettest_omni.c netperf-netperf-2.7.0/src/nettest_omni.c
+--- netperf-netperf-2.7.0.orig/src/nettest_omni.c	2015-07-20 19:39:35.000000000 +0200
++++ netperf-netperf-2.7.0/src/nettest_omni.c	2023-01-16 23:37:55.531646323 +0100
+@@ -2916,24 +2916,39 @@
+     }
+   }
+   else {
++    int ret;
++    len = 0;
++
++    while ((uint32_t) len != bytes_to_send) {
+     if (!use_write) {
+-      len = send(data_socket,
++      ret = send(data_socket,
+ 		 send_ring->buffer_ptr,
+-		 bytes_to_send,
++		 bytes_to_send - len,
+ 		 0);
+     }
+     else {
+ #ifndef WIN32
+-      len = write(data_socket,
++      ret = write(data_socket,
+ 		  send_ring->buffer_ptr,
+-		  bytes_to_send);
++		  bytes_to_send - len);
+ #else
+       fprintf(where,"I'm sorry Dave I cannot write() under Windows\n");
+       fflush(where);
+       return -3;
+ #endif
+     }
++
++    if (ret <= 0) {
++      len = ret;
++      break;
++    } else if (SOCKET_EINTR(ret)) {
++      len = ret;
++      break;
++    }
++    len += ret;
++  }
+   }
++
+   if(len != bytes_to_send) {
+     /* don't forget that some platforms may do a partial send upon
+        receipt of the interrupt and not return an EINTR... */
diff --git a/tests/full/netperf/rules.mk b/tests/full/netperf/rules.mk
index b39d9e90..922a77ee 100644
--- a/tests/full/netperf/rules.mk
+++ b/tests/full/netperf/rules.mk
@@ -10,6 +10,7 @@ ft_netperf_tar := $(ft_netperf_parentdir)/netperf-$(ft_netperf_ver).tar.gz
 ft_netperf_build := $(ft_netperf_parentdir)/netperf-netperf-$(ft_netperf_ver)
 ft_netperf_server := $(ft_netperf_build)/src/netserver
 ft_netperf_client := $(ft_netperf_build)/src/netperf
+ft_netperf_patch := $(d)/netperf-shortsend.patch
 
 # Download netperf tarball
 $(ft_netperf_tar):
@@ -19,6 +20,7 @@ $(ft_netperf_tar):
 # Extract netperf tarball
 $(ft_netperf_build): $(ft_netperf_tar)
 	tar xf $< -C $(ft_netperf_parentdir)
+	patch -d $(ft_netperf_build)  -p1 <$(ft_netperf_patch)
 	touch $(@)
 
 # Build netperf

From a1fe0f61b23dea20fdda2beaafae074d86f1e6f8 Mon Sep 17 00:00:00 2001
From: Antoine Kaufmann <antoinek@mpi-sws.org>
Date: Mon, 16 Jan 2023 23:53:02 +0100
Subject: [PATCH 19/50] tests/full/netperf: proper command line parameters for
 test

In particular, avoid deamonizing and fork, and use 5 seconds instead of 100.
The client test still fails when closing connections.
---
 tests/full/netperf/rules.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/full/netperf/rules.mk b/tests/full/netperf/rules.mk
index 922a77ee..09c58595 100644
--- a/tests/full/netperf/rules.mk
+++ b/tests/full/netperf/rules.mk
@@ -36,13 +36,13 @@ tests-full: tests-full-netperf
 
 run-tests-full-netperf-server: tests-full-netperf test-full-wrapdeps
 	$(FTWRAP) -d 500 \
-		-P '$(ft_netperf_server)' \
-		-c '$(ft_netperf_client) -H $$TAS_IP -l 100 -t TCP_STREAM'
+		-P '$(ft_netperf_server) -D -f' \
+		-c '$(ft_netperf_client) -H $$TAS_IP -l 5 -t TCP_STREAM'
 
 run-tests-full-netperf-client: tests-full-netperf test-full-wrapdeps
 	$(FTWRAP) -d 500 \
-		-C '$(ft_netperf_server)' \
-		-p '$(ft_netperf_client) -H $$LINUX_IP -l 100 -t TCP_STREAM'
+		-C '$(ft_netperf_server) -D -f' \
+		-p '$(ft_netperf_client) -H $$LINUX_IP -l 5 -t TCP_STREAM'
 
 run-tests-full-netperf: run-tests-full-netperf-server run-tests-full-netperf-client
 run-tests-full: run-tests-full-netperf

From 4d0f1ff2fa9a6d2093956ec9ac948535ad31c190 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Fri, 24 Mar 2023 15:03:01 +0100
Subject: [PATCH 20/50] fix error with implicit declaration of tas_qman_set

---
 Makefile            | 2 +-
 tas/fast/internal.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index bfb87c45..2e32e3c6 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 
 CPPFLAGS += -Iinclude/
 CPPFLAGS += $(EXTRA_CPPFLAGS)
-CFLAGS += -std=gnu99 -O3 -g -Wall -march=native -fno-omit-frame-pointer
+CFLAGS += -std=gnu99 -O3 -g -Wall -Werror -march=native
 CFLAGS += -Wno-address-of-packed-member
 CFLAGS += $(EXTRA_CFLAGS)
 CFLAGS_SHARED += $(CFLAGS) -fPIC
diff --git a/tas/fast/internal.h b/tas/fast/internal.h
index 7c6ea5b6..ba52aebb 100644
--- a/tas/fast/internal.h
+++ b/tas/fast/internal.h
@@ -69,7 +69,7 @@ extern volatile unsigned fp_scale_to;
 
 /** Qman functions */
 int tas_qman_thread_init(struct dataplane_context *ctx);
-int qman_poll(struct dataplane_context *ctx, unsigned num, unsigned *vm_id, 
+int tas_qman_poll(struct dataplane_context *ctx, unsigned num, unsigned *vm_id, 
     unsigned *q_ids, uint16_t *q_bytes);
 int tas_qman_set(struct qman_thread *t, uint32_t vm_id, uint32_t flow_id, uint32_t rate,
     uint32_t avail, uint16_t max_chunk, uint8_t flags);

From c27b192913edcd3181a74e6316749cf3705c5997 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Sat, 25 Mar 2023 00:09:46 +0100
Subject: [PATCH 21/50] add configs for ovs tas experiment and fix dpdk version
 in dpdk-bind script

---
 Makefile                                      |   2 +-
 experiments/configs/gen_config.py             |   2 +-
 experiments/experiments.py                    |   6 +
 .../exps/perf_iso_tpconn/configs/ovs_tas.py   | 116 ++++++++++++++++++
 .../exps/perf_iso_tpconn/perf_iso_tpconn.py   |   5 +-
 experiments/nodes/ovs_tas/ovslinux_client.py  |  42 -------
 experiments/nodes/ovs_tas/ovslinux_server.py  |  36 ------
 experiments/nodes/ovs_tas/ovstas_client.py    |   6 +-
 experiments/nodes/ovs_tas/ovstas_server.py    |   4 +-
 images/dpdk_bind.sh                           |   2 +-
 images/start-vm.sh                            |  16 +++
 11 files changed, 150 insertions(+), 87 deletions(-)
 create mode 100644 experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
 delete mode 100644 experiments/nodes/ovs_tas/ovslinux_client.py
 delete mode 100644 experiments/nodes/ovs_tas/ovslinux_server.py

diff --git a/Makefile b/Makefile
index 2e32e3c6..204fc7db 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 
 CPPFLAGS += -Iinclude/
 CPPFLAGS += $(EXTRA_CPPFLAGS)
-CFLAGS += -std=gnu99 -O3 -g -Wall -Werror -march=native
+CFLAGS += -std=gnu99 -O3 -g -Wall -march=native
 CFLAGS += -Wno-address-of-packed-member
 CFLAGS += $(EXTRA_CFLAGS)
 CFLAGS_SHARED += $(CFLAGS) -fPIC
diff --git a/experiments/configs/gen_config.py b/experiments/configs/gen_config.py
index 94e6e291..a8160afa 100644
--- a/experiments/configs/gen_config.py
+++ b/experiments/configs/gen_config.py
@@ -88,7 +88,7 @@ def __init__(self, pane, machine_config, project_dir, ip, n_cores,
         self.args = '--ip-addr={}/24 --fp-cores-max={}'.format(ip, n_cores) + \
             ' --cc=const-rate --cc-const-rate=0' + \
             ' --fp-no-autoscale --fp-no-ints' + \
-            ' --dpdk-extra="-w{}"'.format(dpdk_extra)   
+            ' --dpdk-extra="-a{}"'.format(dpdk_extra)   
         
         self.pane = pane
         self.ip = ip
diff --git a/experiments/experiments.py b/experiments/experiments.py
index 2c5dc1c8..2b54aa5c 100644
--- a/experiments/experiments.py
+++ b/experiments/experiments.py
@@ -15,6 +15,8 @@
 from nodes.vtas_bare.vtasbare_client import VTasBareClient
 from nodes.ovs_linux.ovslinux_server import OvsLinuxServer
 from nodes.ovs_linux.ovslinux_client import OvsLinuxClient
+from nodes.ovs_tas.ovstas_server import OvsTasServer
+from nodes.ovs_tas.ovstas_client import OvsTasClient
 
 class Experiment:
 
@@ -41,6 +43,8 @@ def init_server_node(self, stack):
             node = VTasBareServer(self.config, self.wmanager)
         elif stack == "ovs-linux":
             node = OvsLinuxServer(self.config, self.wmanager)
+        elif stack == "ovs-tas":
+            node = OvsTasServer(self.config, self.wmanager)
 
         return node
 
@@ -59,6 +63,8 @@ def init_client_node(self, stack):
             node = VTasBareClient(self.config, self.wmanager)
         elif stack == "ovs-linux":
             node = OvsLinuxClient(self.config, self.wmanager)
+        elif stack == "ovs-tas":
+            node = OvsTasClient(self.config, self.wmanager)
 
         return node
 
diff --git a/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py b/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
new file mode 100644
index 00000000..998b9746
--- /dev/null
+++ b/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
@@ -0,0 +1,116 @@
+from configs.gen_config import Defaults
+from configs.gen_config import MachineConfig
+from configs.gen_config import TasConfig
+from configs.gen_config import VMConfig
+from configs.gen_config import HostProxyConfig
+from configs.gen_config import GuestProxyConfig
+from configs.gen_config import ClientConfig
+from configs.gen_config import ServerConfig
+
+class Config:
+    def __init__(self, exp_name, nconns):
+        self.exp_name = exp_name
+        self.defaults = Defaults()
+        
+        # Server Machine
+        self.sstack = 'bare-tas'
+        self.snum = 2
+        self.snodenum = 1
+        self.s_tas_configs = []
+        self.s_vm_configs = []
+        self.s_proxyg_configs = []
+        self.server_configs = []
+        
+        self.s_machine_config = MachineConfig(ip=self.defaults.server_ip, 
+                interface=self.defaults.server_interface,
+                stack=self.sstack,
+                is_remote=True,
+                is_server=True)
+
+        tas_config = TasConfig(pane=self.defaults.s_tas_pane,
+                machine_config=self.s_machine_config,
+                project_dir=self.defaults.default_otas_dir_bare,
+                ip=self.s_machine_config.ip,
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        self.s_tas_configs.append(tas_config)
+
+        server0_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=0, vmid=0,
+                port=1234, ncores=8, max_flows=4096, max_bytes=1024,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        server1_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=1, vmid=0,
+                port=1235, ncores=8, max_flows=4096, max_bytes=1024,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        self.server_configs.append(server0_config)
+        self.server_configs.append(server1_config)
+
+        # Client Machine
+        self.cstack = 'ovs-tas'
+        self.cnum = 1
+        self.cnodenum = 2
+        self.c_tas_configs = []
+        self.c_vm_configs = []
+        self.c_proxyg_configs = []
+        self.client_configs = []
+
+        self.c_machine_config = MachineConfig(ip=self.defaults.client_ip, 
+                interface=self.defaults.client_interface,
+                stack=self.cstack,
+                is_remote=False,
+                is_server=False)
+
+        
+        vm0_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=0)
+        tas0_config = TasConfig(pane=self.defaults.c_tas_pane,
+                machine_config=self.c_machine_config,
+                project_dir=self.defaults.default_otas_dir_virt,
+                ip=vm0_config.tas_tap_ip,
+                n_cores=1, dpdk_extra="00:04.0")
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        
+
+        vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=1)
+        tas1_config = TasConfig(pane=self.defaults.c_tas_pane,
+                machine_config=self.c_machine_config,
+                project_dir=self.defaults.default_otas_dir_virt,
+                ip=vm1_config.tas_tap_ip,
+                n_cores=1, dpdk_extra="00:04.0")
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+
+
+        self.c_tas_configs.append(tas0_config)
+        # self.c_tas_configs.append(tas1_config)
+        self.c_vm_configs.append(vm0_config)
+        # self.c_vm_configs.append(vm1_config)
+
+        client0_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=0, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1234, ncores=3,
+                msize=64, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_obenchmark_dir_virt,
+                tas_dir=self.defaults.default_otas_dir_virt)
+        client1_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=1, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
+                msize=64, mpending=64, nconns=nconns,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_obenchmark_dir_virt,
+                tas_dir=self.defaults.default_otas_dir_virt)
+
+        self.client_configs.append(client0_config)
+        # self.client_configs.append(client1_config)
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py b/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
index 2b140a6a..4ca33ce1 100644
--- a/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
+++ b/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
@@ -4,6 +4,7 @@
 from exps.perf_iso_tpconn.configs.bare_vtas import Config as VTasBareConf
 from exps.perf_iso_tpconn.configs.virt_tas import Config as TasVirtConf
 from exps.perf_iso_tpconn.configs.ovs_linux import Config as OVSLinuxConf
+from exps.perf_iso_tpconn.configs.ovs_tas import Config as OVSTasConf
 
 experiments = []
 
@@ -16,9 +17,11 @@
   vtas_bare_exp = exp.Experiment(VTasBareConf(exp_name + "bare-vtas", n), name=exp_name)
   tas_virt_exp = exp.Experiment(TasVirtConf(exp_name + "virt-tas", n), name=exp_name)
   ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n), name=exp_name)
+  ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n), name=exp_name)
 
   # experiments.append(tas_bare_exp)
   # experiments.append(vtas_bare_exp)
   # experiments.append(tas_virt_exp)
-  experiments.append(ovs_linux_exp)
+  # experiments.append(ovs_linux_exp)
+  experiments.append(ovs_tas_exp)
   
diff --git a/experiments/nodes/ovs_tas/ovslinux_client.py b/experiments/nodes/ovs_tas/ovslinux_client.py
deleted file mode 100644
index 571bca63..00000000
--- a/experiments/nodes/ovs_tas/ovslinux_client.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import time
-
-from nodes.ovs_linux.ovslinux import OvsLinux
-from components.client import Client
-
-class OVSLinuxClient(OvsLinux):
-  
-  def __init__(self, config, wmanager):
-
-    OvsLinux.__init__(self, config.defaults, config.c_machine_config,
-        config.c_vm_configs, wmanager, 
-        config.defaults.c_setup_pane, 
-        config.defaults.c_cleanup_pane)
-
-    self.client_configs = config.client_configs
-    self.nodenum = config.cnodenum
-    self.cnum = config.cnum
-    self.clients = []
-
-  def start_clients(self):
-    for i in range(self.nodenum):
-      vm_config = self.vm_configs[i]
-      for j in range(self.cnum):
-        cidx = self.cnum * i + j
-        client_config = self.client_configs[cidx]
-        client = Client(self.defaults, 
-            self.machine_config,
-            client_config, 
-            vm_config, 
-            self.wmanager)
-        self.clients.append(client)
-        client.run_virt(False, False)
-        time.sleep(3)
-
-  def run(self):
-    self.setup()
-    self.start_vms()
-    self.start_clients()
-
-  def save_logs(self, exp_path):
-    for client in self.clients:
-      client.save_log_virt(exp_path)
diff --git a/experiments/nodes/ovs_tas/ovslinux_server.py b/experiments/nodes/ovs_tas/ovslinux_server.py
deleted file mode 100644
index 2ce13fc7..00000000
--- a/experiments/nodes/ovs_tas/ovslinux_server.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import time
-
-from nodes.ovs_linux.ovslinux import OvsLinux
-from components.server import Server
-
-class OVSLinuxServer(OvsLinux):
-  
-  def __init__(self, config, wmanager):
-
-    OvsLinux.__init__(self, config.defaults, config.s_machine_config,
-        config.s_vm_configs, wmanager, 
-        config.defaults.s_setup_pane, 
-        config.defaults.s_cleanup_pane)
-
-    self.server_configs = config.server_configs
-    self.nodenum = config.snodenum
-    self.snum = config.snum
-
-  def start_servers(self):
-    for i in range(self.nodenum):
-      vm_config = self.vm_configs[i]
-      for j in range(self.snum):
-        sidx = self.snum * i + j
-        server_config = self.server_configs[sidx]
-        server = Server(self.defaults, 
-                self.machine_config,
-                server_config, 
-                vm_config,
-                self.wmanager)
-        server.run_virt(False, False)
-        time.sleep(3)
-
-  def run(self):
-    self.setup()
-    self.start_vms()
-    self.start_servers()
diff --git a/experiments/nodes/ovs_tas/ovstas_client.py b/experiments/nodes/ovs_tas/ovstas_client.py
index a8e2143f..7f6ea910 100644
--- a/experiments/nodes/ovs_tas/ovstas_client.py
+++ b/experiments/nodes/ovs_tas/ovstas_client.py
@@ -3,13 +3,13 @@
 from nodes.ovs_tas.ovstas import OvsTas
 from components.client import Client
 
-class OVSLinuxClient(OvsTas):
+class OvsTasClient(OvsTas):
   
   def __init__(self, config, wmanager):
 
     OvsTas.__init__(self, config.defaults, config.c_machine_config,
-        config.c_vm_configs, wmanager, 
-        config.defaults.c_setup_pane, 
+        config.c_tas_configs, config.c_vm_configs, 
+        wmanager, config.defaults.c_setup_pane, 
         config.defaults.c_cleanup_pane)
 
     self.client_configs = config.client_configs
diff --git a/experiments/nodes/ovs_tas/ovstas_server.py b/experiments/nodes/ovs_tas/ovstas_server.py
index 8cbe1ac7..87a6cca3 100644
--- a/experiments/nodes/ovs_tas/ovstas_server.py
+++ b/experiments/nodes/ovs_tas/ovstas_server.py
@@ -8,8 +8,8 @@ class OvsTasServer(OvsTas):
   def __init__(self, config, wmanager):
 
     OvsTas.__init__(self, config.defaults, config.s_machine_config,
-        config.s_vm_configs, wmanager, 
-        config.defaults.s_setup_pane, 
+        config.s_tas_configs, config.s_vm_configs,
+        wmanager, config.defaults.s_setup_pane, 
         config.defaults.s_cleanup_pane)
 
     self.server_configs = config.server_configs
diff --git a/images/dpdk_bind.sh b/images/dpdk_bind.sh
index 312c6352..9b112d7f 100644
--- a/images/dpdk_bind.sh
+++ b/images/dpdk_bind.sh
@@ -24,5 +24,5 @@ sudo ip link set $interface down
 
 # Bind vnic to dpdk
 sudo modprobe vfio-pci
-cd /home/tas/programs/dpdk-stable-19.11.14/usertools
+cd /home/tas/programs/dpdk-stable-22.11.3/usertools
 sudo python3 dpdk-devbind.py -b vfio-pci $pci_id
diff --git a/images/start-vm.sh b/images/start-vm.sh
index 3689a652..6f05763b 100755
--- a/images/start-vm.sh
+++ b/images/start-vm.sh
@@ -69,6 +69,22 @@ elif [[ "$stack" == 'ovs-linux' ]]; then
     -drive if=virtio,format=qcow2,file="base.snapshot.qcow2" \
     -drive if=virtio,format=raw,file="seed.img" \
     ;
+elif [[ "$stack" == 'ovs-tas' ]]; then
+  sudo qemu-system-x86_64 \
+    -nographic -monitor none -serial stdio \
+    -machine accel=kvm,type=q35 \
+    -cpu host \
+    -smp 12 \
+    -m 12G \
+    -netdev user,id=net0 \
+    -device virtio-net-pci,netdev=net0 \
+    -netdev tap,ifname=$tap,script=no,downscript=no,vhost=on,id=net1 \
+    -device virtio-net-pci,mac=$mac,netdev=net1 \
+    -netdev tap,ifname=$ovstap,script=no,downscript=no,vhost=on,id=net2 \
+    -device virtio-net-pci,mac=$alt_mac,vectors=18,mq=on,netdev=net2 \
+    -drive if=virtio,format=qcow2,file="base.snapshot.qcow2" \
+    -drive if=virtio,format=raw,file="seed.img" \
+    ;
 elif [[ "$stack" == 'tap-tas' ]]; then
   sudo qemu-system-x86_64 \
     -nographic -monitor none -serial stdio \

From d3b355df4e313e139ef044a34ffa8f95a1a85f4e Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Sat, 25 Mar 2023 00:17:55 +0100
Subject: [PATCH 22/50] 21 instead of 22 in dpdk-bind script

---
 images/dpdk_bind.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/dpdk_bind.sh b/images/dpdk_bind.sh
index 9b112d7f..2b23ae4d 100644
--- a/images/dpdk_bind.sh
+++ b/images/dpdk_bind.sh
@@ -24,5 +24,5 @@ sudo ip link set $interface down
 
 # Bind vnic to dpdk
 sudo modprobe vfio-pci
-cd /home/tas/programs/dpdk-stable-22.11.3/usertools
+cd /home/tas/programs/dpdk-stable-21.11.3/usertools
 sudo python3 dpdk-devbind.py -b vfio-pci $pci_id

From 8e55eb1b322036b3e7ac264c791e1ceb20a034ff Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Mon, 27 Mar 2023 15:21:05 +0200
Subject: [PATCH 23/50] add config option to disable rss

---
 tas/config.c         | 13 +++++++++++--
 tas/fast/network.c   |  6 ++++++
 tas/include/config.h |  2 ++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/tas/config.c b/tas/config.c
index 5c0a9497..ec72195a 100644
--- a/tas/config.c
+++ b/tas/config.c
@@ -74,6 +74,7 @@ enum cfg_params {
   CP_FP_NO_INTS,
   CP_FP_NO_XSUMOFFLOAD,
   CP_FP_NO_AUTOSCALE,
+  CP_FP_NO_RSS,
   CP_FP_NO_HUGEPAGES,
   CP_FP_VLAN_STRIP,
   CP_FP_POLL_INTERVAL_TAS,
@@ -207,6 +208,9 @@ static struct option opts[] = {
     { .name = "fp-no-autoscale",
       .has_arg = no_argument,
       .val = CP_FP_NO_AUTOSCALE },
+    { .name = "fp-no-rss",
+      .has_arg = no_argument,
+      .val = CP_FP_NO_RSS },
     { .name = "fp-no-hugepages",
       .has_arg = no_argument,
       .val = CP_FP_NO_HUGEPAGES },
@@ -222,8 +226,7 @@ static struct option opts[] = {
     { .name = "bu-max-budget",
       .has_arg = required_argument,
       .val = CP_BU_MAX_BUDGET },
-    {
-      .name = "bu-use-ratio",
+    { .name = "bu-use-ratio",
       .has_arg = required_argument,
       .val = CP_BU_USE_RATIO },
     { .name = "bu-update-freq",
@@ -513,6 +516,9 @@ int config_parse(struct configuration *c, int argc, char *argv[])
       case CP_FP_NO_AUTOSCALE:
         c->fp_autoscale = 0;
         break;
+      case CP_FP_NO_RSS:
+        c->fp_rss = 0;
+        break;
       case CP_FP_NO_HUGEPAGES:
         c->fp_hugepages = 0;
         break;
@@ -655,6 +661,7 @@ static int config_defaults(struct configuration *c, char *progname)
   c->fp_interrupts = 1;
   c->fp_xsumoffload = 1;
   c->fp_autoscale = 1;
+  c->fp_rss = 1;
   c->fp_hugepages = 1;
   c->fp_vlan_strip = 0;
   c->fp_poll_interval_tas = 10000;
@@ -766,6 +773,8 @@ static void print_usage(struct configuration *c, char *progname)
           "[default: enabled]\n"
       "  --fp-no-autoscale           Disable autoscaling "
           "[default: enabled]\n"
+      "  --fp-no-rss                 Disable rss "
+          "[default: enabled]\n"
       "  --fp-no-hugepages           Disable hugepages for SHM "
           "[default: enabled]\n"
       "  --fp-poll-interval-tas      TAS polling interval before blocking "
diff --git a/tas/fast/network.c b/tas/fast/network.c
index 25ac4310..c24dd903 100644
--- a/tas/fast/network.c
+++ b/tas/fast/network.c
@@ -134,6 +134,12 @@ int network_init(unsigned n_threads)
     goto error_exit;
   }
 
+  /* turn off rss */
+  if (config.fp_rss == 0)
+  {
+    port_conf.rxmode.mq_mode = ETH_MQ_RX_NONE;
+  }
+
   /* mask unsupported RSS hash functions */
   if ((port_conf.rx_adv_conf.rss_conf.rss_hf &
        eth_devinfo.flow_type_rss_offloads) !=
diff --git a/tas/include/config.h b/tas/include/config.h
index 1cb924eb..7928bd1f 100644
--- a/tas/include/config.h
+++ b/tas/include/config.h
@@ -129,6 +129,8 @@ struct configuration {
   uint32_t fp_xsumoffload;
   /** FP: auto scaling enabled */
   uint32_t fp_autoscale;
+  /** FP: rss enabled */
+  uint32_t fp_rss;
   /** FP: use huge pages for internal and buffer memory */
   uint32_t fp_hugepages;
   /** FP: enable vlan stripping */

From a9ca0d97b9f9253c8eb84b3e5906cee65c99765b Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Tue, 28 Mar 2023 11:28:15 +0200
Subject: [PATCH 24/50] use threading to start vms and add all baselines to
 perfiso_tp_conn experiment

---
 experiments/components/vm.py                  |  4 +-
 experiments/configs/gen_config.py             |  2 +-
 .../perf_iso_tpconn/configs/bare_vtas_off.py  | 90 -------------------
 .../exps/perf_iso_tpconn/configs/ovs_tas.py   | 12 ++-
 experiments/exps/perf_iso_tpconn/parse.py     |  9 +-
 .../exps/perf_iso_tpconn/perf_iso_tpconn.py   |  7 +-
 .../exps/perf_iso_tpconn/plot_script.plt      |  2 +
 experiments/nodes/node.py                     |  5 +-
 experiments/nodes/ovs_linux/ovslinux.py       | 18 +++-
 experiments/nodes/ovs_tas/ovstas.py           | 31 +++++--
 experiments/nodes/ovs_tas/ovstas_client.py    |  2 +-
 experiments/nodes/tap_tas/ttas.py             | 20 +++--
 experiments/nodes/virt_linux/vlinux.py        | 15 +++-
 experiments/nodes/virt_tas/vtas.py            | 14 ++-
 images/ovstap-add.sh                          | 13 ++-
 images/start-vm.sh                            |  5 +-
 16 files changed, 113 insertions(+), 136 deletions(-)
 delete mode 100644 experiments/exps/perf_iso_tpconn/configs/bare_vtas_off.py

diff --git a/experiments/components/vm.py b/experiments/components/vm.py
index 00409e73..1091c993 100644
--- a/experiments/components/vm.py
+++ b/experiments/components/vm.py
@@ -17,13 +17,13 @@ def start(self):
         self.pane.send_keys(start_vm_cmd)
        
         print("Started VM")
-        time.sleep(35)
+        time.sleep(25)
         self.login_vm()
 
     def enable_hugepages(self):
         cmd = "sudo mount -t hugetlbfs nodev /dev/hugepages"
         self.pane.send_keys(cmd)
-        cmd = "echo 1024 | sudo tee /sys/devices/system/node/node*/hugepages/hugepages-2048kB/nr_hugepages"
+        cmd = "echo 8192 | sudo tee /sys/devices/system/node/node*/hugepages/hugepages-2048kB/nr_hugepages"
         self.pane.send_keys(cmd)
         time.sleep(3)
 
diff --git a/experiments/configs/gen_config.py b/experiments/configs/gen_config.py
index a8160afa..2995a89e 100644
--- a/experiments/configs/gen_config.py
+++ b/experiments/configs/gen_config.py
@@ -87,7 +87,7 @@ def __init__(self, pane, machine_config, project_dir, ip, n_cores,
         self.exec_file = self.comp_dir + '/tas/tas'
         self.args = '--ip-addr={}/24 --fp-cores-max={}'.format(ip, n_cores) + \
             ' --cc=const-rate --cc-const-rate=0' + \
-            ' --fp-no-autoscale --fp-no-ints' + \
+            ' --fp-no-autoscale --fp-no-ints --fp-no-xsumoffload --fp-no-rss' + \
             ' --dpdk-extra="-a{}"'.format(dpdk_extra)   
         
         self.pane = pane
diff --git a/experiments/exps/perf_iso_tpconn/configs/bare_vtas_off.py b/experiments/exps/perf_iso_tpconn/configs/bare_vtas_off.py
deleted file mode 100644
index 7a5618e4..00000000
--- a/experiments/exps/perf_iso_tpconn/configs/bare_vtas_off.py
+++ /dev/null
@@ -1,90 +0,0 @@
-from configs.gen_config import Defaults
-from configs.gen_config import MachineConfig
-from configs.gen_config import TasConfig
-from configs.gen_config import ClientConfig
-from configs.gen_config import ServerConfig
-
-class Config:
-    def __init__(self, exp_name, nconns):
-        self.exp_name = exp_name
-        self.defaults = Defaults()
-        
-        # Server Machine
-        self.sstack = 'bare-tas'
-        self.snum = 2
-        self.snodenum = 1
-        self.s_tas_configs = []
-        self.s_vm_configs = []
-        self.s_proxyg_configs = []
-        self.server_configs = []
-        
-        self.s_machine_config = MachineConfig(ip=self.defaults.server_ip, 
-                interface=self.defaults.server_interface,
-                stack=self.sstack,
-                is_remote=True,
-                is_server=True)
-
-        tas_config = TasConfig(pane=self.defaults.s_tas_pane,
-                machine_config=self.s_machine_config,
-                project_dir=self.defaults.default_otas_dir_bare,
-                ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
-        self.s_tas_configs.append(tas_config)
-
-        server0_config = ServerConfig(pane=self.defaults.s_server_pane,
-                idx=0, vmid=0, groupid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=1024,
-                bench_dir=self.defaults.default_obenchmark_dir_bare,
-                tas_dir=self.defaults.default_otas_dir_bare)
-        server1_config = ServerConfig(pane=self.defaults.s_server_pane,
-                idx=1, vmid=0, groupid=1,
-                port=1235, ncores=8, max_flows=4096, max_bytes=1024,
-                bench_dir=self.defaults.default_obenchmark_dir_bare,
-                tas_dir=self.defaults.default_otas_dir_bare)
-                
-        self.server_configs.append(server0_config)
-        self.server_configs.append(server1_config)
-
-        # Client Machine
-        self.cstack = 'bare-vtas'
-        self.cnum = 2
-        self.cnodenum = 1
-        self.c_tas_configs = []
-        self.c_vm_configs = []
-        self.c_proxyg_configs = []
-        self.client_configs = []
-
-        self.c_machine_config = MachineConfig(ip=self.defaults.client_ip, 
-                interface=self.defaults.client_interface,
-                stack=self.cstack,
-                is_remote=False,
-                is_server=False)
-
-        tas_config = TasConfig(pane=self.defaults.c_tas_pane,
-                machine_config=self.c_machine_config,
-                project_dir=self.defaults.default_vtas_dir_bare,
-                ip=self.c_machine_config.ip,
-                n_cores=1)
-        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296 --bu-max-budget=2100000000 --bu-boost=2 --bu-update-freq=1000000'
-        self.c_tas_configs.append(tas_config)
-
-        client0_config = ClientConfig(exp_name=exp_name, 
-                pane=self.defaults.c_client_pane,
-                idx=0, vmid=0, groupid=0, stack=self.cstack,
-                ip=self.defaults.server_ip, port=1234, ncores=3,
-                msize=64, mpending=64, nconns=512,
-                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
-                bench_dir=self.defaults.default_vbenchmark_dir_bare,
-                tas_dir=self.defaults.default_vtas_dir_bare)
-        client1_config = ClientConfig(exp_name=exp_name, 
-                pane=self.defaults.c_client_pane,
-                idx=1, vmid=0, groupid=1, stack=self.cstack,
-                ip=self.defaults.server_ip, port=1235, ncores=3,
-                msize=64, mpending=64, nconns=nconns,
-                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
-                bench_dir=self.defaults.default_vbenchmark_dir_bare,
-                tas_dir=self.defaults.default_vtas_dir_bare)
-
-        self.client_configs.append(client0_config)
-        self.client_configs.append(client1_config)
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py b/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
index 998b9746..aafb081d 100644
--- a/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
+++ b/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
@@ -2,8 +2,6 @@
 from configs.gen_config import MachineConfig
 from configs.gen_config import TasConfig
 from configs.gen_config import VMConfig
-from configs.gen_config import HostProxyConfig
-from configs.gen_config import GuestProxyConfig
 from configs.gen_config import ClientConfig
 from configs.gen_config import ServerConfig
 
@@ -74,7 +72,7 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm0_config.tas_tap_ip,
                 n_cores=1, dpdk_extra="00:04.0")
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
         
 
         vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
@@ -87,13 +85,13 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm1_config.tas_tap_ip,
                 n_cores=1, dpdk_extra="00:04.0")
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
 
 
         self.c_tas_configs.append(tas0_config)
-        # self.c_tas_configs.append(tas1_config)
+        self.c_tas_configs.append(tas1_config)
         self.c_vm_configs.append(vm0_config)
-        # self.c_vm_configs.append(vm1_config)
+        self.c_vm_configs.append(vm1_config)
 
         client0_config = ClientConfig(exp_name=exp_name, 
                 pane=self.defaults.c_client_pane,
@@ -113,4 +111,4 @@ def __init__(self, exp_name, nconns):
                 tas_dir=self.defaults.default_otas_dir_virt)
 
         self.client_configs.append(client0_config)
-        # self.client_configs.append(client1_config)
\ No newline at end of file
+        self.client_configs.append(client1_config)
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_tpconn/parse.py b/experiments/exps/perf_iso_tpconn/parse.py
index 1f8bde1d..8a1dbe15 100644
--- a/experiments/exps/perf_iso_tpconn/parse.py
+++ b/experiments/exps/perf_iso_tpconn/parse.py
@@ -80,7 +80,8 @@ def parse_data(parsed_md):
   for nconns in parsed_md:
     data_point = {"nconns": nconns}
     for stack in parsed_md[nconns]:
-      if stack == "virt-tas":
+      is_virt = stack == "virt-tas" or stack == "ovs-tas" or stack == "ovs-linux"
+      if is_virt:
         c0_fname = out_dir + parsed_md[nconns][stack]["0"]["0"]
         c1_fname = out_dir + parsed_md[nconns][stack]["1"]["0"]
       else:
@@ -98,14 +99,16 @@ def parse_data(parsed_md):
 
 def save_dat_file(avg_tps, fname):
   f = open(fname, "w+")
-  header = "nconns bare-tas bare-vtas virt-tas\n"
+  header = "nconns bare-tas bare-vtas virt-tas ovs-linux ovs-tas\n"
   f.write(header)
   for tp in avg_tps:
     f.write("{} {} {} {}\n".format(
       tp["nconns"],
       tp["bare-tas"],
       tp["bare-vtas"],
-      tp["virt-tas"]
+      tp["virt-tas"],
+      tp["ovs-linux"],
+      tp["ovs-tas"]
     ))
         
 def main():
diff --git a/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py b/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
index 4ca33ce1..e68f6e1e 100644
--- a/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
+++ b/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
@@ -8,8 +8,7 @@
 
 experiments = []
 
-# n_conns = [128, 256, 512, 1024, 2048, 4096, 8192]
-n_conns = [128]
+n_conns = [128, 256, 512, 1024, 2048, 4096, 8192]
 
 for n in n_conns:
   exp_name = "perf-iso-tpconn_conns{}_".format(n)
@@ -21,7 +20,7 @@
 
   # experiments.append(tas_bare_exp)
   # experiments.append(vtas_bare_exp)
-  # experiments.append(tas_virt_exp)
+  experiments.append(tas_virt_exp)
+  # experiments.append(ovs_tas_exp)
   # experiments.append(ovs_linux_exp)
-  experiments.append(ovs_tas_exp)
   
diff --git a/experiments/exps/perf_iso_tpconn/plot_script.plt b/experiments/exps/perf_iso_tpconn/plot_script.plt
index 3b15fad2..eeebe830 100644
--- a/experiments/exps/perf_iso_tpconn/plot_script.plt
+++ b/experiments/exps/perf_iso_tpconn/plot_script.plt
@@ -15,3 +15,5 @@ set yrange [0:]
 plot 'tp.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 w lp, \
      'tp.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 w lp, \
      'tp.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 w lp, \
+     'tp.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 4 w lp, \
+     'tp.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 4 w lp, \
diff --git a/experiments/nodes/node.py b/experiments/nodes/node.py
index 57734c4d..275ce937 100644
--- a/experiments/nodes/node.py
+++ b/experiments/nodes/node.py
@@ -77,11 +77,12 @@ def ovsbr_del(self, br_name):
       self.cleanup_pane.send_keys(cmd)
       time.sleep(2)
   
-  def ovstap_add(self, br_name, tap_name, script_dir):
+  def ovstap_add(self, br_name, tap_name, multi_queue, script_dir):
       cmd = "cd {}".format(script_dir)
       self.setup_pane.send_keys(cmd)
       time.sleep(1)
-      cmd = "sudo bash ovstap-add.sh {} {}".format(br_name, tap_name)
+      cmd = "sudo bash ovstap-add.sh {} {} {}".format(
+          br_name, tap_name, multi_queue)
       self.setup_pane.send_keys(cmd)
       time.sleep(2)
 
diff --git a/experiments/nodes/ovs_linux/ovslinux.py b/experiments/nodes/ovs_linux/ovslinux.py
index 805675f6..86b28110 100644
--- a/experiments/nodes/ovs_linux/ovslinux.py
+++ b/experiments/nodes/ovs_linux/ovslinux.py
@@ -1,4 +1,6 @@
 import time
+import threading
+
 from components.vm import VM
 from nodes.node import Node
 
@@ -26,7 +28,8 @@ def setup(self):
     for vm_config in self.vm_configs:
       # Tap that allows us to ssh to VM
       self.ovstap_add("br0", 
-                      "tap{}".format(vm_config.id), 
+                      "tap{}".format(vm_config.id),
+                      0,
                       vm_config.manager_dir)
 
   def cleanup(self):
@@ -46,9 +49,18 @@ def cleanup(self):
     for vm_config in self.vm_configs:
       self.tap_down("tap{}".format(vm_config.id), vm_config.manager_dir)
     
+  def start_vm(self, vm, vm_config):
+    vm.start()
+    vm.init_interface(vm_config.vm_ip, self.defaults.vm_interface)
+  
   def start_vms(self):
+    threads = []
     for vm_config in self.vm_configs:
       vm = VM(self.defaults, self.machine_config, vm_config, self.wmanager)
       self.vms.append(vm)
-      vm.start()
-      vm.init_interface(vm_config.vm_ip, self.defaults.vm_interface)
\ No newline at end of file
+      vm_thread = threading.Thread(target=self.start_vm, args=(vm, vm_config))
+      threads.append(vm_thread)
+      vm_thread.start()
+    
+    for t in threads:
+      t.join()
diff --git a/experiments/nodes/ovs_tas/ovstas.py b/experiments/nodes/ovs_tas/ovstas.py
index 2d6cb4f3..bfd83f34 100644
--- a/experiments/nodes/ovs_tas/ovstas.py
+++ b/experiments/nodes/ovs_tas/ovstas.py
@@ -1,4 +1,5 @@
 import time
+import threading 
 
 from components.tas import TAS
 from components.vm import VM
@@ -30,11 +31,13 @@ def setup(self):
     for vm_config in self.vm_configs:
       # Tap that allows us to ssh to VM
       self.ovstap_add("br0", 
-                      "tap{}".format(vm_config.id), 
+                      "tap{}".format(vm_config.id),
+                      0, 
                       vm_config.manager_dir)
       # TAP used by OvS
       self.ovstap_add("br0", 
-                      "ovstap{}".format(vm_config.id), 
+                      "ovstap{}".format(vm_config.id),
+                      1, 
                       vm_config.manager_dir)
 
   def cleanup(self):
@@ -69,14 +72,24 @@ def start_tas(self):
       tas.run_virt()
       time.sleep(3)
 
+  def start_vm(self, vm, vm_config):
+    vm.start()
+    vm.enable_hugepages()
+    vm.enable_noiommu("1af4 1110")
+    vm.init_interface(vm_config.vm_ip, self.defaults.vm_interface)
+    vm.init_interface(vm_config.tas_tap_ip, self.defaults.tas_interface)
+    vm.dpdk_bind(vm_config.tas_tap_ip, self.defaults.tas_interface,
+        self.defaults.pci_id)
+
   def start_vms(self):
+    threads = []
     for vm_config in self.vm_configs:
       vm = VM(self.defaults, self.machine_config, vm_config, self.wmanager)
       self.vms.append(vm)
-      vm.start()
-      vm.enable_hugepages()
-      vm.enable_noiommu("1af4 1110")
-      vm.init_interface(vm_config.vm_ip, self.defaults.vm_interface)
-      vm.init_interface(vm_config.tas_tap_ip, self.defaults.tas_interface)
-      vm.dpdk_bind(vm_config.tas_tap_ip, self.defaults.tas_interface,
-          self.defaults.pci_id)
\ No newline at end of file
+      vm_thread = threading.Thread(target=self.start_vm, args=(vm, vm_config))
+      threads.append(vm_thread)
+      vm_thread.start()
+
+    for t in threads:
+      t.join()
+      
\ No newline at end of file
diff --git a/experiments/nodes/ovs_tas/ovstas_client.py b/experiments/nodes/ovs_tas/ovstas_client.py
index 7f6ea910..b9bd0240 100644
--- a/experiments/nodes/ovs_tas/ovstas_client.py
+++ b/experiments/nodes/ovs_tas/ovstas_client.py
@@ -29,7 +29,7 @@ def start_clients(self):
             vm_config, 
             self.wmanager)
         self.clients.append(client)
-        client.run_virt(False, True)
+        client.run_virt(True, True)
         time.sleep(3)
 
   def run(self):
diff --git a/experiments/nodes/tap_tas/ttas.py b/experiments/nodes/tap_tas/ttas.py
index 55717f82..6a3017a3 100644
--- a/experiments/nodes/tap_tas/ttas.py
+++ b/experiments/nodes/tap_tas/ttas.py
@@ -1,4 +1,5 @@
 import time
+import threading
 
 from components.tas import TAS
 from components.vm import VM
@@ -52,14 +53,23 @@ def start_tas(self):
       tas.run_virt()
       time.sleep(3)
 
-  def start_vms(self):
-    for vm_config in self.vm_configs:
-      vm = VM(self.defaults, self.machine_config, vm_config, self.wmanager)
-      self.vms.append(vm)
+  def start_vm(self, vm, vm_config):
       vm.start()
       vm.enable_hugepages()
       vm.enable_noiommu("1af4 1110")
       vm.init_interface(vm_config.vm_ip, self.defaults.vm_interface)
       vm.init_interface(vm_config.tas_tap_ip, self.defaults.tas_interface)
       vm.dpdk_bind(vm_config.tas_tap_ip, self.defaults.tas_interface,
-          self.defaults.pci_id)
\ No newline at end of file
+          self.defaults.pci_id)
+
+  def start_vms(self):
+    threads = []
+    for vm_config in self.vm_configs:
+      vm = VM(self.defaults, self.machine_config, vm_config, self.wmanager)
+      self.vms.append(vm)
+      vm_thread = threading.Thread(target=self.start_vm, args=(vm, vm_config))
+      threads.append(vm_thread)
+      vm_thread.start()
+
+    for t in threads:
+      t.join()
\ No newline at end of file
diff --git a/experiments/nodes/virt_linux/vlinux.py b/experiments/nodes/virt_linux/vlinux.py
index ff0e86cd..90d36f7f 100644
--- a/experiments/nodes/virt_linux/vlinux.py
+++ b/experiments/nodes/virt_linux/vlinux.py
@@ -1,3 +1,5 @@
+import threading
+
 from components.vm import VM
 from nodes.node import Node
 
@@ -31,9 +33,18 @@ def cleanup(self):
     for vm_config in self.vm_configs:
       self.tap_down("tap{}".format(vm_config.id), vm_config.manager_dir)
 
+  def start_vm(self, vm, vm_config):
+    vm.start()
+    vm.init_interface(vm_config.vm_ip, self.defaults.vm_interface)
+
   def start_vms(self):
+    threads = []
     for vm_config in self.vm_configs:
       vm = VM(self.defaults, self.machine_config, vm_config, self.wmanager)
       self.vms.append(vm)
-      vm.start()
-      vm.init_interface(vm_config.vm_ip, self.defaults.vm_interface)
\ No newline at end of file
+      vm_thread = threading.Thread(target=self.start_vm, args=(vm, vm_config))
+      threads.append(vm_thread)
+      vm_thread.start()
+
+    for t in threads:
+      t.join()
\ No newline at end of file
diff --git a/experiments/nodes/virt_tas/vtas.py b/experiments/nodes/virt_tas/vtas.py
index da99b830..ca3a509d 100644
--- a/experiments/nodes/virt_tas/vtas.py
+++ b/experiments/nodes/virt_tas/vtas.py
@@ -1,4 +1,5 @@
 import time
+import threading
 
 from components.vm import VM
 from components.proxy import ProxyGuest
@@ -19,12 +20,21 @@ def __init__(self, defaults, machine_config, tas_config,
     self.proxyg_configs = proxyg_configs
     self.vms = []
 
+  def start_vm(self, vm):
+    vm.start()
+    vm.enable_noiommu("1af4 1110")
+
   def start_vms(self):
+    threads = []
     for vm_config in self.vm_configs:
       vm = VM(self.defaults, self.machine_config, vm_config, self.wmanager)
       self.vms.append(vm)
-      vm.start()
-      vm.enable_noiommu("1af4 1110")
+      vm_thread = threading.Thread(target=self.start_vm, args=(vm,))
+      threads.append(vm_thread)
+      vm_thread.start()
+
+    for t in threads:
+      t.join()
 
   def start_guest_proxies(self):
     for i in range(len(self.vm_configs)):
diff --git a/images/ovstap-add.sh b/images/ovstap-add.sh
index 4212b36a..e8a62836 100644
--- a/images/ovstap-add.sh
+++ b/images/ovstap-add.sh
@@ -1,16 +1,23 @@
 #!/usr/bin/env bash
 
-if [ "$#" -ne 2 ]; then
+if [ "$#" -ne 3 ]; then
     echo "Illegal number of parameters"
     echo "usage:"
-    echo "[br_name tap_name]"
+    echo "[br_name tap_name multi_queue]"
     exit
 fi
 
 br_name=$1
 tap_name=$2
+multi_queue=$3
+
+if [ $multi_queue -eq 1 ]; then
+    sudo ip tuntap add mode tap multi_queue name $tap_name
+    echo "Set ${tap_name} for multi queue"
+else
+    ip tuntap add mode tap $tap_name
+fi
 
-ip tuntap add mode tap $tap_name
 ifconfig $tap_name up
 
 ovs-vsctl add-port $br_name $tap_name
\ No newline at end of file
diff --git a/images/start-vm.sh b/images/start-vm.sh
index 6f05763b..3ef9fc72 100755
--- a/images/start-vm.sh
+++ b/images/start-vm.sh
@@ -76,12 +76,13 @@ elif [[ "$stack" == 'ovs-tas' ]]; then
     -cpu host \
     -smp 12 \
     -m 12G \
+    -snapshot \
     -netdev user,id=net0 \
     -device virtio-net-pci,netdev=net0 \
     -netdev tap,ifname=$tap,script=no,downscript=no,vhost=on,id=net1 \
     -device virtio-net-pci,mac=$mac,netdev=net1 \
-    -netdev tap,ifname=$ovstap,script=no,downscript=no,vhost=on,id=net2 \
-    -device virtio-net-pci,mac=$alt_mac,vectors=18,mq=on,netdev=net2 \
+    -netdev tap,ifname=$ovstap,script=no,downscript=no,vhost=on,queues=10,id=net2 \
+    -device virtio-net-pci,mac=$alt_mac,vectors=18,mq=on,rss=on,hash=off,netdev=net2 \
     -drive if=virtio,format=qcow2,file="base.snapshot.qcow2" \
     -drive if=virtio,format=raw,file="seed.img" \
     ;

From d623ac8743ad45a91cb0b134e61b5c68fb6c1e6e Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Tue, 28 Mar 2023 11:41:00 +0200
Subject: [PATCH 25/50] add msize per iso tp experiment

---
 .../exps/perf_iso_tpmsize/configs/bare_tas.py |  88 +++++++++++++
 .../perf_iso_tpmsize/configs/bare_vtas.py     |  90 +++++++++++++
 .../perf_iso_tpmsize/configs/ovs_linux.py     |  96 ++++++++++++++
 .../exps/perf_iso_tpmsize/configs/ovs_tas.py  | 114 +++++++++++++++++
 .../exps/perf_iso_tpmsize/configs/virt_tas.py | 120 ++++++++++++++++++
 experiments/exps/perf_iso_tpmsize/parse.py    | 120 ++++++++++++++++++
 .../exps/perf_iso_tpmsize/perf_iso_tpmsize.py |  26 ++++
 .../exps/perf_iso_tpmsize/plot_script.plt     |  19 +++
 8 files changed, 673 insertions(+)
 create mode 100644 experiments/exps/perf_iso_tpmsize/configs/bare_tas.py
 create mode 100644 experiments/exps/perf_iso_tpmsize/configs/bare_vtas.py
 create mode 100644 experiments/exps/perf_iso_tpmsize/configs/ovs_linux.py
 create mode 100644 experiments/exps/perf_iso_tpmsize/configs/ovs_tas.py
 create mode 100644 experiments/exps/perf_iso_tpmsize/configs/virt_tas.py
 create mode 100644 experiments/exps/perf_iso_tpmsize/parse.py
 create mode 100644 experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
 create mode 100644 experiments/exps/perf_iso_tpmsize/plot_script.plt

diff --git a/experiments/exps/perf_iso_tpmsize/configs/bare_tas.py b/experiments/exps/perf_iso_tpmsize/configs/bare_tas.py
new file mode 100644
index 00000000..3ec57379
--- /dev/null
+++ b/experiments/exps/perf_iso_tpmsize/configs/bare_tas.py
@@ -0,0 +1,88 @@
+from configs.gen_config import Defaults
+from configs.gen_config import MachineConfig
+from configs.gen_config import TasConfig
+from configs.gen_config import ClientConfig
+from configs.gen_config import ServerConfig
+
+class Config:
+    def __init__(self, exp_name, msize):
+        self.exp_name = exp_name
+        self.defaults = Defaults()
+        
+        # Server Machine
+        self.sstack = 'bare-tas'
+        self.snum = 2
+        self.snodenum = 1
+        self.s_tas_configs = []
+        self.s_vm_configs = []
+        self.s_proxyg_configs = []
+        self.server_configs = []
+        
+        self.s_machine_config = MachineConfig(ip=self.defaults.server_ip, 
+                interface=self.defaults.server_interface,
+                stack=self.sstack,
+                is_remote=True,
+                is_server=True)
+
+        tas_config = TasConfig(pane=self.defaults.s_tas_pane,
+                machine_config=self.s_machine_config,
+                project_dir=self.defaults.default_otas_dir_bare,
+                ip=self.s_machine_config.ip,
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        self.s_tas_configs.append(tas_config)
+
+        server0_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=0, vmid=0,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        server1_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=1, vmid=0,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        self.server_configs.append(server0_config)
+        self.server_configs.append(server1_config)
+
+        # Client Machine
+        self.cstack = 'bare-tas'
+        self.cnum = 2
+        self.cnodenum = 1
+        self.c_tas_configs = []
+        self.c_vm_configs = []
+        self.c_proxyg_configs = []
+        self.client_configs = []
+
+        self.c_machine_config = MachineConfig(ip=self.defaults.client_ip, 
+                interface=self.defaults.client_interface,
+                stack=self.cstack,
+                is_remote=False,
+                is_server=False)
+
+        tas_config = TasConfig(pane=self.defaults.c_tas_pane,
+                machine_config=self.c_machine_config,
+                project_dir=self.defaults.default_otas_dir_bare,
+                ip=self.c_machine_config.ip,
+                n_cores=1)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        self.c_tas_configs.append(tas_config)
+
+        client0_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=0, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1234, ncores=3,
+                msize=64, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        client1_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=1, vmid=0, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
+                msize=msize, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        self.client_configs.append(client0_config)
+        self.client_configs.append(client1_config)
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_tpmsize/configs/bare_vtas.py b/experiments/exps/perf_iso_tpmsize/configs/bare_vtas.py
new file mode 100644
index 00000000..a9533f54
--- /dev/null
+++ b/experiments/exps/perf_iso_tpmsize/configs/bare_vtas.py
@@ -0,0 +1,90 @@
+from configs.gen_config import Defaults
+from configs.gen_config import MachineConfig
+from configs.gen_config import TasConfig
+from configs.gen_config import ClientConfig
+from configs.gen_config import ServerConfig
+
+class Config:
+    def __init__(self, exp_name, msize):
+        self.exp_name = exp_name
+        self.defaults = Defaults()
+        
+        # Server Machine
+        self.sstack = 'bare-tas'
+        self.snum = 2
+        self.snodenum = 1
+        self.s_tas_configs = []
+        self.s_vm_configs = []
+        self.s_proxyg_configs = []
+        self.server_configs = []
+        
+        self.s_machine_config = MachineConfig(ip=self.defaults.server_ip, 
+                interface=self.defaults.server_interface,
+                stack=self.sstack,
+                is_remote=True,
+                is_server=True)
+
+        tas_config = TasConfig(pane=self.defaults.s_tas_pane,
+                machine_config=self.s_machine_config,
+                project_dir=self.defaults.default_otas_dir_bare,
+                ip=self.s_machine_config.ip,
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        self.s_tas_configs.append(tas_config)
+
+        server0_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=0, vmid=0, groupid=0,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        server1_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=1, vmid=0, groupid=1,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+                
+        self.server_configs.append(server0_config)
+        self.server_configs.append(server1_config)
+
+        # Client Machine
+        self.cstack = 'bare-vtas'
+        self.cnum = 2
+        self.cnodenum = 1
+        self.c_tas_configs = []
+        self.c_vm_configs = []
+        self.c_proxyg_configs = []
+        self.client_configs = []
+
+        self.c_machine_config = MachineConfig(ip=self.defaults.client_ip, 
+                interface=self.defaults.client_interface,
+                stack=self.cstack,
+                is_remote=False,
+                is_server=False)
+
+        tas_config = TasConfig(pane=self.defaults.c_tas_pane,
+                machine_config=self.c_machine_config,
+                project_dir=self.defaults.default_vtas_dir_bare,
+                ip=self.c_machine_config.ip,
+                n_cores=1)
+        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
+        self.c_tas_configs.append(tas_config)
+
+        client0_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=0, groupid=0, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1234, ncores=3,
+                msize=64, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_vbenchmark_dir_bare,
+                tas_dir=self.defaults.default_vtas_dir_bare)
+        client1_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=1, vmid=0, groupid=1, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
+                msize=msize, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_vbenchmark_dir_bare,
+                tas_dir=self.defaults.default_vtas_dir_bare)
+
+        self.client_configs.append(client0_config)
+        self.client_configs.append(client1_config)
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_tpmsize/configs/ovs_linux.py b/experiments/exps/perf_iso_tpmsize/configs/ovs_linux.py
new file mode 100644
index 00000000..eafeb4d1
--- /dev/null
+++ b/experiments/exps/perf_iso_tpmsize/configs/ovs_linux.py
@@ -0,0 +1,96 @@
+from configs.gen_config import Defaults
+from configs.gen_config import MachineConfig
+from configs.gen_config import TasConfig
+from configs.gen_config import VMConfig
+from configs.gen_config import ClientConfig
+from configs.gen_config import ServerConfig
+
+class Config:
+    def __init__(self, exp_name, msize):
+        self.exp_name = exp_name
+        self.defaults = Defaults()
+        
+        # Server Machine
+        self.sstack = 'bare-tas'
+        self.snum = 2
+        self.snodenum = 1
+        self.s_tas_configs = []
+        self.s_vm_configs = []
+        self.s_proxyg_configs = []
+        self.server_configs = []
+        
+        self.s_machine_config = MachineConfig(ip=self.defaults.server_ip, 
+                interface=self.defaults.server_interface,
+                stack=self.sstack,
+                is_remote=True,
+                is_server=True)
+
+        tas_config = TasConfig(pane=self.defaults.s_tas_pane,
+                machine_config=self.s_machine_config,
+                project_dir=self.defaults.default_otas_dir_bare,
+                ip=self.s_machine_config.ip,
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        self.s_tas_configs.append(tas_config)
+
+        server0_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=0, vmid=0,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        server1_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=1, vmid=0,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        self.server_configs.append(server0_config)
+        self.server_configs.append(server1_config)
+
+        # Client Machine
+        self.cstack = 'ovs-linux'
+        self.cnum = 1
+        self.cnodenum = 2
+        self.c_tas_configs = []
+        self.c_vm_configs = []
+        self.c_proxyg_configs = []
+        self.client_configs = []
+
+        self.c_machine_config = MachineConfig(ip=self.defaults.client_ip, 
+                interface=self.defaults.client_interface,
+                stack=self.cstack,
+                is_remote=False,
+                is_server=False)
+        
+        vm0_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=0)
+        vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=1)
+
+        self.c_vm_configs.append(vm0_config)
+        self.c_vm_configs.append(vm1_config)
+
+        client0_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=0, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1234, ncores=3,
+                msize=64, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_vbenchmark_dir_virt,
+                tas_dir=self.defaults.default_vtas_dir_virt)
+        client1_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=1, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
+                msize=msize, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_obenchmark_dir_virt,
+                tas_dir=self.defaults.default_vtas_dir_virt)
+
+        self.client_configs.append(client0_config)
+        self.client_configs.append(client1_config)
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_tpmsize/configs/ovs_tas.py b/experiments/exps/perf_iso_tpmsize/configs/ovs_tas.py
new file mode 100644
index 00000000..b87e3c04
--- /dev/null
+++ b/experiments/exps/perf_iso_tpmsize/configs/ovs_tas.py
@@ -0,0 +1,114 @@
+from configs.gen_config import Defaults
+from configs.gen_config import MachineConfig
+from configs.gen_config import TasConfig
+from configs.gen_config import VMConfig
+from configs.gen_config import ClientConfig
+from configs.gen_config import ServerConfig
+
+class Config:
+    def __init__(self, exp_name, msize):
+        self.exp_name = exp_name
+        self.defaults = Defaults()
+        
+        # Server Machine
+        self.sstack = 'bare-tas'
+        self.snum = 2
+        self.snodenum = 1
+        self.s_tas_configs = []
+        self.s_vm_configs = []
+        self.s_proxyg_configs = []
+        self.server_configs = []
+        
+        self.s_machine_config = MachineConfig(ip=self.defaults.server_ip, 
+                interface=self.defaults.server_interface,
+                stack=self.sstack,
+                is_remote=True,
+                is_server=True)
+
+        tas_config = TasConfig(pane=self.defaults.s_tas_pane,
+                machine_config=self.s_machine_config,
+                project_dir=self.defaults.default_otas_dir_bare,
+                ip=self.s_machine_config.ip,
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        self.s_tas_configs.append(tas_config)
+
+        server0_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=0, vmid=0,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        server1_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=1, vmid=0,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        self.server_configs.append(server0_config)
+        self.server_configs.append(server1_config)
+
+        # Client Machine
+        self.cstack = 'ovs-tas'
+        self.cnum = 1
+        self.cnodenum = 2
+        self.c_tas_configs = []
+        self.c_vm_configs = []
+        self.c_proxyg_configs = []
+        self.client_configs = []
+
+        self.c_machine_config = MachineConfig(ip=self.defaults.client_ip, 
+                interface=self.defaults.client_interface,
+                stack=self.cstack,
+                is_remote=False,
+                is_server=False)
+
+        
+        vm0_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=0)
+        tas0_config = TasConfig(pane=self.defaults.c_tas_pane,
+                machine_config=self.c_machine_config,
+                project_dir=self.defaults.default_otas_dir_virt,
+                ip=vm0_config.tas_tap_ip,
+                n_cores=1, dpdk_extra="00:04.0")
+        tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
+        
+
+        vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=1)
+        tas1_config = TasConfig(pane=self.defaults.c_tas_pane,
+                machine_config=self.c_machine_config,
+                project_dir=self.defaults.default_otas_dir_virt,
+                ip=vm1_config.tas_tap_ip,
+                n_cores=1, dpdk_extra="00:04.0")
+        tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
+
+
+        self.c_tas_configs.append(tas0_config)
+        self.c_tas_configs.append(tas1_config)
+        self.c_vm_configs.append(vm0_config)
+        self.c_vm_configs.append(vm1_config)
+
+        client0_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=0, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1234, ncores=3,
+                msize=64, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_obenchmark_dir_virt,
+                tas_dir=self.defaults.default_otas_dir_virt)
+        client1_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=1, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
+                msize=msize, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_obenchmark_dir_virt,
+                tas_dir=self.defaults.default_otas_dir_virt)
+
+        self.client_configs.append(client0_config)
+        self.client_configs.append(client1_config)
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_tpmsize/configs/virt_tas.py b/experiments/exps/perf_iso_tpmsize/configs/virt_tas.py
new file mode 100644
index 00000000..fb0a7924
--- /dev/null
+++ b/experiments/exps/perf_iso_tpmsize/configs/virt_tas.py
@@ -0,0 +1,120 @@
+from configs.gen_config import Defaults
+from configs.gen_config import MachineConfig
+from configs.gen_config import TasConfig
+from configs.gen_config import VMConfig
+from configs.gen_config import HostProxyConfig
+from configs.gen_config import GuestProxyConfig
+from configs.gen_config import ClientConfig
+from configs.gen_config import ServerConfig
+
+class Config:
+    def __init__(self, exp_name, msize):
+        self.exp_name = exp_name
+        self.defaults = Defaults()
+        
+        # Server Machine
+        self.sstack = 'bare-tas'
+        self.snum = 2
+        self.snodenum = 1
+        self.s_tas_configs = []
+        self.s_vm_configs = []
+        self.s_proxyg_configs = []
+        self.server_configs = []
+        
+        self.s_machine_config = MachineConfig(ip=self.defaults.server_ip, 
+                interface=self.defaults.server_interface,
+                stack=self.sstack,
+                is_remote=True,
+                is_server=True)
+
+        tas_config = TasConfig(pane=self.defaults.s_tas_pane,
+                machine_config=self.s_machine_config,
+                project_dir=self.defaults.default_otas_dir_bare,
+                ip=self.s_machine_config.ip,
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        self.s_tas_configs.append(tas_config)
+
+        server0_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=0, vmid=0,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        server1_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=1, vmid=0,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        self.server_configs.append(server0_config)
+        self.server_configs.append(server1_config)
+
+        # Client Machine
+        self.cstack = 'virt-tas'
+        self.cnum = 1
+        self.cnodenum = 2
+        self.c_tas_configs = []
+        self.c_vm_configs = []
+        self.c_proxyg_configs = []
+        self.client_configs = []
+
+        self.c_machine_config = MachineConfig(ip=self.defaults.client_ip, 
+                interface=self.defaults.client_interface,
+                stack=self.cstack,
+                is_remote=False,
+                is_server=False)
+
+        tas_config = TasConfig(pane=self.defaults.c_tas_pane,
+                machine_config=self.c_machine_config,
+                project_dir=self.defaults.default_vtas_dir_bare,
+                ip=self.c_machine_config.ip,
+                n_cores=1)
+        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
+        self.c_tas_configs.append(tas_config)
+
+        self.c_proxyh_config = HostProxyConfig(pane=self.defaults.c_proxyh_pane,
+                machine_config=self.c_machine_config,
+                comp_dir=self.defaults.default_vtas_dir_bare)
+        
+        vm0_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=0)
+        vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=1)
+
+        self.c_vm_configs.append(vm0_config)
+        self.c_vm_configs.append(vm1_config)
+
+        proxyg0_config = GuestProxyConfig(pane=self.defaults.c_proxyg_pane,
+                    machine_config=self.c_machine_config,
+                    comp_dir=self.defaults.default_vtas_dir_virt)
+        proxyg1_config = GuestProxyConfig(pane=self.defaults.c_proxyg_pane,
+                    machine_config=self.c_machine_config,
+                    comp_dir=self.defaults.default_vtas_dir_virt)
+        
+        self.c_proxyg_configs.append(proxyg0_config)
+        self.c_proxyg_configs.append(proxyg1_config)
+
+        client0_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=0, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1234, ncores=3,
+                msize=64, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_vbenchmark_dir_virt,
+                tas_dir=self.defaults.default_vtas_dir_virt)
+        client1_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=1, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
+                msize=msize, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_vbenchmark_dir_virt,
+                tas_dir=self.defaults.default_vtas_dir_virt)
+
+        self.client_configs.append(client0_config)
+        self.client_configs.append(client1_config)
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_tpmsize/parse.py b/experiments/exps/perf_iso_tpmsize/parse.py
new file mode 100644
index 00000000..0644f600
--- /dev/null
+++ b/experiments/exps/perf_iso_tpmsize/parse.py
@@ -0,0 +1,120 @@
+import sys
+sys.path.append("../../../")
+
+import os
+import re
+import experiments.plot_utils as putils
+
+
+# For this experiment get the message size
+# from the experiment name, since client 0 and client 1
+# have different message sizes
+def get_msize(fname):
+  regex = "(?<=_msize)[0-9]*"
+  msize = re.search(regex, fname).group(0)
+  return msize
+
+def check_msize(data, msize):
+  if msize not in data:
+    data[msize] = {}
+
+def check_stack(data, msize, stack):
+  if stack not in data[msize]:
+    data[msize][stack] = {}
+
+def check_nid(data, msize, stack, nid):
+  if nid not in data[msize][stack]:
+    data[msize][stack][nid] = {}
+
+def check_cid(data, msize, stack, nid, cid):
+  if cid not in data[msize][stack][nid]:
+    data[msize][stack][nid][cid] = ""
+
+def get_avg_tp(fname_c0, fname_c1):
+  n_messages = 0
+  n = 0
+
+  f = open(fname_c0)
+  lines = f.readlines()
+
+  c1_first_ts = putils.get_first_ts(fname_c1)
+  idx, _ = putils.get_min_idx(fname_c0, c1_first_ts)
+
+  first_line = lines[idx]
+  last_line = lines[len(lines) - 1]
+
+  n_messages = int(putils.get_n_messages(last_line)) - \
+      int(putils.get_n_messages(first_line))
+  msize = int(putils.get_msize(fname_c0))
+  n = len(lines) - idx
+
+  return str((n_messages * msize * 8 / n) / 1000000)
+
+def parse_metadata():
+  dir_path = "./out/"
+  data = {}
+
+  for f in os.listdir(dir_path):
+    fname = os.fsdecode(f)
+
+    if "tas_c" == fname:
+      continue
+
+    msize = get_msize(fname)
+    cid = putils.get_client_id(fname)
+    nid = putils.get_node_id(fname)
+    stack = putils.get_stack(fname)
+
+    check_msize(data, msize)
+    check_stack(data, msize, stack)
+    check_nid(data, msize, stack, nid)
+    check_cid(data, msize, stack, nid, cid)
+
+    data[msize][stack][nid][cid] = fname
+
+  return data
+
+def parse_data(parsed_md):
+  tp = []
+  out_dir = "./out/"
+  for msize in parsed_md:
+    data_point = {"msize": msize}
+    for stack in parsed_md[msize]:
+      is_virt = stack == "virt-tas" or stack == "ovs-tas" or stack == "ovs-linux"
+      if is_virt:
+        c0_fname = out_dir + parsed_md[msize][stack]["0"]["0"]
+        c1_fname = out_dir + parsed_md[msize][stack]["1"]["0"]
+      else:
+        c0_fname = out_dir + parsed_md[msize][stack]["0"]["0"]
+        c1_fname = out_dir + parsed_md[msize][stack]["0"]["1"]
+
+      avg_tp = get_avg_tp(c0_fname, c1_fname)
+
+      data_point[stack] = avg_tp
+  
+    tp.append(data_point)
+  
+  tp = sorted(tp, key=lambda d: int(d['msize']))
+  return tp
+
+def save_dat_file(avg_tps, fname):
+  f = open(fname, "w+")
+  header = "msize bare-tas bare-vtas virt-tas ovs-linux ovs-tas\n"
+  f.write(header)
+  for tp in avg_tps:
+    f.write("{} {} {} {}\n".format(
+      tp["msize"],
+      tp["bare-tas"],
+      tp["bare-vtas"],
+      tp["virt-tas"],
+      tp["ovs-linux"],
+      tp["ovs-tas"]
+    ))
+        
+def main():
+  parsed_md = parse_metadata()
+  avg_tps = parse_data(parsed_md)
+  save_dat_file(avg_tps, "./tp.dat")
+
+if __name__ == '__main__':
+  main()
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py b/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
new file mode 100644
index 00000000..76dce259
--- /dev/null
+++ b/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
@@ -0,0 +1,26 @@
+import experiments as exp
+
+from exps.perf_iso_tpconn.configs.bare_tas import Config as TasBareConf
+from exps.perf_iso_tpconn.configs.bare_vtas import Config as VTasBareConf
+from exps.perf_iso_tpconn.configs.virt_tas import Config as TasVirtConf
+from exps.perf_iso_tpconn.configs.ovs_linux import Config as OVSLinuxConf
+from exps.perf_iso_tpconn.configs.ovs_tas import Config as OVSTasConf
+
+experiments = []
+
+msize = [64, 128, 256, 512, 1024, 2048]
+
+for n in msize:
+  exp_name = "perf-iso-tpconn_msize{}_".format(n)
+  tas_bare_exp = exp.Experiment(TasBareConf(exp_name + "bare-tas", n), name=exp_name)
+  vtas_bare_exp = exp.Experiment(VTasBareConf(exp_name + "bare-vtas", n), name=exp_name)
+  tas_virt_exp = exp.Experiment(TasVirtConf(exp_name + "virt-tas", n), name=exp_name)
+  ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n), name=exp_name)
+  ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n), name=exp_name)
+
+  experiments.append(tas_bare_exp)
+  experiments.append(vtas_bare_exp)
+  experiments.append(tas_virt_exp)
+  experiments.append(ovs_tas_exp)
+  experiments.append(ovs_linux_exp)
+  
diff --git a/experiments/exps/perf_iso_tpmsize/plot_script.plt b/experiments/exps/perf_iso_tpmsize/plot_script.plt
new file mode 100644
index 00000000..3f0b151c
--- /dev/null
+++ b/experiments/exps/perf_iso_tpmsize/plot_script.plt
@@ -0,0 +1,19 @@
+#!/usr/bin/gnuplot -persist
+set terminal pdf
+set output "plot.pdf"
+set colorsequence podo
+set key autotitle columnhead
+set key left top
+set logscale x 2
+set bmargin 4
+              
+set key left bottom
+set label 1 "Aggressor Client Message Size" at screen 0.5, 0.03 center
+set label 2 "Victim Client Throughput (Mbps)" at screen 0.01, 0.5 rotate by 90 center
+
+set yrange [0:]
+plot 'tp.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 w lp, \
+     'tp.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 w lp, \
+     'tp.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 w lp, \
+     'tp.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 4 w lp, \
+     'tp.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 4 w lp, \

From e214b8450445387e35aa7c70d0dc964e5b64a564 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Wed, 29 Mar 2023 17:21:58 +0200
Subject: [PATCH 26/50] update experiment, parset and gnuplot script for
 latency experiment and msize experiment

---
 experiments/components/client.py              |  12 +-
 experiments/components/tas.py                 |   4 +-
 experiments/components/vm.py                  |   3 +-
 .../exps/perf_iso_latconn/configs/bare_tas.py |  10 +-
 .../perf_iso_latconn/configs/bare_vtas.py     |  27 +++--
 .../perf_iso_latconn/configs/ovs_linux.py     |  96 +++++++++++++++
 .../exps/perf_iso_latconn/configs/ovs_tas.py  | 114 ++++++++++++++++++
 .../exps/perf_iso_latconn/configs/virt_tas.py |  57 +++------
 experiments/exps/perf_iso_latconn/parse.py    |  16 ++-
 .../exps/perf_iso_latconn/perf_iso_latconn.py |  14 ++-
 experiments/exps/perf_iso_latconn/plot.pdf    | Bin 10896 -> 0 bytes
 experiments/exps/perf_iso_latconn/plot_script |  48 +++++---
 .../perf_iso_latmsize/configs/bare_tas.py     |  14 ++-
 .../perf_iso_latmsize/configs/bare_vtas.py    |  31 ++---
 .../perf_iso_latmsize/configs/ovs_linux.py    |  96 +++++++++++++++
 .../exps/perf_iso_latmsize/configs/ovs_tas.py | 114 ++++++++++++++++++
 .../perf_iso_latmsize/configs/virt_tas.py     |  61 +++-------
 experiments/exps/perf_iso_latmsize/parse.py   |  10 +-
 .../perf_iso_latmsize/perf_iso_latmsize.py    |  14 ++-
 .../exps/perf_iso_latmsize/plot_script        |  24 ++--
 .../exps/perf_iso_tpconn/configs/bare_vtas.py |   4 +-
 .../exps/perf_iso_tpconn/configs/ovs_linux.py |   4 +-
 .../exps/perf_iso_tpconn/configs/ovs_tas.py   |   4 +-
 .../exps/perf_iso_tpconn/configs/virt_tas.py  |   4 +-
 experiments/exps/perf_iso_tpconn/parse.py     |   4 +-
 .../exps/perf_iso_tpconn/perf_iso_tpconn.py   |  10 +-
 experiments/exps/perf_iso_tpconn/plot.pdf     | Bin 10385 -> 10765 bytes
 .../exps/perf_iso_tpconn/plot_script.plt      |   9 +-
 experiments/exps/perf_iso_tpmsize/parse.py    |   4 +-
 .../exps/perf_iso_tpmsize/perf_iso_tpmsize.py |  23 ++--
 .../exps/perf_iso_tpmsize/plot_script.plt     |   9 +-
 images/start-vm.sh                            |  11 +-
 32 files changed, 636 insertions(+), 215 deletions(-)
 create mode 100644 experiments/exps/perf_iso_latconn/configs/ovs_linux.py
 create mode 100644 experiments/exps/perf_iso_latconn/configs/ovs_tas.py
 delete mode 100644 experiments/exps/perf_iso_latconn/plot.pdf
 create mode 100644 experiments/exps/perf_iso_latmsize/configs/ovs_linux.py
 create mode 100644 experiments/exps/perf_iso_latmsize/configs/ovs_tas.py

diff --git a/experiments/components/client.py b/experiments/components/client.py
index 09cee174..d4cdbd78 100644
--- a/experiments/components/client.py
+++ b/experiments/components/client.py
@@ -24,6 +24,7 @@ def run_virt(self, w_sudo, ld_preload):
         self.pane.send_keys(ssh_com)
         time.sleep(3)
         self.pane.send_keys("tas")
+        time.sleep(3)
         self.run_benchmark_rpc(w_sudo, ld_preload)
 
     def run_benchmark_rpc(self, w_sudo, ld_preload):
@@ -65,6 +66,14 @@ def save_log_virt(self, exp_path):
         self.save_logs_pane.send_keys(suppress_history=False, cmd='tas')
         time.sleep(1)
 
+        # Remove log from remote machine
+        ssh_com = utils.get_ssh_command(self.machine_config, self.vm_config)
+        ssh_com += " 'rm {}'".format(self.client_config.out)
+        self.save_logs_pane.send_keys(ssh_com)
+        time.sleep(3)
+        self.save_logs_pane.send_keys(suppress_history=False, cmd='tas')
+        time.sleep(1)
+
     def save_log_bare(self, exp_path):
         # self.exp_path is set in the run.py file
         split_path = exp_path.split("/")
@@ -75,4 +84,5 @@ def save_log_bare(self, exp_path):
             os.makedirs(out_dir)
 
         dest = out_dir + "/" + self.client_config.out_file
-        os.rename(self.client_config.out, dest)
\ No newline at end of file
+        os.rename(self.client_config.out, dest)
+        os.remove(self.client_config.out)
\ No newline at end of file
diff --git a/experiments/components/tas.py b/experiments/components/tas.py
index 8fe9bb33..834a8a1c 100644
--- a/experiments/components/tas.py
+++ b/experiments/components/tas.py
@@ -29,6 +29,7 @@ def run_virt(self):
         self.pane.send_keys(ssh_com)
         time.sleep(3)
         self.pane.send_keys("tas")
+        time.sleep(3)
         
         tas_args = self.tas_config.args
         utils.compile_and_run(pane=self.pane,
@@ -48,4 +49,5 @@ def save_log_bare(self, exp_path):
             os.makedirs(out_dir)
 
         dest = out_dir + "/" + self.tas_config.out_file
-        os.rename(self.tas_config.out, dest)
\ No newline at end of file
+        os.rename(self.tas_config.out, dest)
+        os.remove(self.client_config.out)
\ No newline at end of file
diff --git a/experiments/components/vm.py b/experiments/components/vm.py
index 1091c993..791a9235 100644
--- a/experiments/components/vm.py
+++ b/experiments/components/vm.py
@@ -23,9 +23,10 @@ def start(self):
     def enable_hugepages(self):
         cmd = "sudo mount -t hugetlbfs nodev /dev/hugepages"
         self.pane.send_keys(cmd)
+        time.sleep(1)
         cmd = "echo 8192 | sudo tee /sys/devices/system/node/node*/hugepages/hugepages-2048kB/nr_hugepages"
         self.pane.send_keys(cmd)
-        time.sleep(3)
+        time.sleep(5)
 
     def enable_noiommu(self, vendor_id):
         self.pane.send_keys("sudo su -")
diff --git a/experiments/exps/perf_iso_latconn/configs/bare_tas.py b/experiments/exps/perf_iso_latconn/configs/bare_tas.py
index cde50db2..d69c2dfa 100644
--- a/experiments/exps/perf_iso_latconn/configs/bare_tas.py
+++ b/experiments/exps/perf_iso_latconn/configs/bare_tas.py
@@ -28,17 +28,18 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=8)
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=4, max_flows=1024, max_bytes=1024,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=4, max_flows=1024, max_bytes=1024,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -64,6 +65,7 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
         self.c_tas_configs.append(tas_config)
 
         client0_config = ClientConfig(exp_name=exp_name, 
@@ -77,7 +79,7 @@ def __init__(self, exp_name, nconns):
         client1_config = ClientConfig(exp_name=exp_name, 
                 pane=self.defaults.c_client_pane,
                 idx=1, vmid=0, stack=self.cstack,
-                ip=self.defaults.server_ip, port=1235, ncores=1,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
                 msize=64, mpending=64, nconns=nconns,
                 open_delay=15, max_msgs_conn=0, max_pend_conns=1,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
diff --git a/experiments/exps/perf_iso_latconn/configs/bare_vtas.py b/experiments/exps/perf_iso_latconn/configs/bare_vtas.py
index f848e124..da7570a4 100644
--- a/experiments/exps/perf_iso_latconn/configs/bare_vtas.py
+++ b/experiments/exps/perf_iso_latconn/configs/bare_vtas.py
@@ -10,7 +10,7 @@ def __init__(self, exp_name, nconns):
         self.defaults = Defaults()
         
         # Server Machine
-        self.sstack = 'bare-vtas'
+        self.sstack = 'bare-tas'
         self.snum = 2
         self.snodenum = 1
         self.s_tas_configs = []
@@ -26,22 +26,22 @@ def __init__(self, exp_name, nconns):
 
         tas_config = TasConfig(pane=self.defaults.s_tas_pane,
                 machine_config=self.s_machine_config,
-                project_dir=self.defaults.default_vtas_dir_bare,
+                project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=8)
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
-                idx=0, vmid=0, groupid=0,
-                port=1234, ncores=4, max_flows=1024, max_bytes=1024,
-                bench_dir=self.defaults.default_vbenchmark_dir_bare,
-                tas_dir=self.defaults.default_vtas_dir_bare)
+                idx=0, vmid=0,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
-                idx=1, vmid=0, groupid=1,
-                port=1235, ncores=4, max_flows=1024, max_bytes=1024,
-                bench_dir=self.defaults.default_vbenchmark_dir_bare,
-                tas_dir=self.defaults.default_vtas_dir_bare)
-
+                idx=1, vmid=0,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
         self.server_configs.append(server1_config)
 
@@ -65,6 +65,7 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_vtas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
+        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
         self.c_tas_configs.append(tas_config)
 
         client0_config = ClientConfig(exp_name=exp_name, 
@@ -78,7 +79,7 @@ def __init__(self, exp_name, nconns):
         client1_config = ClientConfig(exp_name=exp_name, 
                 pane=self.defaults.c_client_pane,
                 idx=1, vmid=0, groupid=1, stack=self.cstack,
-                ip=self.defaults.server_ip, port=1235, ncores=1,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
                 msize=64, mpending=64, nconns=nconns,
                 open_delay=15, max_msgs_conn=0, max_pend_conns=1,
                 bench_dir=self.defaults.default_vbenchmark_dir_bare,
diff --git a/experiments/exps/perf_iso_latconn/configs/ovs_linux.py b/experiments/exps/perf_iso_latconn/configs/ovs_linux.py
new file mode 100644
index 00000000..19545cd7
--- /dev/null
+++ b/experiments/exps/perf_iso_latconn/configs/ovs_linux.py
@@ -0,0 +1,96 @@
+from configs.gen_config import Defaults
+from configs.gen_config import MachineConfig
+from configs.gen_config import TasConfig
+from configs.gen_config import VMConfig
+from configs.gen_config import ClientConfig
+from configs.gen_config import ServerConfig
+
+class Config:
+    def __init__(self, exp_name, nconns):
+        self.exp_name = exp_name
+        self.defaults = Defaults()
+        
+        # Server Machine
+        self.sstack = 'bare-tas'
+        self.snum = 2
+        self.snodenum = 1
+        self.s_tas_configs = []
+        self.s_vm_configs = []
+        self.s_proxyg_configs = []
+        self.server_configs = []
+        
+        self.s_machine_config = MachineConfig(ip=self.defaults.server_ip, 
+                interface=self.defaults.server_interface,
+                stack=self.sstack,
+                is_remote=True,
+                is_server=True)
+
+        tas_config = TasConfig(pane=self.defaults.s_tas_pane,
+                machine_config=self.s_machine_config,
+                project_dir=self.defaults.default_otas_dir_bare,
+                ip=self.s_machine_config.ip,
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        self.s_tas_configs.append(tas_config)
+
+        server0_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=0, vmid=0,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        server1_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=1, vmid=0,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        self.server_configs.append(server0_config)
+        self.server_configs.append(server1_config)
+
+        # Client Machine
+        self.cstack = 'ovs-linux'
+        self.cnum = 1
+        self.cnodenum = 2
+        self.c_tas_configs = []
+        self.c_vm_configs = []
+        self.c_proxyg_configs = []
+        self.client_configs = []
+
+        self.c_machine_config = MachineConfig(ip=self.defaults.client_ip, 
+                interface=self.defaults.client_interface,
+                stack=self.cstack,
+                is_remote=False,
+                is_server=False)
+        
+        vm0_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=0)
+        vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=1)
+
+        self.c_vm_configs.append(vm0_config)
+        self.c_vm_configs.append(vm1_config)
+
+        client0_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=0, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1234, ncores=3,
+                msize=64, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_vbenchmark_dir_virt,
+                tas_dir=self.defaults.default_vtas_dir_virt)
+        client1_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=1, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
+                msize=64, mpending=64, nconns=nconns,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_obenchmark_dir_virt,
+                tas_dir=self.defaults.default_vtas_dir_virt)
+
+        self.client_configs.append(client0_config)
+        self.client_configs.append(client1_config)
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_latconn/configs/ovs_tas.py b/experiments/exps/perf_iso_latconn/configs/ovs_tas.py
new file mode 100644
index 00000000..fe194204
--- /dev/null
+++ b/experiments/exps/perf_iso_latconn/configs/ovs_tas.py
@@ -0,0 +1,114 @@
+from configs.gen_config import Defaults
+from configs.gen_config import MachineConfig
+from configs.gen_config import TasConfig
+from configs.gen_config import VMConfig
+from configs.gen_config import ClientConfig
+from configs.gen_config import ServerConfig
+
+class Config:
+    def __init__(self, exp_name, nconns):
+        self.exp_name = exp_name
+        self.defaults = Defaults()
+        
+        # Server Machine
+        self.sstack = 'bare-tas'
+        self.snum = 2
+        self.snodenum = 1
+        self.s_tas_configs = []
+        self.s_vm_configs = []
+        self.s_proxyg_configs = []
+        self.server_configs = []
+        
+        self.s_machine_config = MachineConfig(ip=self.defaults.server_ip, 
+                interface=self.defaults.server_interface,
+                stack=self.sstack,
+                is_remote=True,
+                is_server=True)
+
+        tas_config = TasConfig(pane=self.defaults.s_tas_pane,
+                machine_config=self.s_machine_config,
+                project_dir=self.defaults.default_otas_dir_bare,
+                ip=self.s_machine_config.ip,
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        self.s_tas_configs.append(tas_config)
+
+        server0_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=0, vmid=0,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        server1_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=1, vmid=0,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        self.server_configs.append(server0_config)
+        self.server_configs.append(server1_config)
+
+        # Client Machine
+        self.cstack = 'ovs-tas'
+        self.cnum = 1
+        self.cnodenum = 2
+        self.c_tas_configs = []
+        self.c_vm_configs = []
+        self.c_proxyg_configs = []
+        self.client_configs = []
+
+        self.c_machine_config = MachineConfig(ip=self.defaults.client_ip, 
+                interface=self.defaults.client_interface,
+                stack=self.cstack,
+                is_remote=False,
+                is_server=False)
+
+        
+        vm0_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=0)
+        tas0_config = TasConfig(pane=self.defaults.c_tas_pane,
+                machine_config=self.c_machine_config,
+                project_dir=self.defaults.default_otas_dir_virt,
+                ip=vm0_config.tas_tap_ip,
+                n_cores=1, dpdk_extra="00:04.0")
+        tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
+        
+
+        vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=1)
+        tas1_config = TasConfig(pane=self.defaults.c_tas_pane,
+                machine_config=self.c_machine_config,
+                project_dir=self.defaults.default_otas_dir_virt,
+                ip=vm1_config.tas_tap_ip,
+                n_cores=1, dpdk_extra="00:04.0")
+        tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
+
+
+        self.c_tas_configs.append(tas0_config)
+        self.c_tas_configs.append(tas1_config)
+        self.c_vm_configs.append(vm0_config)
+        self.c_vm_configs.append(vm1_config)
+
+        client0_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=0, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1234, ncores=3,
+                msize=64, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_obenchmark_dir_virt,
+                tas_dir=self.defaults.default_otas_dir_virt)
+        client1_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=1, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
+                msize=64, mpending=64, nconns=nconns,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_obenchmark_dir_virt,
+                tas_dir=self.defaults.default_otas_dir_virt)
+
+        self.client_configs.append(client0_config)
+        self.client_configs.append(client1_config)
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_latconn/configs/virt_tas.py b/experiments/exps/perf_iso_latconn/configs/virt_tas.py
index bc4e932a..0fcff46e 100644
--- a/experiments/exps/perf_iso_latconn/configs/virt_tas.py
+++ b/experiments/exps/perf_iso_latconn/configs/virt_tas.py
@@ -13,9 +13,9 @@ def __init__(self, exp_name, nconns):
         self.defaults = Defaults()
         
         # Server Machine
-        self.sstack = 'virt-tas'
-        self.snum = 1
-        self.snodenum = 2
+        self.sstack = 'bare-tas'
+        self.snum = 2
+        self.snodenum = 1
         self.s_tas_configs = []
         self.s_vm_configs = []
         self.s_proxyg_configs = []
@@ -29,50 +29,22 @@ def __init__(self, exp_name, nconns):
 
         tas_config = TasConfig(pane=self.defaults.s_tas_pane,
                 machine_config=self.s_machine_config,
-                project_dir=self.defaults.default_vtas_dir_bare,
+                project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=8)
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
         self.s_tas_configs.append(tas_config)
 
-        self.s_proxyh_config = HostProxyConfig(pane=self.defaults.s_proxyh_pane,
-                machine_config=self.s_machine_config,
-                comp_dir=self.defaults.default_vtas_dir_bare)
-        
-        vm0_config = VMConfig(pane=self.defaults.s_vm_pane,
-                machine_config=self.s_machine_config,
-                tas_dir=self.defaults.default_vtas_dir_bare,
-                tas_dir_virt=self.defaults.default_vtas_dir_virt,
-                idx=0)
-        vm1_config = VMConfig(pane=self.defaults.s_vm_pane,
-                machine_config=self.s_machine_config,
-                tas_dir=self.defaults.default_vtas_dir_bare,
-                tas_dir_virt=self.defaults.default_vtas_dir_virt,
-                idx=1)
-        
-        self.s_vm_configs.append(vm0_config)
-        self.s_vm_configs.append(vm1_config)
-
-        proxyg0_config = GuestProxyConfig(pane=self.defaults.s_proxyg_pane,
-                machine_config=self.s_machine_config,
-                comp_dir=self.defaults.default_vtas_dir_virt)
-        proxyg1_config = GuestProxyConfig(pane=self.defaults.s_proxyg_pane,
-                machine_config=self.s_machine_config,
-                comp_dir=self.defaults.default_vtas_dir_virt)
-        
-        self.s_proxyg_configs.append(proxyg0_config)
-        self.s_proxyg_configs.append(proxyg1_config)
-
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=4, max_flows=1024, max_bytes=1024,
-                bench_dir=self.defaults.default_vbenchmark_dir_virt,
-                tas_dir=self.defaults.default_vtas_dir_virt)
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
-                idx=0, vmid=1,
-                port=1235, ncores=4, max_flows=1024, max_bytes=1024,
-                bench_dir=self.defaults.default_vbenchmark_dir_virt,
-                tas_dir=self.defaults.default_vtas_dir_virt)
-
+                idx=1, vmid=0,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
         self.server_configs.append(server1_config)
 
@@ -96,6 +68,7 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_vtas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
+        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
         self.c_tas_configs.append(tas_config)
 
         self.c_proxyh_config = HostProxyConfig(pane=self.defaults.c_proxyh_pane,
@@ -137,7 +110,7 @@ def __init__(self, exp_name, nconns):
         client1_config = ClientConfig(exp_name=exp_name, 
                 pane=self.defaults.c_client_pane,
                 idx=0, vmid=1, stack=self.cstack,
-                ip=self.defaults.server_ip, port=1235, ncores=1,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
                 msize=64, mpending=64, nconns=nconns,
                 open_delay=15, max_msgs_conn=0, max_pend_conns=1,
                 bench_dir=self.defaults.default_vbenchmark_dir_virt,
diff --git a/experiments/exps/perf_iso_latconn/parse.py b/experiments/exps/perf_iso_latconn/parse.py
index e11d8eb3..66fd9e29 100644
--- a/experiments/exps/perf_iso_latconn/parse.py
+++ b/experiments/exps/perf_iso_latconn/parse.py
@@ -11,7 +11,7 @@
 # from the experiment name, since client 0 and client 1
 # have a different number of connections
 def get_conns(fname):
-  regex = "(?<=_conns)[0-9]*"
+  regex = "(?<=-conns)[0-9]*"
   nconns = re.search(regex, fname).group(0)
   return nconns
 
@@ -53,6 +53,10 @@ def parse_metadata():
 
   for f in os.listdir(dir_path):
     fname = os.fsdecode(f)
+
+    if "tas_c" == fname:
+      continue
+
     nconns = get_conns(fname)
     cid = putils.get_client_id(fname)
     nid = putils.get_node_id(fname)
@@ -82,10 +86,10 @@ def parse_data(parsed_md):
   return lat_list
 
 def save_dat_file(exp_lats):
-  header = "nconns bare-tas bare-vtas virt-tas\n"
+  header = "nconns bare-tas bare-vtas virt-tas ovs-linux ovs-tas\n"
   
   nconns = list(exp_lats.keys())
-  nconns = sorted(nconns) 
+  nconns = list(map(str, sorted(map(int, nconns))))
   stacks =  list(exp_lats[nconns[0]].keys())
   percentiles =  list(exp_lats[nconns[0]][stacks[0]].keys())
 
@@ -95,11 +99,13 @@ def save_dat_file(exp_lats):
       f.write(header)
 
       for nconn in nconns:
-        f.write("{} {} {} {}\n".format(
+        f.write("{} {} {} {} {} {}\n".format(
           nconn,
           exp_lats[nconn]['bare-tas'][percentile],
           exp_lats[nconn]['bare-vtas'][percentile],
-          exp_lats[nconn]['virt-tas'][percentile])
+          exp_lats[nconn]['virt-tas'][percentile],
+          exp_lats[nconn]['ovs-linux'][percentile],
+          exp_lats[nconn]['ovs-tas'][percentile])
         )
         
 def main():
diff --git a/experiments/exps/perf_iso_latconn/perf_iso_latconn.py b/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
index fba71445..d1291b9c 100644
--- a/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
+++ b/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
@@ -3,18 +3,24 @@
 from exps.perf_iso_latconn.configs.bare_tas import Config as TasBareConf
 from exps.perf_iso_latconn.configs.bare_vtas import Config as VTasBareConf
 from exps.perf_iso_latconn.configs.virt_tas import Config as TasVirtConf
+from exps.perf_iso_latconn.configs.ovs_linux import Config as OVSLinuxConf
+from exps.perf_iso_latconn.configs.ovs_tas import Config as OVSTasConf
 
 experiments = []
 
-n_conns = [64, 128, 256, 512, 1024, 2048, 4096]
+n_conns = [128, 256, 512, 1024, 2048, 4096, 8192]
 
 for n in n_conns:
-  exp_name = "perf-iso-latconn_conns{}_".format(n)
+  exp_name = "perf-iso-latconn-conns{}_".format(n)
   tas_bare_exp = exp.Experiment(TasBareConf(exp_name + "bare-tas", n), name=exp_name)
   vtas_bare_exp = exp.Experiment(VTasBareConf(exp_name + "bare-vtas", n), name=exp_name)
   tas_virt_exp = exp.Experiment(TasVirtConf(exp_name + "virt-tas", n), name=exp_name)
+  ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n), name=exp_name)
+  ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n), name=exp_name)
 
   experiments.append(tas_bare_exp)
-  experiments.append(vtas_bare_exp)
-  experiments.append(tas_virt_exp)
+  # experiments.append(vtas_bare_exp)
+  # experiments.append(tas_virt_exp)
+  # experiments.append(ovs_tas_exp)
+  # experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/perf_iso_latconn/plot.pdf b/experiments/exps/perf_iso_latconn/plot.pdf
deleted file mode 100644
index 178aa312f15286f41ce96a44ff9566947e59ea16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10896
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
bt&86$0-$z?U)}`)dAT4s3=C4r(m4Mg#R*!y

diff --git a/experiments/exps/perf_iso_latconn/plot_script b/experiments/exps/perf_iso_latconn/plot_script
index aa050711..b93692b7 100644
--- a/experiments/exps/perf_iso_latconn/plot_script
+++ b/experiments/exps/perf_iso_latconn/plot_script
@@ -2,8 +2,12 @@
 set terminal pdf
 set output "plot.pdf"
 set colorsequence podo
+set logscale x 2
 set key autotitle columnhead
-set key left top
+
+set title font "Computer Modern Roman,6"
+set key font "Computer Modern Roman,6"
+set ytics font "Computer Modern Roman,6"
 
 # margins: left,right,bottom,top
 # spacing: xspacing,yspacing
@@ -11,8 +15,8 @@ set multiplot layout 2,2 \
               margins 0.1,0.95,0.15,0.90 \
               spacing 0.1,0.07
               
-set label 1 "Aggresor Client # Connections" at screen 0.5, 0.03 center
-set label 2 "Victim Client Latency (µs)" at screen 0.01, 0.5 rotate by 90 center
+set label 1 "Aggresor Client # Connections" at screen 0.5, 0.03 center font "Computer Modern Roman,8"
+set label 2 "Victim Client Latency (µs)" at screen 0.01, 0.5 rotate by 90 center font "Computer Modern Roman,8"
 
 set title offset 0,-0.6
 
@@ -20,30 +24,44 @@ set title offset 0,-0.6
 unset xtics
 set yrange [0:]
 set title "50p Latency"
-plot 'lat_50p.dat' using 1:2 title 'bare-tas' linetype 2 w lp, \
-     'lat_50p.dat' using 1:3 title 'bare-vtas' linetype 3 w lp, \
-     'lat_50p.dat' using 1:4 title 'virt-tas' linetype 4 w lp, \
+set key center right
+plot 'lat_50p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
+     'lat_50p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
+     'lat_50p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_50p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
+     'lat_50p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
 
 # Plot 90p latency
 unset xtics
 set yrange [0:]
 set title "90p Latency"
-plot 'lat_90p.dat' using 1:2 title 'bare-tas' linetype 2 w lp, \
-     'lat_90p.dat' using 1:3 title 'bare-vtas' linetype 3 w lp, \
-     'lat_90p.dat' using 1:4 title 'virt-tas' linetype 4 w lp, \
+set key center right
+plot 'lat_90p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
+     'lat_90p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
+     'lat_90p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_90p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
+     'lat_90p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
 
 # Plot 99p latency
 set xtics
+set xtics font "Computer Modern Roman,6"
 set yrange [0:]
 set title "99p Latency"
-plot 'lat_99p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 w lp, \
-     'lat_99p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 w lp, \
-     'lat_99p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 w lp, \
+set key center right
+plot 'lat_99p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
+     'lat_99p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
+     'lat_99p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_99p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
+     'lat_99p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
 
 # Plot 99.9p latency
 set xtics
+set xtics font "Computer Modern Roman,6"
 set yrange [0:]
 set title "99.9p Latency"
-plot 'lat_99.9p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 w lp, \
-     'lat_99.9p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 w lp, \
-     'lat_99.9p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 w lp, \
+set key left top
+plot 'lat_99.9p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
+     'lat_99.9p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
+     'lat_99.9p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_99.9p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
+     'lat_99.9p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
diff --git a/experiments/exps/perf_iso_latmsize/configs/bare_tas.py b/experiments/exps/perf_iso_latmsize/configs/bare_tas.py
index fe57edde..b40c9f2f 100644
--- a/experiments/exps/perf_iso_latmsize/configs/bare_tas.py
+++ b/experiments/exps/perf_iso_latmsize/configs/bare_tas.py
@@ -28,17 +28,18 @@ def __init__(self, exp_name, msize):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=8)
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=4, max_flows=1024, max_bytes=4096,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=4, max_flows=1024, max_bytes=4096,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -64,21 +65,22 @@ def __init__(self, exp_name, msize):
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
         self.c_tas_configs.append(tas_config)
 
         client0_config = ClientConfig(exp_name=exp_name, 
                 pane=self.defaults.c_client_pane,
                 idx=0, vmid=0, stack=self.cstack,
                 ip=self.defaults.server_ip, port=1234, ncores=1,
-                msize=msize, mpending=64, nconns=1,
+                msize=64, mpending=64, nconns=1,
                 open_delay=15, max_msgs_conn=0, max_pend_conns=1,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         client1_config = ClientConfig(exp_name=exp_name, 
                 pane=self.defaults.c_client_pane,
                 idx=1, vmid=0, stack=self.cstack,
-                ip=self.defaults.server_ip, port=1235, ncores=1,
-                msize=msize, mpending=64, nconns=1,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
+                msize=msize, mpending=64, nconns=128,
                 open_delay=15, max_msgs_conn=0, max_pend_conns=1,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
diff --git a/experiments/exps/perf_iso_latmsize/configs/bare_vtas.py b/experiments/exps/perf_iso_latmsize/configs/bare_vtas.py
index 1cf332d9..57754525 100644
--- a/experiments/exps/perf_iso_latmsize/configs/bare_vtas.py
+++ b/experiments/exps/perf_iso_latmsize/configs/bare_vtas.py
@@ -10,7 +10,7 @@ def __init__(self, exp_name, msize):
         self.defaults = Defaults()
         
         # Server Machine
-        self.sstack = 'bare-vtas'
+        self.sstack = 'bare-tas'
         self.snum = 2
         self.snodenum = 1
         self.s_tas_configs = []
@@ -26,22 +26,22 @@ def __init__(self, exp_name, msize):
 
         tas_config = TasConfig(pane=self.defaults.s_tas_pane,
                 machine_config=self.s_machine_config,
-                project_dir=self.defaults.default_vtas_dir_bare,
+                project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=8)
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
-                idx=0, vmid=0, groupid=0,
-                port=1234, ncores=4, max_flows=1024, max_bytes=4096,
-                bench_dir=self.defaults.default_vbenchmark_dir_bare,
-                tas_dir=self.defaults.default_vtas_dir_bare)
+                idx=0, vmid=0,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
-                idx=1, vmid=0, groupid=1,
-                port=1235, ncores=4, max_flows=1024, max_bytes=4096,
-                bench_dir=self.defaults.default_vbenchmark_dir_bare,
-                tas_dir=self.defaults.default_vtas_dir_bare)
-
+                idx=1, vmid=0,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
         self.server_configs.append(server1_config)
 
@@ -65,21 +65,22 @@ def __init__(self, exp_name, msize):
                 project_dir=self.defaults.default_vtas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
+        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
         self.c_tas_configs.append(tas_config)
 
         client0_config = ClientConfig(exp_name=exp_name, 
                 pane=self.defaults.c_client_pane,
                 idx=0, vmid=0, groupid=0, stack=self.cstack,
                 ip=self.defaults.server_ip, port=1234, ncores=1,
-                msize=msize, mpending=64, nconns=1,
+                msize=64, mpending=64, nconns=1,
                 open_delay=15, max_msgs_conn=0, max_pend_conns=1,
                 bench_dir=self.defaults.default_vbenchmark_dir_bare,
                 tas_dir=self.defaults.default_vtas_dir_bare)
         client1_config = ClientConfig(exp_name=exp_name, 
                 pane=self.defaults.c_client_pane,
                 idx=1, vmid=0, groupid=1, stack=self.cstack,
-                ip=self.defaults.server_ip, port=1235, ncores=1,
-                msize=msize, mpending=64, nconns=1,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
+                msize=msize, mpending=64, nconns=128,
                 open_delay=15, max_msgs_conn=0, max_pend_conns=1,
                 bench_dir=self.defaults.default_vbenchmark_dir_bare,
                 tas_dir=self.defaults.default_vtas_dir_bare)
diff --git a/experiments/exps/perf_iso_latmsize/configs/ovs_linux.py b/experiments/exps/perf_iso_latmsize/configs/ovs_linux.py
new file mode 100644
index 00000000..eafeb4d1
--- /dev/null
+++ b/experiments/exps/perf_iso_latmsize/configs/ovs_linux.py
@@ -0,0 +1,96 @@
+from configs.gen_config import Defaults
+from configs.gen_config import MachineConfig
+from configs.gen_config import TasConfig
+from configs.gen_config import VMConfig
+from configs.gen_config import ClientConfig
+from configs.gen_config import ServerConfig
+
+class Config:
+    def __init__(self, exp_name, msize):
+        self.exp_name = exp_name
+        self.defaults = Defaults()
+        
+        # Server Machine
+        self.sstack = 'bare-tas'
+        self.snum = 2
+        self.snodenum = 1
+        self.s_tas_configs = []
+        self.s_vm_configs = []
+        self.s_proxyg_configs = []
+        self.server_configs = []
+        
+        self.s_machine_config = MachineConfig(ip=self.defaults.server_ip, 
+                interface=self.defaults.server_interface,
+                stack=self.sstack,
+                is_remote=True,
+                is_server=True)
+
+        tas_config = TasConfig(pane=self.defaults.s_tas_pane,
+                machine_config=self.s_machine_config,
+                project_dir=self.defaults.default_otas_dir_bare,
+                ip=self.s_machine_config.ip,
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        self.s_tas_configs.append(tas_config)
+
+        server0_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=0, vmid=0,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        server1_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=1, vmid=0,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        self.server_configs.append(server0_config)
+        self.server_configs.append(server1_config)
+
+        # Client Machine
+        self.cstack = 'ovs-linux'
+        self.cnum = 1
+        self.cnodenum = 2
+        self.c_tas_configs = []
+        self.c_vm_configs = []
+        self.c_proxyg_configs = []
+        self.client_configs = []
+
+        self.c_machine_config = MachineConfig(ip=self.defaults.client_ip, 
+                interface=self.defaults.client_interface,
+                stack=self.cstack,
+                is_remote=False,
+                is_server=False)
+        
+        vm0_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=0)
+        vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=1)
+
+        self.c_vm_configs.append(vm0_config)
+        self.c_vm_configs.append(vm1_config)
+
+        client0_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=0, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1234, ncores=3,
+                msize=64, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_vbenchmark_dir_virt,
+                tas_dir=self.defaults.default_vtas_dir_virt)
+        client1_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=1, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
+                msize=msize, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_obenchmark_dir_virt,
+                tas_dir=self.defaults.default_vtas_dir_virt)
+
+        self.client_configs.append(client0_config)
+        self.client_configs.append(client1_config)
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_latmsize/configs/ovs_tas.py b/experiments/exps/perf_iso_latmsize/configs/ovs_tas.py
new file mode 100644
index 00000000..b87e3c04
--- /dev/null
+++ b/experiments/exps/perf_iso_latmsize/configs/ovs_tas.py
@@ -0,0 +1,114 @@
+from configs.gen_config import Defaults
+from configs.gen_config import MachineConfig
+from configs.gen_config import TasConfig
+from configs.gen_config import VMConfig
+from configs.gen_config import ClientConfig
+from configs.gen_config import ServerConfig
+
+class Config:
+    def __init__(self, exp_name, msize):
+        self.exp_name = exp_name
+        self.defaults = Defaults()
+        
+        # Server Machine
+        self.sstack = 'bare-tas'
+        self.snum = 2
+        self.snodenum = 1
+        self.s_tas_configs = []
+        self.s_vm_configs = []
+        self.s_proxyg_configs = []
+        self.server_configs = []
+        
+        self.s_machine_config = MachineConfig(ip=self.defaults.server_ip, 
+                interface=self.defaults.server_interface,
+                stack=self.sstack,
+                is_remote=True,
+                is_server=True)
+
+        tas_config = TasConfig(pane=self.defaults.s_tas_pane,
+                machine_config=self.s_machine_config,
+                project_dir=self.defaults.default_otas_dir_bare,
+                ip=self.s_machine_config.ip,
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        self.s_tas_configs.append(tas_config)
+
+        server0_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=0, vmid=0,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        server1_config = ServerConfig(pane=self.defaults.s_server_pane,
+                idx=1, vmid=0,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
+        self.server_configs.append(server0_config)
+        self.server_configs.append(server1_config)
+
+        # Client Machine
+        self.cstack = 'ovs-tas'
+        self.cnum = 1
+        self.cnodenum = 2
+        self.c_tas_configs = []
+        self.c_vm_configs = []
+        self.c_proxyg_configs = []
+        self.client_configs = []
+
+        self.c_machine_config = MachineConfig(ip=self.defaults.client_ip, 
+                interface=self.defaults.client_interface,
+                stack=self.cstack,
+                is_remote=False,
+                is_server=False)
+
+        
+        vm0_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=0)
+        tas0_config = TasConfig(pane=self.defaults.c_tas_pane,
+                machine_config=self.c_machine_config,
+                project_dir=self.defaults.default_otas_dir_virt,
+                ip=vm0_config.tas_tap_ip,
+                n_cores=1, dpdk_extra="00:04.0")
+        tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
+        
+
+        vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
+                machine_config=self.c_machine_config,
+                tas_dir=self.defaults.default_vtas_dir_bare,
+                tas_dir_virt=self.defaults.default_vtas_dir_virt,
+                idx=1)
+        tas1_config = TasConfig(pane=self.defaults.c_tas_pane,
+                machine_config=self.c_machine_config,
+                project_dir=self.defaults.default_otas_dir_virt,
+                ip=vm1_config.tas_tap_ip,
+                n_cores=1, dpdk_extra="00:04.0")
+        tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
+
+
+        self.c_tas_configs.append(tas0_config)
+        self.c_tas_configs.append(tas1_config)
+        self.c_vm_configs.append(vm0_config)
+        self.c_vm_configs.append(vm1_config)
+
+        client0_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=0, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1234, ncores=3,
+                msize=64, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_obenchmark_dir_virt,
+                tas_dir=self.defaults.default_otas_dir_virt)
+        client1_config = ClientConfig(exp_name=exp_name, 
+                pane=self.defaults.c_client_pane,
+                idx=0, vmid=1, stack=self.cstack,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
+                msize=msize, mpending=64, nconns=128,
+                open_delay=15, max_msgs_conn=0, max_pend_conns=1,
+                bench_dir=self.defaults.default_obenchmark_dir_virt,
+                tas_dir=self.defaults.default_otas_dir_virt)
+
+        self.client_configs.append(client0_config)
+        self.client_configs.append(client1_config)
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_latmsize/configs/virt_tas.py b/experiments/exps/perf_iso_latmsize/configs/virt_tas.py
index b6861fdd..65d653f8 100644
--- a/experiments/exps/perf_iso_latmsize/configs/virt_tas.py
+++ b/experiments/exps/perf_iso_latmsize/configs/virt_tas.py
@@ -13,9 +13,9 @@ def __init__(self, exp_name, msize):
         self.defaults = Defaults()
         
         # Server Machine
-        self.sstack = 'virt-tas'
-        self.snum = 1
-        self.snodenum = 2
+        self.sstack = 'bare-tas'
+        self.snum = 2
+        self.snodenum = 1
         self.s_tas_configs = []
         self.s_vm_configs = []
         self.s_proxyg_configs = []
@@ -29,50 +29,22 @@ def __init__(self, exp_name, msize):
 
         tas_config = TasConfig(pane=self.defaults.s_tas_pane,
                 machine_config=self.s_machine_config,
-                project_dir=self.defaults.default_vtas_dir_bare,
+                project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=8)
+                n_cores=12)
+        tas_config.args = tas_config.args + ' --shm-len=4294967296'
         self.s_tas_configs.append(tas_config)
 
-        self.s_proxyh_config = HostProxyConfig(pane=self.defaults.s_proxyh_pane,
-                machine_config=self.s_machine_config,
-                comp_dir=self.defaults.default_vtas_dir_bare)
-        
-        vm0_config = VMConfig(pane=self.defaults.s_vm_pane,
-                machine_config=self.s_machine_config,
-                tas_dir=self.defaults.default_vtas_dir_bare,
-                tas_dir_virt=self.defaults.default_vtas_dir_virt,
-                idx=0)
-        vm1_config = VMConfig(pane=self.defaults.s_vm_pane,
-                machine_config=self.s_machine_config,
-                tas_dir=self.defaults.default_vtas_dir_bare,
-                tas_dir_virt=self.defaults.default_vtas_dir_virt,
-                idx=1)
-        
-        self.s_vm_configs.append(vm0_config)
-        self.s_vm_configs.append(vm1_config)
-
-        proxyg0_config = GuestProxyConfig(pane=self.defaults.s_proxyg_pane,
-                machine_config=self.s_machine_config,
-                comp_dir=self.defaults.default_vtas_dir_virt)
-        proxyg1_config = GuestProxyConfig(pane=self.defaults.s_proxyg_pane,
-                machine_config=self.s_machine_config,
-                comp_dir=self.defaults.default_vtas_dir_virt)
-        
-        self.s_proxyg_configs.append(proxyg0_config)
-        self.s_proxyg_configs.append(proxyg1_config)
-
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=4, max_flows=1024, max_bytes=4096,
-                bench_dir=self.defaults.default_vbenchmark_dir_virt,
-                tas_dir=self.defaults.default_vtas_dir_virt)
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
-                idx=0, vmid=1,
-                port=1235, ncores=4, max_flows=1024, max_bytes=4096,
-                bench_dir=self.defaults.default_vbenchmark_dir_virt,
-                tas_dir=self.defaults.default_vtas_dir_virt)
-
+                idx=1, vmid=0,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                bench_dir=self.defaults.default_obenchmark_dir_bare,
+                tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
         self.server_configs.append(server1_config)
 
@@ -96,6 +68,7 @@ def __init__(self, exp_name, msize):
                 project_dir=self.defaults.default_vtas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
+        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
         self.c_tas_configs.append(tas_config)
 
         self.c_proxyh_config = HostProxyConfig(pane=self.defaults.c_proxyh_pane,
@@ -130,15 +103,15 @@ def __init__(self, exp_name, msize):
                 pane=self.defaults.c_client_pane,
                 idx=0, vmid=0, stack=self.cstack,
                 ip=self.defaults.server_ip, port=1234, ncores=1,
-                msize=msize, mpending=64, nconns=1,
+                msize=64, mpending=64, nconns=1,
                 open_delay=15, max_msgs_conn=0, max_pend_conns=1,
                 bench_dir=self.defaults.default_vbenchmark_dir_virt,
                 tas_dir=self.defaults.default_vtas_dir_virt)
         client1_config = ClientConfig(exp_name=exp_name, 
                 pane=self.defaults.c_client_pane,
                 idx=0, vmid=1, stack=self.cstack,
-                ip=self.defaults.server_ip, port=1235, ncores=1,
-                msize=msize, mpending=64, nconns=1,
+                ip=self.defaults.server_ip, port=1235, ncores=3,
+                msize=msize, mpending=64, nconns=128,
                 open_delay=15, max_msgs_conn=0, max_pend_conns=1,
                 bench_dir=self.defaults.default_vbenchmark_dir_virt,
                 tas_dir=self.defaults.default_vtas_dir_virt)
diff --git a/experiments/exps/perf_iso_latmsize/parse.py b/experiments/exps/perf_iso_latmsize/parse.py
index 58112f79..d2749f1e 100644
--- a/experiments/exps/perf_iso_latmsize/parse.py
+++ b/experiments/exps/perf_iso_latmsize/parse.py
@@ -11,7 +11,7 @@
 # from the experiment name, since client 0 and client 1
 # have a different message size
 def get_msize(fname):
-  regex = "(?<=_msize)[0-9]*"
+  regex = "(?<=-msize)[0-9]*"
   nconns = re.search(regex, fname).group(0)
   return nconns
 
@@ -82,7 +82,7 @@ def parse_data(parsed_md):
   return lat_list
 
 def save_dat_file(exp_lats):
-  header = "nconns bare-tas bare-vtas virt-tas\n"
+  header = "nconns bare-tas bare-vtas virt-tas ovs-linux ovs-tas\n"
   
   msizes = list(exp_lats.keys())
   msizes = sorted(msizes) 
@@ -95,11 +95,13 @@ def save_dat_file(exp_lats):
       f.write(header)
 
       for msize in msizes:
-        f.write("{} {} {} {}\n".format(
+        f.write("{} {} {} {} {} {}\n".format(
           msize,
           exp_lats[msize]['bare-tas'][percentile],
           exp_lats[msize]['bare-vtas'][percentile],
-          exp_lats[msize]['virt-tas'][percentile])
+          exp_lats[msize]['virt-tas'][percentile],
+          exp_lats[msize]['ovs-linux'][percentile],
+          exp_lats[msize]['ovs-tas'][percentile],)
         )
         
 def main():
diff --git a/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py b/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py
index d0913570..2c9e4871 100644
--- a/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py
+++ b/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py
@@ -3,18 +3,24 @@
 from exps.perf_iso_latmsize.configs.bare_tas import Config as TasBareConf
 from exps.perf_iso_latmsize.configs.bare_vtas import Config as VTasBareConf
 from exps.perf_iso_latmsize.configs.virt_tas import Config as TasVirtConf
+from exps.perf_iso_latmsize.configs.ovs_linux import Config as OVSLinuxConf
+from exps.perf_iso_latmsize.configs.ovs_tas import Config as OVSTasConf
 
 experiments = []
 
-msize = [64, 128, 256, 512, 1024, 2048, 4096]
+msize = [64, 128, 256, 512, 1024, 2048]
 
 for n in msize:
-  exp_name = "perf-iso-latmsize_msize{}_".format(n)
+  exp_name = "perf-iso-latmsize-msize{}_".format(n)
   tas_bare_exp = exp.Experiment(TasBareConf(exp_name + "bare-tas", n), name=exp_name)
   vtas_bare_exp = exp.Experiment(VTasBareConf(exp_name + "bare-vtas", n), name=exp_name)
   tas_virt_exp = exp.Experiment(TasVirtConf(exp_name + "virt-tas", n), name=exp_name)
+  ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n), name=exp_name)
+  ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n), name=exp_name)
 
-  experiments.append(tas_bare_exp)
-  experiments.append(vtas_bare_exp)
+  # experiments.append(tas_bare_exp)
+  # experiments.append(vtas_bare_exp)
   experiments.append(tas_virt_exp)
+  # experiments.append(ovs_tas_exp)
+  # experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/perf_iso_latmsize/plot_script b/experiments/exps/perf_iso_latmsize/plot_script
index 11c86971..46bdcd95 100644
--- a/experiments/exps/perf_iso_latmsize/plot_script
+++ b/experiments/exps/perf_iso_latmsize/plot_script
@@ -20,30 +20,30 @@ set title offset 0,-0.6
 unset xtics
 set yrange [0:]
 set title "50p Latency"
-plot 'lat_50p.dat' using 1:2 title 'bare-tas' linetype 2 w lp, \
-     'lat_50p.dat' using 1:3 title 'bare-vtas' linetype 3 w lp, \
-     'lat_50p.dat' using 1:4 title 'virt-tas' linetype 4 w lp, \
+plot 'lat_50p.dat' using 1:2 title 'bare-tas' linetype 2 ps 0.3 w lp, \
+     'lat_50p.dat' using 1:3 title 'bare-vtas' linetype 3 ps 0.3 w lp, \
+     'lat_50p.dat' using 1:4 title 'virt-tas' linetype 4 ps 0.3 w lp, \
 
 # Plot 90p latency
 unset xtics
 set yrange [0:]
 set title "90p Latency"
-plot 'lat_90p.dat' using 1:2 title 'bare-tas' linetype 2 w lp, \
-     'lat_90p.dat' using 1:3 title 'bare-vtas' linetype 3 w lp, \
-     'lat_90p.dat' using 1:4 title 'virt-tas' linetype 4 w lp, \
+plot 'lat_90p.dat' using 1:2 title 'bare-tas' linetype 2 ps 0.3 w lp, \
+     'lat_90p.dat' using 1:3 title 'bare-vtas' linetype 3 ps 0.3 w lp, \
+     'lat_90p.dat' using 1:4 title 'virt-tas' linetype 4 ps 0.3 w lp, \
 
 # Plot 99p latency
 set xtics
 set yrange [0:]
 set title "99p Latency"
-plot 'lat_99p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 w lp, \
-     'lat_99p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 w lp, \
-     'lat_99p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 w lp, \
+plot 'lat_99p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
+     'lat_99p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
+     'lat_99p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
 
 # Plot 99.9p latency
 set xtics
 set yrange [0:]
 set title "99.9p Latency"
-plot 'lat_99.9p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 w lp, \
-     'lat_99.9p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 w lp, \
-     'lat_99.9p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 w lp, \
+plot 'lat_99.9p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
+     'lat_99.9p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
+     'lat_99.9p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
diff --git a/experiments/exps/perf_iso_tpconn/configs/bare_vtas.py b/experiments/exps/perf_iso_tpconn/configs/bare_vtas.py
index ce0da0e5..9d771734 100644
--- a/experiments/exps/perf_iso_tpconn/configs/bare_vtas.py
+++ b/experiments/exps/perf_iso_tpconn/configs/bare_vtas.py
@@ -34,12 +34,12 @@ def __init__(self, exp_name, nconns):
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0, groupid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=1024,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0, groupid=1,
-                port=1235, ncores=8, max_flows=4096, max_bytes=1024,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
                 
diff --git a/experiments/exps/perf_iso_tpconn/configs/ovs_linux.py b/experiments/exps/perf_iso_tpconn/configs/ovs_linux.py
index d16a7c4b..19545cd7 100644
--- a/experiments/exps/perf_iso_tpconn/configs/ovs_linux.py
+++ b/experiments/exps/perf_iso_tpconn/configs/ovs_linux.py
@@ -35,12 +35,12 @@ def __init__(self, exp_name, nconns):
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=1024,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=1024,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
diff --git a/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py b/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
index aafb081d..fe194204 100644
--- a/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
+++ b/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
@@ -35,12 +35,12 @@ def __init__(self, exp_name, nconns):
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=1024,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=1024,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
diff --git a/experiments/exps/perf_iso_tpconn/configs/virt_tas.py b/experiments/exps/perf_iso_tpconn/configs/virt_tas.py
index 36b06472..53c0d125 100644
--- a/experiments/exps/perf_iso_tpconn/configs/virt_tas.py
+++ b/experiments/exps/perf_iso_tpconn/configs/virt_tas.py
@@ -37,12 +37,12 @@ def __init__(self, exp_name, nconns):
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=1024,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=1024,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
diff --git a/experiments/exps/perf_iso_tpconn/parse.py b/experiments/exps/perf_iso_tpconn/parse.py
index 8a1dbe15..703c9e5c 100644
--- a/experiments/exps/perf_iso_tpconn/parse.py
+++ b/experiments/exps/perf_iso_tpconn/parse.py
@@ -10,7 +10,7 @@
 # from the experiment name, since client 0 and client 1
 # have a different number of connections
 def get_conns(fname):
-  regex = "(?<=_conns)[0-9]*"
+  regex = "(?<=-conns)[0-9]*"
   nconns = re.search(regex, fname).group(0)
   return nconns
 
@@ -102,7 +102,7 @@ def save_dat_file(avg_tps, fname):
   header = "nconns bare-tas bare-vtas virt-tas ovs-linux ovs-tas\n"
   f.write(header)
   for tp in avg_tps:
-    f.write("{} {} {} {}\n".format(
+    f.write("{} {} {} {} {} {}\n".format(
       tp["nconns"],
       tp["bare-tas"],
       tp["bare-vtas"],
diff --git a/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py b/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
index e68f6e1e..fac2cb1d 100644
--- a/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
+++ b/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
@@ -11,16 +11,16 @@
 n_conns = [128, 256, 512, 1024, 2048, 4096, 8192]
 
 for n in n_conns:
-  exp_name = "perf-iso-tpconn_conns{}_".format(n)
+  exp_name = "perf-iso-tpconn-conns{}_".format(n)
   tas_bare_exp = exp.Experiment(TasBareConf(exp_name + "bare-tas", n), name=exp_name)
   vtas_bare_exp = exp.Experiment(VTasBareConf(exp_name + "bare-vtas", n), name=exp_name)
   tas_virt_exp = exp.Experiment(TasVirtConf(exp_name + "virt-tas", n), name=exp_name)
   ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n), name=exp_name)
   ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n), name=exp_name)
 
-  # experiments.append(tas_bare_exp)
-  # experiments.append(vtas_bare_exp)
+  experiments.append(tas_bare_exp)
+  experiments.append(vtas_bare_exp)
   experiments.append(tas_virt_exp)
-  # experiments.append(ovs_tas_exp)
-  # experiments.append(ovs_linux_exp)
+  experiments.append(ovs_tas_exp)
+  experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/perf_iso_tpconn/plot.pdf b/experiments/exps/perf_iso_tpconn/plot.pdf
index 9720ac740a29a77fec1fa61c5d42a6b7ec38d52e..964aa0c37914bc5e48cf09c79c9ae9b244b33933 100644
GIT binary patch
delta 9195
zcmZX3WlSAVvu$yTyE_MW*Fq^!in|vm?(TY^xVt+X+}+)sgS)%C%j>=G=H=yn^JlND
zteLEx%#X=TtYV}}j0~_rL)w;z2dQ(a3T-;vyE^Z2cL`eD50Ve0bGNg%WkodPM;f{)
z_j)TW3HsTV6-zWX*c(nItCUT9LTL)XyyA<!DgYU-o*usfYA>cXm&-VMm|fzxlHQ?K
zgtsnFonHLDGA|WL-ga-)Udou<-XMSQ+u5ex#afatb8&<bVgk!{!rliqWTQJG_GbbH
z<q2E1G^*Eisu$Dgu+IGGh63-{eLWR^Go1PxrJo+pA7a|a;VgS)MWyg=cxC#mj<0I_
zR}x28Um+1=Qy$G%{n&K;9l*?l%FjaJemB-#;YNRF*4!XFqe$|lN;klB${N3MYs1Zy
zI6P|=dre6YzZt0ddysmc7S&gs1+w#y`-=^eIzu7_kYZO*V;&$Fp6`_}FYCI?`GpA^
zm0?*;e#*shM4@pl)OpQQpg@|P9-XNrLCw6+C}EAMNUM~!pXiVA7XkmuFlLK-ilsfy
zeq<zyb@--Qn-Fb+9#Jbg>jkISczls68__c*%gUgw3KgK?)fNfiLx)LSAu7oPy_*A}
zKWdyOOa0t>82Ts@m?58VPy8fLjyixh9TiNEtgZ;5HD7_LKL}IlYpbu#v{QPV|FbSE
zV{P!r|3ER)!CH(c`B~|ZS~gpa1WbMpCT}o<ns5jZ8s@FMO<JwD`(5ODU~sVCb}Lsi
zI=5oY?*oMK9iRx9&DUdLzKBZX=ifZHxm-#w8@o;Sd_eSc^mKIW?C5ImSSAK8fm#rL
zWP!G_#xSHjGQ07JmF8yiyOdL;uUZOO(^>fL&ie+EZBZZ3-odNUn=Y5pj@{2W9Xpfo
zztFd=2sVzvLv?@8_CCsef4T1{4j+*T#Hd)S{sxW_IDrz_@QWdeFeRG=onBq!8k1iW
zkW`ht=r2PvKFU%B$gGAb|Fopr$*9Rng8nu^8qQJFvJGj88en4J7JH5%jXSk9Sz8Um
zP?k54sdN7_lu{ADpbpLG^;34Gh+8>4hs{<__6TBbnM)a~B-EO)!84s;f)>P0uc1mB
zx&;PPAf77wIE&Q{qKj7C)D2I_Qi`?-vYy`0;RZJ!=Cq+GShgfY4D~bMSxeg=>z<TR
zrg25#StNd9C6$ix$s^%~4VKtk$NgV+LNQ62oJmL9xDGNZ9}a7M+QKE?h0})NvgL-q
zCM9TS*f{UQ-rY4@vp9~+wfhHTo*mE-hH-9}3<i}98Opduc$nTxCjTosiK$~3`G?<*
zdSd}8Icr&}kC@P9k`JUaqe1ouGK&mkS<x1X(306g@s}%r@3%3JPuag44gV~Li%xN_
z=i=R<w3)a;{2kUjN>$pY*mspJIoi^!=ladeakR9-i;nCsK$<jm_Aqp@cLKaQ*w!oM
z81_%tsBvn&Vn|G{C8wRO;5m<JE#6T8SG0(sm}8}7i<X<yqX5n*8xG1xoHH0ueA@6H
z39|-x5FPt&&n@HbJ48-=Tn-zpME01rG~0bHRI8WvfB%^3gkHzcpe%YFSjgpuJ6*!n
zrfTBV=$YU-eqJn|kZrKKKLehQcTDfm`_wqcsQ$r$hZ|#TVxg5HoJHivG-ub_NqoOB
zj=<$E<i_!zu92o0+=rfW`Wq&cxpi8YD)(K{23UY4UM0&=fR|?It3u5R-#q=cRE+YH
zGPfSvJl@TL7pIdH%Z&muXrsb^fVvT@6gPVHYZ@!t{Uf7Y74M+MMh6U0Kp8OTq#8)T
zktJ{tMk{+CZ6oMNzHkqiyfukBOg6q-ilZhDWuoRf$|Y*kFiYa*44q744^=bp0N_S5
znHLHQnqnf@)2b&YF89nM<Uea0m&hDU*w(M)8C?lS`N)?eH#U+?tZDR3V4=M8nbRkJ
ziwhr0;@r2u!bJL)_A5D&j^=DV%S32#-@RsLowCKvN-};DVknAWM}a!on31=1iqk*r
zt{(}3q8|!<q6w5TgLq-}{TfAVk!bSMWA(=71y%J#jV`_hh6IX}hplb~CK3Y3&CZD+
zB!uAT<Y26Cjo_BC@9yb_rP_G8(eO}tQt6}Gb#o%;N|PxEKb3+;hL$7lE+CT-0u2Mz
z4=;ow0_`^p2oQz*3q=bJgM<v*AA%R#1C1s^c?50J4(Zc}e~<%7VJJ4}zw>ouQgdE1
zA@y|p{nqEPO{b%+)aBcQ$J+wXwxT0l;YWzn=+~I;@u8yRj8o-XZu0B>fM3cc%x>)8
zO=u3#cK9UVu?MJ7g@u|v|4P71_B-CJ^hGn#Z>(G&!MU}k$28B@k)-Jw*^`ib53z-L
zKu!rHPO2Dnbn}6pQa1VavDf>}MuIC#umAQwdLorCbDDAy{+gx#7MCO&*jXL$jb@4p
zkhATcvlkjH6+{c1Mdg6st_u+h6X#+$XrQh5fzfN?5<kpS;+HHLac9ZD?m!5ZYs#=0
zv0I5h%LRBUu~AyzcF(#<sxT~&c6t7g8*)`~{{6@DiOYbZ27u=>iVhc=vdE`4gx|qU
z>b9Q6TT!v!`cWCas9j$M#OKtkwTvp43D$|9VGq@z>@j***J{`=NWOZVk>)8;Tx)h$
zUd#EJMI#r6xg<Bkxb`wz9+E;sFP@kpkzEjeWbne67B`oJB>sjZ37G8_Ny=GbXy^|J
z*$FdaU{VTTY$#W=@UGD<{hM5zb~d|m^z@SQc70#@_DaKpQL#G=%=vqL-{|$85&(yt
zbD=e>s$-;cz*1$AC)sA<x@W{2zb5&h&&d$qtOKCq<6>G3rh%$`ErN|V-e*DEBsu=p
z;>sY4UNq1&yOGVcKb&9n`SDn_*};^ZU4l8aY_)Tu_etG}3Y}&<w$x=j_K~2HH}=U#
zZiO&f6=%2f4U$3z7<N^F5Q>NFvy9j;FS~Ng{9MeeC#_6KP_HL_;Jp5Amqw2HSK+JG
zAH$hBKS`G?;?dgtoWD_+EHlAA@<R>t3pMVB1cUWiCE-!QDf+w9rn*X)a^dn<-!m2`
z@oO9>f10hHoid>>^8cj30IP(SZfGFyiB(v8bqMJ3tiG?i0HM}x%*rSwrnz-)en*ey
zo4pYR0!2?d(!O!S6(E{!j8R`pjv6$kuw1DOFho?lC3Op~y#h4JrsPu&-Dk8#=yw?~
z=moJibc~XRgc4<ta|xEAhP(Ca$NHCBuTxj47}#?e3i7R8$<b;HKTi@z;pCZqdwJZb
z&vD&+xY>790xK`*T5Ya&35SGKzwJa}HW~ZeZ$Jr1VGJx53&*I2B&#Zp!%7M}Nbq8r
zQpa-g?VMuTm)};%dGb+CX3Wf<%3ZHSg!~DpVH%0gZQyG7ZTka>630P7uYxMf?A$^Q
zB~Qzx&451_?Ie7r(8zf3U%M2q4*VUVTYiV*ZL|F@4g{%Mx}IsYxg4U@<QotlKTX{l
ztj`?k;_%q4q48J@m20bAzujVwEl84Dm6op5x71q9g1R?unuI={DsDRb_6#j2eeUO%
zxrUDJXc*|T`h)l-jgU`Ni0A17Wl)NEjSWh~Dh&2QcuazE*s5f74|RyyX$U*6g^F<F
z-m=hOfz&Uj2ArHMjXHCx#{uq3^D=42lE;7yqltFS!K3BV_`;czrc%juZ*x}7zZZ7!
zuy?F-qY<$d>Q?Kmkc3<t4bPRR^2<SI-gl0p0}U)<ZOu}*#fOy>tb5%L)^Mmct3Kbg
z=3?ULJ25vmcvQV!?~`|`z};CQu1~*Iswny`fJ}oyVvI)Sys=u{KfW+h!lxv_7gf*w
znxMZPg*9okI2>F|N6Sy56`bG~lt1KdFj{eT(iO~HjSC$W-yRYA5#j@asw)b;0~r2-
zNR`c^m_nlpdY~w&$3@D)JgS=LYLv+va1zo%8Y_W;Fb7G-7*9FCor`!XaS#8<qtMRa
z1KujWa*|lIeW6*cbqR%M@)D+hRl1YJegQC_#OLfp7bOCO@-F_M*Rl_if)@tLQRsAS
z<7Oq|;yaRxrO{N@t)2^>I#(&#WUnu&h^~pQNhH0d7WdRoh=PgKiF}3d@%G7rXTvtg
zmft1Sib&&>&3Trljk7l!j0HUmt~Q2*fS5cb4=^wmxVB-^uGYDIt?l~~!U~AaG9JDw
zogZ<7VxcZ&&6_mVXAg;$@r8#`#lk8#x=$_!MFIBI$7>?z^u_(mxj+?|ui^^=kuD0z
zFEDp0wIYwWJOo&&eqy1qWy4moHLacwELk?k4{`~DJ}dbAs11|5fA=~dI0}^efRt8q
z)XP}uJwK`AVL$=p)IS3W0QeD%L4(rqM@Dp0Z>*VAOdv#1(e~GegxYBZarIyO2e=^I
z+_V7~ek@FBv^X+aVhr_y7}^fNzE^GDdk?m0bHg{1hx&&+V*~TKY{vlrcVMDH#68(=
zZ;zW}9$4`>!n|I@(4w0BJf;Q=e31KLU?IqsA~A*{@yEy`fkTU(L$RkY{74IgYX9@m
zOm6U_H*5bJ<u{1@(p70ZjheJOM_qg==OUMbv6Q7V#-&cfz87MF1=}Ssnb_&wy6dKn
z<J9HD{+ag+s<k!H&BIpCpYyKI@lZ(6=VEPf2hpAi{HS)Bb=mIuIgalHWaZBQ_i&gj
z9KS_J1=tq{XZ|T3qYhk>RWP<@B~emY{*IJS)VkC<4&PfiOXKwAV$9LTS&Fud<gS)*
zJ9~eDQkWWN@OkKA<3`GGcMEDP)4QX3O5av!tuq<>f-Y;sy=a{kWz<d(_c|ud4#8g8
zus|QiwM)u9Kb0iH(up$#sP6gAW@L*y<~pvAdxnsSAT7^b95qnRp>+cv@wg9D8iO*F
zltx#2uW!VT|2M$}$;Ea@qEC>|;Km6Nd+=oJLGz(ogz{lt{{^U+4XzcO0$%#wsg!3y
zTV8Hm^}M$lO_a@cyDKr^Y@bos<Smj2Yd#bv8>wc#lF&Ew`nWj@tm7dTQ#}E>hIDaS
zuQe6@Y}(F<LbM}tmZD7VYr&~A;*!04MfxeJNb~aEiC#K#XlkP*sm`um;A#9jKa(qn
z;H=E^NhN+WKgLrKw#>keD*7yU^~GsSoEVc&XT`!}4G5e^U&TgUuw@OW2kQk0OU`b8
zHml#KwI6gA+u14uZEw+b(VRofLzc0~AkrxA6+BZs_+MLIT095uuI{gj;AY~LX6Wao
zlnYvBcBad|NXDryLz`6lVq4{i2m*ZJ+8Mzq3oPDlFaF2I$NR^Yvy{h+GrO!x2QC<$
zQOd&evuQ-_4PQ<q?(2EJphJ{VpQY70>_^=9rMs*>%_ckoNg0H=I}Gkcs{-{rx9fzl
zE)Dx0?~Y=#NlDU;&YyQinO^;S`j(erT%)HDmzB6x=FTp5yoot(^J{RzYYq|!i9z7C
zoW(?x)%7jA=(pfjb|NAYJt?Vu_JVN*6Gr7RnSuj$>C}dCwZg<@Y2w%?%j<`(sXst<
zpGobm*9K(Z)aAze8`lY%deytEm-M;a$BhK3&c{jLu6kn#s(APlEJU0?uN_zf%x|GP
z1d|o?Mj{UzfXTR8?m36-(i(ZDPiU~XtWHCFjT5&$gP|}z&Me}r2y9NPnL4=kyfd4T
zT}kAzg`lNY%u@4e$@34fRLKYJI9yY1zO}jOFctz6oecJQyarR@ib8jH<af$>h0c4F
z4F{(yuu`LJh=~(VX+Id_bTp0uU9#L#bKifmRn!@c!)tSr9Jsf~BwtznE>zCceAog9
z!7kr#GPSM)ebmT1dexp;J>!Yuc)3{FM{^qXU2c95b`FE^`vwIKb8GsC1@!W1etM~j
zLNNf_@ndz=TbqNhb4fGJ^4(Z5s+C$sEo@myl}e1rFd2XPn<q%~#9qkAKn=&b5I?^n
ztOK1+xqBa7F!rWEePIMyJ|2A+gM;X{6T%)crPjdjrOR55&5a!h=7+g?w)Sg&#pAB+
zutUUHQB4m1$hrf+ore_)(paVN+00PNglvE|m_8hidH1LHlLq88hL?mkrP1Zduazm}
zbCC*Djc|2!XLod3^hwd#kCOtXjq0k`1lJpB55uEh(;Iy#uq$)>_-n$U$%k(G%tVFh
zkTwt4V(DS}!iKa#r5Z&O){n34Spgc1XqmjowOZpIKli{1DLI295EbWQrgDOr>8rq`
zvQKVf1B?;)RoOW}>Ns_HIMos+5px$rfy`e3rmTYrgcPB*h-tksjW}UAHgKdUSHKjU
zupAqFOjdJF!Y^Z$h3&5K_PlLf*AG|Esz+2<7p~v3gs5u3zfNChi{Yt<#bFk?p$o#~
z23NGQuu*Tbzp!T^p?b!ws<B!Y7y|=K9ks3eQQU$9BkUu^y7kUr+o>y0Rf5cF+&Sf2
zOe<)1wspEMQ3hzQ;@f;tlWE!$9v5m1ZTCAkx77s-8^h(zN$EG+GL0`U=1+S^;&DCh
zOQj`q`&ha7kGB3`U9NM5%50z%u?ZyeEm6hX6GOE#FVj&``hs~vbluP<OMo*vuJuMA
zzn#RSBPSi8+_|T6ZqJY)zv*)lP84-xXu$GbDgdB3Mr}^wFf<@9L+1@j6DDWef1%*P
zqGuFIwJ;{5CJe>II)ONoBKPz6A=xFFlT7NCz1TE;_lGGOL#C3)kXd3P9r)uIaL9j_
zi-PRWhvdL@cfvyE!jn^L5kO;gEl=mcn79xZd1~d}lG;8zQ%Z-t9d30h*qk0mTHQV*
z8xFiZ!M2{H!$=N51i}f#{KCS*3?IkXKy{dbHfnh_2PG9t0l?T=3cATvd9ug}ga@Vq
z4?AoUSbu6S6+{avT@P*#(i~JRFF*AwPhD795$SfBU0YV)9K&n^fw^$ojZ7YBQe3M%
zU9S$Dc%)g^^(2_}`PlAT2rs`xxSK|2U~3b=tdm21YdM*N%WzVmfl9D)<MVGLmuOI5
z^LI2N{-E2E@)nbw0e%XDi>aTnGhL-3v?B*g_}A{Gew%DI>RH=#h1H!caI`PVxBCko
z0Ny{dT)98kFYBFdfs-4(lS^Hy-mjm2&PM8<k#Yifub!;7vQamg;YeRSfh6t?Qm8Ei
z<Ght)oDfua`wN&Fax~ex<8Pr42hGt(^@sh60+`q&&~^9lk_Dbl5W2Qz&ASuN62c%L
z2o98aKHFsT?KeZ>M#LF&mOHY`F*{K=e*=#3v|W%e<C&xx5TK?`$-}9kKI^)rkhiW+
zKpc)l8!0t+KXo>qhnqidju}*1Gp&9R{v>qE#?N&Z|Hvjpr4ytbrpk|6*2yC+9}^XY
zSzs&Wuj_u%qJGy{<{e$WfGvv~+#lUcoF><0)9KZMuZ@KW()FTA97V|hBO|REML?8^
zlW)a@Do0KNw=-U(f<4AcBTB10$cmgM+t{8JG#%QAYI;=Y+PVyLRJ1f}tlU8!eJ_!<
zyV7iDH^yvxGmCdiribRrh*6K|H#MX+rqq`~ul_o0w8QXmBAb3jDv`YQijkBm;*d}=
zJV?|Txn#JGst>jLrOB*_D51G?BO@Mo10Nidv^6Kd47RU#=Anv8>v7Wdr6o$G7z#@B
zzAJhoYNpci(gmXw4Zlkj=;s=gkn*YRlu)6~ZGUmxu|5>Fu#PDF@fyAgvG>!DwWssO
z;hvt@`jKTvy&V9f^TQv0IyweFd76FY5K3`@aWw5Il^g19X(jx16`rypTfz|x(Qn8!
z==Ze-=$nd0Fu`qTnBmz_(No8k#Y>dGJI;<VIQ8pjkx!P-1>2NXk?5@tDR2Wah%*D;
zw5PzPtLgK>loQFuD&fW1U8nUBhY{=ihdFJDIMR5iK{sh59X~9VlnlxNCtCmai~DTv
z^YJkIW}P?;qOIWzmifGN9u<is7Hw()EwPJd;8g!s6$==ZS+DR?{GLhN`<3iL6@wzU
z*ZkT?xg0E|8<|L0@$kLi)3=E&q=bG!#(-Sz@QX0sZ%SqR49p_%7qEzZsY}Oss|}=g
z!BAHI6yFCEC0k$e_7uDkz!-okk4O{btq<fylS806q&j%Md2{z`2et3D*T>cGhpKi0
z>4B;_^ycn2EA_ut8aVYH^Vd<Gg%yq%?r>od;-$Q(KH|PhDz#Lt>5<UNhqXCZ7}F9j
z$$s(h%XB(b(ui<+db=oa)U~oQ!}Bp4xHx!7SMe}5-2QkAMv;H6vQ$#DKaOxWeJt3V
z@2szMdjX$c64@tIoUAr6GgZh&_fdENb?M`i^fL`M<r{w?72T|~V1kV|kCaSf_sqKh
zOl9+z#9>}qg9vOx8%Ra^y7Px`DmyPIfYjl+C=u=-kT;cCK5QO%ig&8gs?mCRLsgwt
z#Z}}dmK=aqr>81RR^(5Yh`SJ#FbXxP{TcoeHTEMYeEYwbgM3DifNGWT&f^&1BxI0P
zoGe`5pCo-e@t@!t)}+WC!@X*Kj8rki9N&HXFiEyd<htcPucY5*De_sM0)^3o+kqR0
z+KkG8L@TPQgfdC4bz1AcxJ!s$`R(Cd6pMsWc$0+uNPTxt;f2Rr(~rlT{O8`+-x(OJ
z#)8**C>3=H|8i>uaI=F2dh?rsI%-BHaD_(#lf_~+^s&VwQLd#f`BL|plH%O#E3x4*
zKs;mE`s_L9fRi)<+2Yx)_uW&j_aPFloHc93_hv`p#**+HEp}jPmd{8pOL0WW*YS$N
zQqg7Wla4bX<65n9=A7_l$bHFsO|{(4;l|p?QO6T4XBzLsjvg0UmNInUd>Q2KT5%di
z_r&@jv@$>FCZ?u{?hn3<;~%oiDkRo}6m~{KeJoOQB2xry1Sk1lFm|Nb09@L5r1%J!
zLcuYju^(C{%QA}$RbZ`xjT?zEcj@4Q>`qQfm`JQHGY2&QNrAKJ0EGP(qqnr6eNy49
zliHF`=R2)6njy$uDIx_Zz360u+p$AAd@qyc>q%-NLZ+tllmAGJKa&~Ml{+Ol1akEI
zH+KE8`{SzQAQAjg1Rpx>X-2NAH{-k>y6EWB`Y|PpHN-2y17@m+ZThw7g4Be191K2v
z8G4_659L)mq)By}#Ki+IN+N;zaDSq+ee}W8bD!h>e0X2i6l?@8=_Rm!JtSvqZu-L!
z3%wKaup&vMM#nvl*xFDIp2zRVl6y{G`2fD=E`$6ycU=<ZVws$1vak&wf1ic^@*Hts
zC-vMYns6$ZgL`#}v)sel&=gP0jY8*-GSX)uH*FECob{?j-Ha90;e=cEtNv<5+7`@J
zJ$44bA3mswFOLCE<ZD)E%I^r&?03V(L7n0Wo97&k2s(VJ{EkCp;L6Uxhf0$h^}AOQ
zud^$)oV)>qWo!@T10fyXlAQ5P%E!qzPxPG9pcfP=v_d)I^NH$yp^hZyx<fjdm+>JR
zBh#a&gsue{Bz*FAo&torLdQj8vU2Isl~~S1kL}Cx!J9y_qrNGzCQCfy0zmfMC~~dz
z*B#o{0hgIa^YAyp&=}>bFXMs2v-^z0E;VdMvPCdCG37n3wlmqW;dJa~P7L##%-;qO
z%!yli5fbsAE>N8!?Z&-lz7;F7@dcdIX^LhBP48D@P|a6S$HkBGE}&))@z6>uSpGQp
z&g~8zEj0opsZGA~v#5pL#F|$p83uOKG*wS29&+7j9>Y0cTmX(iDLUfXhJTJeQ##ha
ziC+>=pA<|l<-J_3$3v0g0Pc_9QHvmCzs|+CdyM6M7nP9MFgn<VxnI*pB^UjM2qXMy
ziYt6M>*=+z_ucz-SfFi#zxGP*ES(o0^`7Hw@FN!J`m^fTf8iF*X9#Bj&SVlnF#j7S
z(ObmB^p;R&2BoZ}Tc+OglZf`kW4~>P!PA^(gX`nRV3D<}CSt@3aO!11E~!^<-#+$N
zi0ax?{k@H)i2CPLHX22}hE^cQg@#gK1?=kKQfW;^ZzHTWdSihXI=DG}JkWmcizT_E
zCJQ?-Sck&Vohy}QKPKN}7e&k=1}Wh&mOw3H@e02H|FUZuT&maC2)Akf<qf3UDI;{k
zUum2yS>oh}RU>Ld+eofcyS_Xh<9v)@C7g#|-ShQb7?9A6Hqsz$k>ZE^id+ZJc0kcV
zAtj@41^huFW||&eovXtb4@PmT!rnCP3rz$*;BlWd9UAs|5+l}li-+7&7(f@bRL%mV
z>e$S7mjvI1--_>l#K?QZY7W=DbkVS!EST8P!9JFY(4)GpVNIX>{Y2@BPPNM?@Tu;7
zgsen-szUQJ4eV0wYe4gQ9Y255hEOltPPZ^K53JJOu7a#Y3aa|qZ49Aj(pwOY`CI_B
zXb$1g&49=4JQ`xD@5O!Ja)ikK%A5W5^Z0L<N*^Bt(4`y5=vN1~Ee|O)uqvzrX(|_e
zV4Bo@47NMLL=~pm!bE*zfgnYE%J&t9=hZ}}N%MXS@HHWQ6T%e2u(N8(B)#p0W19wS
zc|%-&<)z;W@pXkE!num_6@^4W;Qa#(9vnrp#hSi)5ZNHxI)7JwUWMB}cWC@{CGY&_
z4eB9y`SM4#e7E*|wR(3t<OxhW`5$@ocALQUs=%iU3b%^M9z8^nOekIPTs`YR9Y|gD
zYUOSexH$wj_qN2YjIXN|)fMm*ZqguvMucMbk#S4tcB3Gs^xfwqiluhR-E`otempEo
z>D6D~$a$Pj#qSL;+*_iArTXu;YMq^Mg0_K&TKelN{$82B4VHyB4RHF_eA>6GXnGvj
z3jxcvqF3d<^JOnL^N?!yfu;%*rZ&Ne3^HB?h-xW02m+;HIT%c;_<#3Zo?Icu=+C@T
zeGvp0u@#teWWG1=@<=CLZNdXJYN4~3|IT>vupsvsK!igx*7qu#Xyo*ILC81uwyU}2
zVIMU92=(QI{E+Q7l)NhTl{lk(qQum1^wpH!(ifz|xr*_nfZ%``M`QJ7#cJ&3<dDI(
z>++?8M4&Ef&%vfHv(u9i>|(*B{@RQy(di1k*QQS~|J2XhJoIm+;CKUUgV{^nT7;y2
zliJ0Eev|TVgN_(t*oBE8EW5Us!%H{YHsr!H^aDfwRP7tKXjbkfRwDJ0V2I#_Z;B4C
z_T7dILUz8=XU0pj+!ZB`5$NxA>?7vJGw|zybbv-8INI^o(%<?LiR#qjYlTUgBhvWw
z<&|s<GPNnyt<ZN>CI<X({^DSqo`Uv%#dFs~e!<IirM^4C-{}a;F>UpKL=tI*@&E<8
zMX!=GL6?wY$~TA%L(@V2g^aU~3GkriBU6C>P`k=S=%n~n?~BWHguP`R7=VrzO>+&o
z6Gn!^gv~$(OBxmm*YqX%OVJm&jV&~d)yM4z^c*G#ZFCJ7jd3=EHHz*C*L1^f!1wuX
z+HT(_d}vzcm~h{1@gR6RsE5DZXL<G|s0zp-Usk?{Ckab?zIR=be>TB9C1>}4LX_z~
zMI#v782!)n>>si<ut4A?V<r2qmyC>zn~#+*-iiDdP{ekZ3@z~T4Iye>)Cg{MT1pM1
z>N%p{R3`fhMTA$BL|}z}7z5NJVL6fVtbWEbAwf+!asRB1o-HjCHh+NAyyqQ=*<;s>
z$MsH_#hPC@Vtu|BVgLe3a8&nq`p#=d-ARWu?>j0#4hF{3Y+klaQ=)G~%`3_lu>i8y
zAkqzBHYyTv<=73KX=qvHyiJjRgyzL!^&81#UYSz+a&Ws)MUyP^Yx1>=wpcp*=1g3+
z|L>$8X@VU|6}?4)_2^wWNu<vTt|Y1<Fc3-d9=60e6K<Youh357qFeh0$7&e%?UxU<
zb}dZP9?qMX&*+*`QDBsF;BAhFge;uwm^Tyf!5MiMd53bB(h1L2dX3|vXKl=Yg~7-V
z<(>D5t(>bM$*PC=-Sx^AY8S$O!KJuCuxh}a*t>Nn{_()hHi!?FkI7l<NFxip6A>gN
zdp#mh(~Q~Y<?kgSjN(JYb?Xb)(M6Pn^X+M!<0DPUCV8f~Kz^EBIpI=Q_W(w9{}mEC
z*sxbEo|}>kf-hd3k{4D+Rz>NDa$O=N7R3MH_$mMcBs*)}8h{@Hf;AqUx(|Vmjf<6o
zlb3;&J${4Ql!=X%jhlmv^}mA5h794q!9R+R>pwUyUha4Y8Y&>yf9m;o{$>B~8hmX3
zQJ0sGjr)J=c=<T^{x`?R$@(8UK2G-k)=~a{M%h@|+5h$Bf5rbZ&-U+k@qDy$2poL8
M2vk(!@;?#&4^bwr#{d8T

delta 8834
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
CXb5Bg

diff --git a/experiments/exps/perf_iso_tpconn/plot_script.plt b/experiments/exps/perf_iso_tpconn/plot_script.plt
index eeebe830..324cac1b 100644
--- a/experiments/exps/perf_iso_tpconn/plot_script.plt
+++ b/experiments/exps/perf_iso_tpconn/plot_script.plt
@@ -7,13 +7,12 @@ set key left top
 set logscale x 2
 set bmargin 4
               
-set key left bottom
+set key top right
 set label 1 "Aggressor Client # Connections" at screen 0.5, 0.03 center
 set label 2 "Victim Client Throughput (Mbps)" at screen 0.01, 0.5 rotate by 90 center
 
-set yrange [0:]
+set yrange [0:2000]
 plot 'tp.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 w lp, \
-     'tp.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 w lp, \
      'tp.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 w lp, \
-     'tp.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 4 w lp, \
-     'tp.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 4 w lp, \
+     'tp.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 w lp, \
+     'tp.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 w lp, \
diff --git a/experiments/exps/perf_iso_tpmsize/parse.py b/experiments/exps/perf_iso_tpmsize/parse.py
index 0644f600..6c3d482f 100644
--- a/experiments/exps/perf_iso_tpmsize/parse.py
+++ b/experiments/exps/perf_iso_tpmsize/parse.py
@@ -10,7 +10,7 @@
 # from the experiment name, since client 0 and client 1
 # have different message sizes
 def get_msize(fname):
-  regex = "(?<=_msize)[0-9]*"
+  regex = "(?<=-msize)[0-9]*"
   msize = re.search(regex, fname).group(0)
   return msize
 
@@ -102,7 +102,7 @@ def save_dat_file(avg_tps, fname):
   header = "msize bare-tas bare-vtas virt-tas ovs-linux ovs-tas\n"
   f.write(header)
   for tp in avg_tps:
-    f.write("{} {} {} {}\n".format(
+    f.write("{} {} {} {} {} {}\n".format(
       tp["msize"],
       tp["bare-tas"],
       tp["bare-vtas"],
diff --git a/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py b/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
index 76dce259..3cc45107 100644
--- a/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
+++ b/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
@@ -1,17 +1,18 @@
 import experiments as exp
 
-from exps.perf_iso_tpconn.configs.bare_tas import Config as TasBareConf
-from exps.perf_iso_tpconn.configs.bare_vtas import Config as VTasBareConf
-from exps.perf_iso_tpconn.configs.virt_tas import Config as TasVirtConf
-from exps.perf_iso_tpconn.configs.ovs_linux import Config as OVSLinuxConf
-from exps.perf_iso_tpconn.configs.ovs_tas import Config as OVSTasConf
+from exps.perf_iso_tpmsize.configs.bare_tas import Config as TasBareConf
+from exps.perf_iso_tpmsize.configs.bare_vtas import Config as VTasBareConf
+from exps.perf_iso_tpmsize.configs.virt_tas import Config as TasVirtConf
+from exps.perf_iso_tpmsize.configs.ovs_linux import Config as OVSLinuxConf
+from exps.perf_iso_tpmsize.configs.ovs_tas import Config as OVSTasConf
 
 experiments = []
 
-msize = [64, 128, 256, 512, 1024, 2048]
+# msize = [64, 128, 256, 512, 1024, 2048]
+msize = [2048]
 
 for n in msize:
-  exp_name = "perf-iso-tpconn_msize{}_".format(n)
+  exp_name = "perf-iso-tpconn-msize{}_".format(n)
   tas_bare_exp = exp.Experiment(TasBareConf(exp_name + "bare-tas", n), name=exp_name)
   vtas_bare_exp = exp.Experiment(VTasBareConf(exp_name + "bare-vtas", n), name=exp_name)
   tas_virt_exp = exp.Experiment(TasVirtConf(exp_name + "virt-tas", n), name=exp_name)
@@ -19,8 +20,8 @@
   ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n), name=exp_name)
 
   experiments.append(tas_bare_exp)
-  experiments.append(vtas_bare_exp)
-  experiments.append(tas_virt_exp)
-  experiments.append(ovs_tas_exp)
-  experiments.append(ovs_linux_exp)
+  # experiments.append(vtas_bare_exp)
+  # experiments.append(tas_virt_exp)
+  # experiments.append(ovs_tas_exp)
+  # experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/perf_iso_tpmsize/plot_script.plt b/experiments/exps/perf_iso_tpmsize/plot_script.plt
index 3f0b151c..7caa7cd8 100644
--- a/experiments/exps/perf_iso_tpmsize/plot_script.plt
+++ b/experiments/exps/perf_iso_tpmsize/plot_script.plt
@@ -7,13 +7,12 @@ set key left top
 set logscale x 2
 set bmargin 4
               
-set key left bottom
+set key top right
 set label 1 "Aggressor Client Message Size" at screen 0.5, 0.03 center
 set label 2 "Victim Client Throughput (Mbps)" at screen 0.01, 0.5 rotate by 90 center
 
-set yrange [0:]
+set yrange [0:2000]
 plot 'tp.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 w lp, \
-     'tp.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 w lp, \
      'tp.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 w lp, \
-     'tp.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 4 w lp, \
-     'tp.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 4 w lp, \
+     'tp.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 w lp, \
+     'tp.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 w lp, \
diff --git a/images/start-vm.sh b/images/start-vm.sh
index 3ef9fc72..4ea361e4 100755
--- a/images/start-vm.sh
+++ b/images/start-vm.sh
@@ -30,8 +30,7 @@ if [[ "$stack" == 'virt-tas' ]]; then
     -machine accel=kvm,type=q35 \
     -cpu host \
     -smp 12 \
-    -m 12G \
-    -snapshot \
+    -m 25G \
     -device virtio-net-pci,netdev=net0 \
     -netdev user,id=net0,hostfwd=tcp::222${vm_id}-:22 \
     -chardev socket,path="/run/tasproxy",id="tas" \
@@ -45,7 +44,7 @@ elif [[ "$stack" == 'virt-linux' ]]; then
       -machine accel=kvm,type=q35 \
       -cpu host \
       -smp 12 \
-      -m 12G \
+      -m 25G \
       -snapshot \
       -netdev user,id=net0 \
       -device virtio-net-pci,netdev=net0 \
@@ -60,7 +59,7 @@ elif [[ "$stack" == 'ovs-linux' ]]; then
     -machine accel=kvm,type=q35 \
     -cpu host \
     -smp 12 \
-    -m 12G \
+    -m 25G \
     -snapshot \
     -netdev user,id=net0 \
     -device virtio-net-pci,netdev=net0 \
@@ -75,7 +74,7 @@ elif [[ "$stack" == 'ovs-tas' ]]; then
     -machine accel=kvm,type=q35 \
     -cpu host \
     -smp 12 \
-    -m 12G \
+    -m 25G \
     -snapshot \
     -netdev user,id=net0 \
     -device virtio-net-pci,netdev=net0 \
@@ -92,7 +91,7 @@ elif [[ "$stack" == 'tap-tas' ]]; then
     -machine accel=kvm,type=q35 \
     -cpu host \
     -smp 12 \
-    -m 12G \
+    -m 25G \
     -snapshot \
     -netdev user,id=net0 \
     -device virtio-net-pci,netdev=net0 \

From 43515faa108aeb5f650a78ab2f2728176ded4f29 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Fri, 31 Mar 2023 11:22:17 +0200
Subject: [PATCH 27/50] batch pokes

---
 proxy/guest/flextcp.c | 4 ++--
 proxy/host/ivshmem.c  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/proxy/guest/flextcp.c b/proxy/guest/flextcp.c
index 157ef943..8529f0bd 100644
--- a/proxy/guest/flextcp.c
+++ b/proxy/guest/flextcp.c
@@ -519,9 +519,9 @@ static int vflextcp_uxsocket_handle_msg(struct guest_proxy *pxy,
 static int vflextcp_tas_poke_poll(struct guest_proxy *pxy) {
   int n, i;
   struct poke_event *poke_ev;
-  struct epoll_event evs[32];
+  struct epoll_event evs[2];
 
-  n = epoll_wait(pxy->epfd, evs, 32, 0);
+  n = epoll_wait(pxy->epfd, evs, 2, 0);
   if (n < 0) 
   {
     perror("vflextcp_tas_poke_poll: epoll_wait");
diff --git a/proxy/host/ivshmem.c b/proxy/host/ivshmem.c
index db506c04..7945a99b 100644
--- a/proxy/host/ivshmem.c
+++ b/proxy/host/ivshmem.c
@@ -657,10 +657,10 @@ static int ctxs_poll()
     int i, n, ret;
     struct vmcontext_req *vctx;
     struct _msg;
-    struct epoll_event evs[32];
+    struct epoll_event evs[2];
     struct poke_app_ctx_msg msg;
 
-    n = epoll_wait(ctx_epfd, evs, 32, 0);
+    n = epoll_wait(ctx_epfd, evs, 2, 0);
 
     if (n < 0)
     {

From fe07992c82e45aae7318f5a6a10281769d91f26c Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Fri, 31 Mar 2023 11:24:31 +0200
Subject: [PATCH 28/50] flush output to log at each print

---
 experiments/components/client.py              |  19 ++++++---
 experiments/components/tas.py                 |   6 ++-
 .../exps/perf_iso_latconn/perf_iso_latconn.py |   8 ++--
 experiments/exps/perf_iso_latmsize/parse.py   |  10 +++--
 .../perf_iso_latmsize/perf_iso_latmsize.py    |   8 ++--
 experiments/exps/perf_iso_latmsize/plot.pdf   | Bin 12420 -> 0 bytes
 .../exps/perf_iso_latmsize/plot_script        |  37 +++++++++++++-----
 .../exps/perf_iso_tpmsize/perf_iso_tpmsize.py |  11 +++---
 experiments/run.py                            |   2 +-
 experiments/run_perf_iso.sh                   |   1 +
 images/start-vm.sh                            |   1 +
 11 files changed, 69 insertions(+), 34 deletions(-)
 delete mode 100644 experiments/exps/perf_iso_latmsize/plot.pdf

diff --git a/experiments/components/client.py b/experiments/components/client.py
index d4cdbd78..1848757e 100644
--- a/experiments/components/client.py
+++ b/experiments/components/client.py
@@ -33,11 +33,10 @@ def run_benchmark_rpc(self, w_sudo, ld_preload):
         self.pane.send_keys("cd " + self.client_config.tas_dir)
         time.sleep(3)
 
-        cmd = ''
-        stack = self.machine_config.stack
+        cmd = 'stdbuf -oL '
         
         if w_sudo:
-            cmd = 'sudo '
+            cmd += 'sudo '
         
         if ld_preload:
             cmd += 'LD_PRELOAD=' + self.client_config.lib_so + ' '
@@ -51,6 +50,14 @@ def run_benchmark_rpc(self, w_sudo, ld_preload):
         self.pane.send_keys(cmd)
     
     def save_log_virt(self, exp_path):
+        # kill process to force flush to file
+        # ssh_com = utils.get_ssh_command(self.machine_config, self.vm_config)
+        # ssh_com += " 'sudo pkill testclient'"
+        # self.save_logs_pane.send_keys(ssh_com)
+        # time.sleep(3)
+        # self.save_logs_pane.send_keys(suppress_history=False, cmd='tas')
+        # time.sleep(1)
+
         split_path = exp_path.split("/")
         n = len(split_path)
         
@@ -75,6 +82,9 @@ def save_log_virt(self, exp_path):
         time.sleep(1)
 
     def save_log_bare(self, exp_path):
+        # kill process to force flush to file
+        # self.save_logs_pane.send_keys("sudo pkill testclient")
+
         # self.exp_path is set in the run.py file
         split_path = exp_path.split("/")
         n = len(split_path)
@@ -84,5 +94,4 @@ def save_log_bare(self, exp_path):
             os.makedirs(out_dir)
 
         dest = out_dir + "/" + self.client_config.out_file
-        os.rename(self.client_config.out, dest)
-        os.remove(self.client_config.out)
\ No newline at end of file
+        os.rename(self.client_config.out, dest)
\ No newline at end of file
diff --git a/experiments/components/tas.py b/experiments/components/tas.py
index 834a8a1c..00cc0ce7 100644
--- a/experiments/components/tas.py
+++ b/experiments/components/tas.py
@@ -41,6 +41,9 @@ def run_virt(self):
                 save_log=True)
 
     def save_log_bare(self, exp_path):
+        # # kill process to force flush to file
+        # self.pane.send_keys("sudo pkill tas")
+        
         split_path = exp_path.split("/")
         n = len(split_path)
         
@@ -49,5 +52,4 @@ def save_log_bare(self, exp_path):
             os.makedirs(out_dir)
 
         dest = out_dir + "/" + self.tas_config.out_file
-        os.rename(self.tas_config.out, dest)
-        os.remove(self.client_config.out)
\ No newline at end of file
+        os.rename(self.tas_config.out, dest)
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_latconn/perf_iso_latconn.py b/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
index d1291b9c..cbfb6c7b 100644
--- a/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
+++ b/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
@@ -19,8 +19,8 @@
   ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n), name=exp_name)
 
   experiments.append(tas_bare_exp)
-  # experiments.append(vtas_bare_exp)
-  # experiments.append(tas_virt_exp)
-  # experiments.append(ovs_tas_exp)
-  # experiments.append(ovs_linux_exp)
+  experiments.append(vtas_bare_exp)
+  experiments.append(tas_virt_exp)
+  experiments.append(ovs_tas_exp)
+  experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/perf_iso_latmsize/parse.py b/experiments/exps/perf_iso_latmsize/parse.py
index d2749f1e..d73d36da 100644
--- a/experiments/exps/perf_iso_latmsize/parse.py
+++ b/experiments/exps/perf_iso_latmsize/parse.py
@@ -12,8 +12,8 @@
 # have a different message size
 def get_msize(fname):
   regex = "(?<=-msize)[0-9]*"
-  nconns = re.search(regex, fname).group(0)
-  return nconns
+  msize = re.search(regex, fname).group(0)
+  return msize
 
 def check_msize(data, msize):
   if msize not in data:
@@ -53,6 +53,10 @@ def parse_metadata():
 
   for f in os.listdir(dir_path):
     fname = os.fsdecode(f)
+    
+    if "tas_c" == fname:
+      continue
+
     msize = get_msize(fname)
     cid = putils.get_client_id(fname)
     nid = putils.get_node_id(fname)
@@ -85,7 +89,7 @@ def save_dat_file(exp_lats):
   header = "nconns bare-tas bare-vtas virt-tas ovs-linux ovs-tas\n"
   
   msizes = list(exp_lats.keys())
-  msizes = sorted(msizes) 
+  msizes = list(map(str, sorted(map(int, msizes))))
   stacks =  list(exp_lats[msizes[0]].keys())
   percentiles =  list(exp_lats[msizes[0]][stacks[0]].keys())
 
diff --git a/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py b/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py
index 2c9e4871..12f95188 100644
--- a/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py
+++ b/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py
@@ -18,9 +18,9 @@
   ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n), name=exp_name)
   ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n), name=exp_name)
 
-  # experiments.append(tas_bare_exp)
-  # experiments.append(vtas_bare_exp)
+  experiments.append(tas_bare_exp)
+  experiments.append(vtas_bare_exp)
   experiments.append(tas_virt_exp)
-  # experiments.append(ovs_tas_exp)
-  # experiments.append(ovs_linux_exp)
+  experiments.append(ovs_tas_exp)
+  experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/perf_iso_latmsize/plot.pdf b/experiments/exps/perf_iso_latmsize/plot.pdf
deleted file mode 100644
index 8b27073f3f66aca9a950d6eebf661b6aace5ba6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12420
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
G+W!G~k8?u+

diff --git a/experiments/exps/perf_iso_latmsize/plot_script b/experiments/exps/perf_iso_latmsize/plot_script
index 46bdcd95..707e2650 100644
--- a/experiments/exps/perf_iso_latmsize/plot_script
+++ b/experiments/exps/perf_iso_latmsize/plot_script
@@ -2,8 +2,12 @@
 set terminal pdf
 set output "plot.pdf"
 set colorsequence podo
+set logscale x 2
 set key autotitle columnhead
-set key left top
+
+set title font "Computer Modern Roman,6"
+set key font "Computer Modern Roman,6"
+set ytics font "Computer Modern Roman,6"
 
 # margins: left,right,bottom,top
 # spacing: xspacing,yspacing
@@ -11,39 +15,54 @@ set multiplot layout 2,2 \
               margins 0.1,0.95,0.15,0.90 \
               spacing 0.1,0.07
               
-set label 1 "Aggressor Client Message Size (Bytes)" at screen 0.5, 0.03 center
-set label 2 "Victim Client Latency (µs)" at screen 0.01, 0.5 rotate by 90 center
+set label 1 "Aggressor Client Message Size (Bytes)" at screen 0.5, 0.03 center font "Computer Modern Roman,8"
+set label 2 "Victim Client Latency (µs)" at screen 0.01, 0.5 rotate by 90 center font "Computer Modern Roman,8"
 
 set title offset 0,-0.6
 
 # Plot 50p latency
 unset xtics
+set key center left
 set yrange [0:]
 set title "50p Latency"
-plot 'lat_50p.dat' using 1:2 title 'bare-tas' linetype 2 ps 0.3 w lp, \
-     'lat_50p.dat' using 1:3 title 'bare-vtas' linetype 3 ps 0.3 w lp, \
-     'lat_50p.dat' using 1:4 title 'virt-tas' linetype 4 ps 0.3 w lp, \
+plot 'lat_50p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
+     'lat_50p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
+     'lat_50p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_50p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
+     'lat_50p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
 
 # Plot 90p latency
 unset xtics
+set key top right
 set yrange [0:]
 set title "90p Latency"
-plot 'lat_90p.dat' using 1:2 title 'bare-tas' linetype 2 ps 0.3 w lp, \
-     'lat_90p.dat' using 1:3 title 'bare-vtas' linetype 3 ps 0.3 w lp, \
-     'lat_90p.dat' using 1:4 title 'virt-tas' linetype 4 ps 0.3 w lp, \
+plot 'lat_90p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
+     'lat_90p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
+     'lat_90p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_90p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
+     'lat_90p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
+
 
 # Plot 99p latency
 set xtics
+set xtics font "Computer Modern Roman,6"
+set key center left
 set yrange [0:]
 set title "99p Latency"
 plot 'lat_99p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
      'lat_99p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
      'lat_99p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_99p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
+     'lat_99p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
 
 # Plot 99.9p latency
 set xtics
+set xtics font "Computer Modern Roman,6"
+set key center right
 set yrange [0:]
 set title "99.9p Latency"
 plot 'lat_99.9p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
      'lat_99.9p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
      'lat_99.9p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_99.9p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
+     'lat_99.9p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
diff --git a/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py b/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
index 3cc45107..92958476 100644
--- a/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
+++ b/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
@@ -8,8 +8,7 @@
 
 experiments = []
 
-# msize = [64, 128, 256, 512, 1024, 2048]
-msize = [2048]
+msize = [64, 128, 256, 512, 1024, 2048]
 
 for n in msize:
   exp_name = "perf-iso-tpconn-msize{}_".format(n)
@@ -20,8 +19,8 @@
   ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n), name=exp_name)
 
   experiments.append(tas_bare_exp)
-  # experiments.append(vtas_bare_exp)
-  # experiments.append(tas_virt_exp)
-  # experiments.append(ovs_tas_exp)
-  # experiments.append(ovs_linux_exp)
+  experiments.append(vtas_bare_exp)
+  experiments.append(tas_virt_exp)
+  experiments.append(ovs_tas_exp)
+  experiments.append(ovs_linux_exp)
   
diff --git a/experiments/run.py b/experiments/run.py
index f28b449d..de21a74b 100644
--- a/experiments/run.py
+++ b/experiments/run.py
@@ -56,5 +56,5 @@
     print(e.get_name()) 
     time.sleep(80)
     e.save_logs()
-    time.sleep(3)
+    time.sleep(15)
     e.reset()
\ No newline at end of file
diff --git a/experiments/run_perf_iso.sh b/experiments/run_perf_iso.sh
index 34334e16..8686af5c 100644
--- a/experiments/run_perf_iso.sh
+++ b/experiments/run_perf_iso.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
 python run.py exps/perf_iso_tpconn/perf_iso_tpconn.py
+python run.py exps/perf_iso_tpmsize/perf_iso_tpmsize.py
 python run.py exps/perf_iso_latconn/perf_iso_latconn.py
 python run.py exps/perf_iso_latmsize/perf_iso_latmsize.py
diff --git a/images/start-vm.sh b/images/start-vm.sh
index 4ea361e4..9b1cc42b 100755
--- a/images/start-vm.sh
+++ b/images/start-vm.sh
@@ -31,6 +31,7 @@ if [[ "$stack" == 'virt-tas' ]]; then
     -cpu host \
     -smp 12 \
     -m 25G \
+    -snapshot \
     -device virtio-net-pci,netdev=net0 \
     -netdev user,id=net0,hostfwd=tcp::222${vm_id}-:22 \
     -chardev socket,path="/run/tasproxy",id="tas" \

From 47d6d9f5b31c0e6f4b9e04caae54837c58abb82b Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Fri, 31 Mar 2023 17:11:01 +0200
Subject: [PATCH 29/50] Set mutex type to normal instead of default

---
 proxy/guest/flextcp.c |  3 +--
 proxy/host/ivshmem.c  |  7 +++----
 proxy/shmring.c       | 10 +++++++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/proxy/guest/flextcp.c b/proxy/guest/flextcp.c
index 8529f0bd..975aa6e5 100644
--- a/proxy/guest/flextcp.c
+++ b/proxy/guest/flextcp.c
@@ -338,8 +338,7 @@ static int vflextcp_uxsocket_accept(struct guest_proxy *pxy)
         "failed to write req_msg to chan.\n");
     return -1;
   }
-  /* Notify host and retrieve response from channel to continue
-     registration */
+  /* Notify host */
   ivshmem_notify_host(pxy);
 
   return 0;
diff --git a/proxy/host/ivshmem.c b/proxy/host/ivshmem.c
index 7945a99b..68a503ae 100644
--- a/proxy/host/ivshmem.c
+++ b/proxy/host/ivshmem.c
@@ -42,7 +42,7 @@ static int uxsocket_handle_error();
 static int uxsocket_send_int(int fd, int64_t i);
 static int uxsocket_sendfd(int uxfd, int fd, int64_t i);
 
-static int ctxs_poll();
+static int app_ctxs_poll();
 
 static int channel_poll();
 static int channel_poll_vm(struct v_machine *vm);
@@ -130,7 +130,7 @@ int ivshmem_poll()
         return -1;
     }
 
-    if (ctxs_poll() != 0) 
+    if (app_ctxs_poll() != 0) 
     {
         fprintf(stderr, "ivshmem_poll: failed to poll ctxs fds.\n");
         return -1;
@@ -629,7 +629,6 @@ static int channel_handle_newapp(struct v_machine *vm,
 
     notify_guest(vm->ifd);
 
-
     return 0;
 }
 
@@ -652,7 +651,7 @@ static void channel_handle_poke_tas_core(struct v_machine *vm,
 /*****************************************************************************/
 /* App contexts */
 
-static int ctxs_poll() 
+static int app_ctxs_poll() 
 {
     int i, n, ret;
     struct vmcontext_req *vctx;
diff --git a/proxy/shmring.c b/proxy/shmring.c
index c5167581..5543c8c1 100644
--- a/proxy/shmring.c
+++ b/proxy/shmring.c
@@ -358,7 +358,15 @@ pthread_mutexattr_t * init_mutex_attr()
   {
     fprintf(stderr, "init_mutex_attr: failed to set attr to shared.\n");
     goto free_attr;
-  };
+  }
+
+  // Set mutex to normal type. Default type may have underfined behaviour
+  // when relocking
+  if (pthread_mutexattr_settype(attr, PTHREAD_MUTEX_NORMAL) < 0)
+  {
+    fprintf(stderr, "init_mutex_attr: failed to set mutex type to normal.\n");
+    goto free_attr;
+  }
   
   // Subsequent attempts to lock will succeed if process dies with lock
   if (pthread_mutexattr_setrobust(attr, PTHREAD_MUTEX_ROBUST) < 0)

From 5233bcc5315ea285b71f61df063eabf1f042b85e Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Fri, 31 Mar 2023 18:12:43 +0200
Subject: [PATCH 30/50] only initialize mutex on tx ring in each side

---
 proxy/channel.c |  2 --
 proxy/shmring.c | 28 ++++++++++++----------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/proxy/channel.c b/proxy/channel.c
index d78b400e..fb9022ea 100644
--- a/proxy/channel.c
+++ b/proxy/channel.c
@@ -18,8 +18,6 @@ struct channel * channel_init(void* tx_addr, void* rx_addr, uint64_t size)
     goto free_chan;
   }
 
-  /* Only init the tx channel, since the other side will
-     already have initialized the rx channel */
   tx_buf = shmring_init(tx_addr, CHAN_SIZE);
   if (tx_buf == NULL)
   {
diff --git a/proxy/shmring.c b/proxy/shmring.c
index 5543c8c1..e5b851f1 100644
--- a/proxy/shmring.c
+++ b/proxy/shmring.c
@@ -16,8 +16,6 @@ pthread_mutexattr_t * init_mutex_attr();
 struct ring_buffer* shmring_init(void *base_addr, size_t size)
 {
     struct ring_buffer *ring;
-    struct ring_header *hdr;
-    pthread_mutexattr_t *attr;
 
     ring = (struct ring_buffer *) malloc(sizeof(struct ring_buffer));
     if (ring == NULL)
@@ -30,31 +28,29 @@ struct ring_buffer* shmring_init(void *base_addr, size_t size)
     ring->buf_addr = base_addr + sizeof(struct ring_header);
     ring->size = size;
 
+    return ring;
+}
+
+/* Resets read and write pos to zero and sets ring size to full */
+void shmring_reset(struct ring_buffer *ring, size_t size)
+{
+    pthread_mutexattr_t *attr;
+    struct ring_header *hdr = ring->hdr_addr;
+
     if ((attr = init_mutex_attr()) == NULL)
     {
       fprintf(stderr, "shmring_init: failed to init mutex attr.\n");
-      return NULL;
+      return;
     }
 
     hdr = ring->hdr_addr;
     if (pthread_mutex_init(&hdr->mux, attr) < 0)
     {
       fprintf(stderr, "shmring_init: failed to init mutex.\n");
-      goto free_attr;
+      free(attr);
+      return;
     }
 
-    return ring;
-
-free_attr:
-    free(attr);
-    return NULL;
-}
-
-/* Resets read and write pos to zero and sets ring size to full */
-void shmring_reset(struct ring_buffer *ring, size_t size)
-{
-    struct ring_header *hdr = ring->hdr_addr;
-
     hdr->read_pos = 0;
     hdr->write_pos = 0;
     hdr->full = 0;

From 158a1883b82ebdaa7633d498ba8ff9a81f4d1151 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Sat, 1 Apr 2023 17:56:06 +0200
Subject: [PATCH 31/50] do all channel initialization that involves writing to
 shm in host proxy

---
 proxy/channel.c      |  4 ---
 proxy/host/ivshmem.c |  7 +++++
 proxy/shmring.c      | 75 ++++++++++++++++++++++++--------------------
 proxy/shmring.h      |  1 +
 4 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/proxy/channel.c b/proxy/channel.c
index fb9022ea..e0f35789 100644
--- a/proxy/channel.c
+++ b/proxy/channel.c
@@ -32,10 +32,6 @@ struct channel * channel_init(void* tx_addr, void* rx_addr, uint64_t size)
     goto free_tx_buf;
   }
 
-  /* Only reset tx_ring since other side will have already
-     reset the rx_ring */
-  shmring_reset(tx_buf, CHAN_SIZE);
-
   chan->tx = tx_buf;
   chan->rx = rx_buf; 
   return chan;
diff --git a/proxy/host/ivshmem.c b/proxy/host/ivshmem.c
index 68a503ae..60b43917 100644
--- a/proxy/host/ivshmem.c
+++ b/proxy/host/ivshmem.c
@@ -370,6 +370,12 @@ static int uxsocket_accept()
         goto close_ifd;
     }
 
+    shmring_reset(chan->tx, CHAN_SIZE);
+    shmring_reset(chan->rx, CHAN_SIZE);
+
+    shmring_init_mux(chan->tx);
+    shmring_init_mux(chan->rx);
+
     /* Write number of cores to channel for guest proxy to receive */
     h_msg.msg_type = MSG_TYPE_HELLO;
     h_msg.n_cores = flexnic_info_pxy->cores_num;
@@ -629,6 +635,7 @@ static int channel_handle_newapp(struct v_machine *vm,
 
     notify_guest(vm->ifd);
 
+    printf("REGISTERED APP IN VM=%d\n", vm->id);
     return 0;
 }
 
diff --git a/proxy/shmring.c b/proxy/shmring.c
index e5b851f1..5f7c2484 100644
--- a/proxy/shmring.c
+++ b/proxy/shmring.c
@@ -15,46 +15,31 @@ pthread_mutexattr_t * init_mutex_attr();
 
 struct ring_buffer* shmring_init(void *base_addr, size_t size)
 {
-    struct ring_buffer *ring;
+  struct ring_buffer *ring;
 
-    ring = (struct ring_buffer *) malloc(sizeof(struct ring_buffer));
-    if (ring == NULL)
-    {
-      fprintf(stderr, "shmring_init: failed to allocate ring buffer.\n");
-      return NULL;
-    }
+  ring = (struct ring_buffer *) malloc(sizeof(struct ring_buffer));
+  if (ring == NULL)
+  {
+    fprintf(stderr, "shmring_init: failed to allocate ring buffer.\n");
+    return NULL;
+  }
 
-    ring->hdr_addr = base_addr;
-    ring->buf_addr = base_addr + sizeof(struct ring_header);
-    ring->size = size;
+  ring->hdr_addr = base_addr;
+  ring->buf_addr = base_addr + sizeof(struct ring_header);
+  ring->size = size;
 
-    return ring;
+  return ring;
 }
 
 /* Resets read and write pos to zero and sets ring size to full */
 void shmring_reset(struct ring_buffer *ring, size_t size)
 {
-    pthread_mutexattr_t *attr;
-    struct ring_header *hdr = ring->hdr_addr;
-
-    if ((attr = init_mutex_attr()) == NULL)
-    {
-      fprintf(stderr, "shmring_init: failed to init mutex attr.\n");
-      return;
-    }
-
-    hdr = ring->hdr_addr;
-    if (pthread_mutex_init(&hdr->mux, attr) < 0)
-    {
-      fprintf(stderr, "shmring_init: failed to init mutex.\n");
-      free(attr);
-      return;
-    }
-
-    hdr->read_pos = 0;
-    hdr->write_pos = 0;
-    hdr->full = 0;
-    hdr->ring_size = size - sizeof(struct ring_header);
+  struct ring_header *hdr = ring->hdr_addr;
+
+  hdr->read_pos = 0;
+  hdr->write_pos = 0;
+  hdr->full = 0;
+  hdr->ring_size = size - sizeof(struct ring_header);
 }
 
 int shmring_is_empty(struct ring_buffer *ring)
@@ -69,6 +54,28 @@ int shmring_is_empty(struct ring_buffer *ring)
   return 0;
 }
 
+int shmring_init_mux(struct ring_buffer *ring)
+{
+  struct ring_header *hdr = ring->hdr_addr;
+  pthread_mutexattr_t *attr; 
+
+  if ((attr = init_mutex_attr()) == NULL)
+  {
+    fprintf(stderr, "shmring_init: failed to init mutex attr.\n");
+    return -1;
+  }
+
+  hdr = ring->hdr_addr;
+  if (pthread_mutex_init(&hdr->mux, attr) < 0)
+  {
+    fprintf(stderr, "shmring_init: failed to init mutex.\n");
+    free(attr);
+    return -1;
+  }
+
+  return 0;
+}
+
 int shmring_lock(struct ring_buffer *ring)
 {
   struct ring_header *hdr = ring->hdr_addr;
@@ -356,8 +363,8 @@ pthread_mutexattr_t * init_mutex_attr()
     goto free_attr;
   }
 
-  // Set mutex to normal type. Default type may have underfined behaviour
-  // when relocking
+  /* Set mutex to normal type. Default type may have 
+     underfined behaviour when relocking */
   if (pthread_mutexattr_settype(attr, PTHREAD_MUTEX_NORMAL) < 0)
   {
     fprintf(stderr, "init_mutex_attr: failed to set mutex type to normal.\n");
diff --git a/proxy/shmring.h b/proxy/shmring.h
index 3be15033..0916c154 100644
--- a/proxy/shmring.h
+++ b/proxy/shmring.h
@@ -21,6 +21,7 @@ struct ring_buffer {
 struct ring_buffer* shmring_init(void *base_addr, size_t size);
 void shmring_reset(struct ring_buffer *ring, size_t size);
 int shmring_is_empty(struct ring_buffer *ring);
+int shmring_init_mux(struct ring_buffer *ring);
 int shmring_lock(struct ring_buffer *ring);
 int shmring_unlock(struct ring_buffer *ring);
 size_t shmring_pop(struct ring_buffer *rx_ring, void *buf, size_t size);

From acf718f51edfb6bbcaac37438009d5d01ac75b12 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Sun, 2 Apr 2023 00:19:40 +0200
Subject: [PATCH 32/50] read more than one message

---
 proxy/channel.c       | 15 +++------------
 proxy/guest/flextcp.c |  4 ++--
 proxy/guest/guest.c   | 13 +++++++++++--
 proxy/guest/ivshmem.c |  2 +-
 proxy/host/ivshmem.c  | 15 ++++++++++-----
 proxy/proxy.h         |  2 ++
 6 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/proxy/channel.c b/proxy/channel.c
index e0f35789..fc56c135 100644
--- a/proxy/channel.c
+++ b/proxy/channel.c
@@ -47,20 +47,11 @@ struct channel * channel_init(void* tx_addr, void* rx_addr, uint64_t size)
 
 size_t channel_write(struct channel *chan, void *buf, size_t size)
 {
-  size_t free_sz;
   size_t ret;
 
-  /* If channel is full try again until
-     a read clears enough space */
-  do {
-    shmring_lock(chan->tx);
-    free_sz = shmring_get_freesz(chan->tx);
-
-    if (free_sz >= size)
-      ret = shmring_push(chan->tx, buf, size);
-
-    shmring_unlock(chan->tx);
-  } while(free_sz < size);
+  shmring_lock(chan->tx);
+  ret = shmring_push(chan->tx, buf, size);
+  shmring_unlock(chan->tx);
 
   if (ret == 0)
   {
diff --git a/proxy/guest/flextcp.c b/proxy/guest/flextcp.c
index 975aa6e5..70851560 100644
--- a/proxy/guest/flextcp.c
+++ b/proxy/guest/flextcp.c
@@ -518,9 +518,9 @@ static int vflextcp_uxsocket_handle_msg(struct guest_proxy *pxy,
 static int vflextcp_tas_poke_poll(struct guest_proxy *pxy) {
   int n, i;
   struct poke_event *poke_ev;
-  struct epoll_event evs[2];
+  struct epoll_event evs[1];
 
-  n = epoll_wait(pxy->epfd, evs, 2, 0);
+  n = epoll_wait(pxy->epfd, evs, 1, 0);
   if (n < 0) 
   {
     perror("vflextcp_tas_poke_poll: epoll_wait");
diff --git a/proxy/guest/guest.c b/proxy/guest/guest.c
index bc80f042..7d9e1444 100644
--- a/proxy/guest/guest.c
+++ b/proxy/guest/guest.c
@@ -50,7 +50,8 @@ struct guest_proxy *guest_init_proxy()
 
 int main(int argc, char *argv[])
 {
-  unsigned int n;
+  int ret;
+  unsigned int n, i;
   struct guest_proxy *pxy = guest_init_proxy();
 
   if (ivshmem_init(pxy) < 0)
@@ -69,7 +70,15 @@ int main(int argc, char *argv[])
   while (exited == 0)
   {
     n = 0;
-    n += ivshmem_channel_poll(pxy);
+
+    for (i = 0; i < CHANNEL_POLL_ROUNDS; i++)
+    {
+      ret = ivshmem_channel_poll(pxy);
+      n += ret;
+      if (ret == 0)
+        break;
+    }
+
     n += vflextcp_poll(pxy);
   }
 
diff --git a/proxy/guest/ivshmem.c b/proxy/guest/ivshmem.c
index 6a8404c9..eaed6a23 100644
--- a/proxy/guest/ivshmem.c
+++ b/proxy/guest/ivshmem.c
@@ -125,7 +125,7 @@ int ivshmem_channel_poll(struct guest_proxy *pxy)
       fprintf(stderr, "ivshmem_channel_poll: unknown message.\n");
   }
 
-  return 0;
+  return 1;
 }
 
 static int channel_handle_hello(struct guest_proxy *pxy)
diff --git a/proxy/host/ivshmem.c b/proxy/host/ivshmem.c
index 60b43917..7576c532 100644
--- a/proxy/host/ivshmem.c
+++ b/proxy/host/ivshmem.c
@@ -426,7 +426,7 @@ static int uxsocket_handle_error()
 
 static int channel_poll()
 {
-    int i;
+    int i, j, ret;
     struct v_machine *vm;
 
     for(i = 0; i < next_vm_id; i++)
@@ -434,7 +434,12 @@ static int channel_poll()
         vm = &vms[i];
         if (vm != NULL)
         {
-            channel_poll_vm(vm);
+            for (j = 0; j < CHANNEL_POLL_ROUNDS; j++)
+            {
+                ret = channel_poll_vm(vm);
+                if (ret == 0)
+                    break;
+            }
         }
     }
 
@@ -489,7 +494,7 @@ static int channel_poll_vm(struct v_machine *vm)
             fprintf(stderr, "ivshmem_uxsocket_handle_msg: unknown message.\n");
     }
 
-    return 0;
+    return 1;
 }
 
 /* Handles tasinfo request */
@@ -663,10 +668,10 @@ static int app_ctxs_poll()
     int i, n, ret;
     struct vmcontext_req *vctx;
     struct _msg;
-    struct epoll_event evs[2];
+    struct epoll_event evs[1];
     struct poke_app_ctx_msg msg;
 
-    n = epoll_wait(ctx_epfd, evs, 2, 0);
+    n = epoll_wait(ctx_epfd, evs, 1, 0);
 
     if (n < 0)
     {
diff --git a/proxy/proxy.h b/proxy/proxy.h
index be554a88..23bf486f 100644
--- a/proxy/proxy.h
+++ b/proxy/proxy.h
@@ -8,6 +8,8 @@
 
 #define HOST_PEERID 255
 
+#define CHANNEL_POLL_ROUNDS 10
+
 struct proxy_context_req {
   int actx_evfd;
   int ctxreq_id;

From 40a277380a9d6d429e051cf88978d6af2f924a20 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Sun, 2 Apr 2023 12:23:48 +0200
Subject: [PATCH 33/50] mark values in ring as volatile

---
 proxy/shmring.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/proxy/shmring.h b/proxy/shmring.h
index 0916c154..b99c91b9 100644
--- a/proxy/shmring.h
+++ b/proxy/shmring.h
@@ -5,10 +5,10 @@
 #include <pthread.h>
 
 struct ring_header {
-  int write_pos;
-  int read_pos;
-  int full;
-  size_t ring_size;
+  volatile int write_pos;
+  volatile int read_pos;
+  volatile int full;
+  volatile size_t ring_size;
   pthread_mutex_t mux;
 } __attribute__((packed));
 

From 5c3fc38ee1b9d537170f550ff26ebb25ebbde1aa Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Sun, 2 Apr 2023 13:16:58 +0200
Subject: [PATCH 34/50] mark channel as not pull after every pop and go back to
 waiting to write until there is free space

---
 proxy/channel.c       | 14 ++++++++++----
 proxy/guest/flextcp.c |  4 ++--
 proxy/guest/guest.c   | 13 ++-----------
 proxy/host/ivshmem.c  | 18 +++++++++---------
 proxy/proxy.h         |  2 --
 proxy/shmring.c       | 14 ++------------
 proxy/shmring.h       |  8 ++++----
 7 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/proxy/channel.c b/proxy/channel.c
index fc56c135..072b5c90 100644
--- a/proxy/channel.c
+++ b/proxy/channel.c
@@ -47,11 +47,17 @@ struct channel * channel_init(void* tx_addr, void* rx_addr, uint64_t size)
 
 size_t channel_write(struct channel *chan, void *buf, size_t size)
 {
-  size_t ret;
+  size_t ret, free_sz;
+
+  do {
+    shmring_lock(chan->tx);
+    free_sz = shmring_get_freesz(chan->tx);
 
-  shmring_lock(chan->tx);
-  ret = shmring_push(chan->tx, buf, size);
-  shmring_unlock(chan->tx);
+    if (free_sz >= size)
+      ret = shmring_push(chan->tx, buf, size);
+    
+    shmring_unlock(chan->tx);
+  } while(free_sz < size);
 
   if (ret == 0)
   {
diff --git a/proxy/guest/flextcp.c b/proxy/guest/flextcp.c
index 70851560..975aa6e5 100644
--- a/proxy/guest/flextcp.c
+++ b/proxy/guest/flextcp.c
@@ -518,9 +518,9 @@ static int vflextcp_uxsocket_handle_msg(struct guest_proxy *pxy,
 static int vflextcp_tas_poke_poll(struct guest_proxy *pxy) {
   int n, i;
   struct poke_event *poke_ev;
-  struct epoll_event evs[1];
+  struct epoll_event evs[2];
 
-  n = epoll_wait(pxy->epfd, evs, 1, 0);
+  n = epoll_wait(pxy->epfd, evs, 2, 0);
   if (n < 0) 
   {
     perror("vflextcp_tas_poke_poll: epoll_wait");
diff --git a/proxy/guest/guest.c b/proxy/guest/guest.c
index 7d9e1444..bc80f042 100644
--- a/proxy/guest/guest.c
+++ b/proxy/guest/guest.c
@@ -50,8 +50,7 @@ struct guest_proxy *guest_init_proxy()
 
 int main(int argc, char *argv[])
 {
-  int ret;
-  unsigned int n, i;
+  unsigned int n;
   struct guest_proxy *pxy = guest_init_proxy();
 
   if (ivshmem_init(pxy) < 0)
@@ -70,15 +69,7 @@ int main(int argc, char *argv[])
   while (exited == 0)
   {
     n = 0;
-
-    for (i = 0; i < CHANNEL_POLL_ROUNDS; i++)
-    {
-      ret = ivshmem_channel_poll(pxy);
-      n += ret;
-      if (ret == 0)
-        break;
-    }
-
+    n += ivshmem_channel_poll(pxy);
     n += vflextcp_poll(pxy);
   }
 
diff --git a/proxy/host/ivshmem.c b/proxy/host/ivshmem.c
index 7576c532..fe63c623 100644
--- a/proxy/host/ivshmem.c
+++ b/proxy/host/ivshmem.c
@@ -426,7 +426,7 @@ static int uxsocket_handle_error()
 
 static int channel_poll()
 {
-    int i, j, ret;
+    int i;
     struct v_machine *vm;
 
     for(i = 0; i < next_vm_id; i++)
@@ -434,12 +434,7 @@ static int channel_poll()
         vm = &vms[i];
         if (vm != NULL)
         {
-            for (j = 0; j < CHANNEL_POLL_ROUNDS; j++)
-            {
-                ret = channel_poll_vm(vm);
-                if (ret == 0)
-                    break;
-            }
+            channel_poll_vm(vm);
         }
     }
 
@@ -476,18 +471,23 @@ static int channel_poll_vm(struct v_machine *vm)
     switch(msg_type)
     {
         case MSG_TYPE_TASINFO_REQ:
+            printf("MSG_TYPE_TASINFO_REQ\n");
             channel_handle_tasinforeq_msg(vm);
             break;
         case MSG_TYPE_CONTEXT_REQ:
+            printf("MSG_TYPE_CONTEXT_REQ\n");
             channel_handle_ctx_req(vm, msg);
             break;
         case MSG_TYPE_NEWAPP_REQ:
+            printf("MSG_TYPE_NEWAPP_REQ\n");
             channel_handle_newapp(vm, msg);
             break;
         case MSG_TYPE_POKE_TAS_CORE:
+            printf("MSG_TYPE_POKE_TAS_CORE\n");
             channel_handle_poke_tas_core(vm, msg);
             break;
         case MSG_TYPE_POKE_TAS_KERNEL:
+            printf("MSG_TYPE_POKE_TAS_KERNEL\n");
             channel_handle_poke_tas_kernel(vm, msg);
             break;
         default:
@@ -668,10 +668,10 @@ static int app_ctxs_poll()
     int i, n, ret;
     struct vmcontext_req *vctx;
     struct _msg;
-    struct epoll_event evs[1];
+    struct epoll_event evs[2];
     struct poke_app_ctx_msg msg;
 
-    n = epoll_wait(ctx_epfd, evs, 1, 0);
+    n = epoll_wait(ctx_epfd, evs, 2, 0);
 
     if (n < 0)
     {
diff --git a/proxy/proxy.h b/proxy/proxy.h
index 23bf486f..be554a88 100644
--- a/proxy/proxy.h
+++ b/proxy/proxy.h
@@ -8,8 +8,6 @@
 
 #define HOST_PEERID 255
 
-#define CHANNEL_POLL_ROUNDS 10
-
 struct proxy_context_req {
   int actx_evfd;
   int ctxreq_id;
diff --git a/proxy/shmring.c b/proxy/shmring.c
index 5f7c2484..10c6960d 100644
--- a/proxy/shmring.c
+++ b/proxy/shmring.c
@@ -132,12 +132,7 @@ size_t shmring_pop(struct ring_buffer *rx_ring, void *dst, size_t size)
 
   hdr->read_pos += size;
   hdr->read_pos %= hdr->ring_size;
-
-  /* Mark the ring as not full */
-  if (hdr->write_pos != hdr->read_pos)
-  {
-    hdr->full = 0;
-  }
+  hdr->full = 0;
 
   return size;
 }
@@ -171,12 +166,7 @@ size_t pop_fragmented(struct ring_buffer *rx_ring,
 
   hdr->read_pos += size;
   hdr->read_pos %= hdr->ring_size;
-
-  /* Mark the ring as not full */
-  if (hdr->write_pos != hdr->read_pos)
-  {
-    hdr->full = 0;
-  }
+  hdr->full = 0;
 
   return size;
 }
diff --git a/proxy/shmring.h b/proxy/shmring.h
index b99c91b9..0916c154 100644
--- a/proxy/shmring.h
+++ b/proxy/shmring.h
@@ -5,10 +5,10 @@
 #include <pthread.h>
 
 struct ring_header {
-  volatile int write_pos;
-  volatile int read_pos;
-  volatile int full;
-  volatile size_t ring_size;
+  int write_pos;
+  int read_pos;
+  int full;
+  size_t ring_size;
   pthread_mutex_t mux;
 } __attribute__((packed));
 

From 42d2995c5b74c88e5b3898529a7c59cc2a415b88 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Sun, 2 Apr 2023 21:22:47 +0200
Subject: [PATCH 35/50] fix tests from compiling and add tests to proxy shmring

---
 tests/bench_ll_echo.c       |   2 +-
 tests/libtas/tas_ll.c       |  10 +-
 tests/lowlevel.c            |   2 +-
 tests/lowlevel_echo.c       |   4 +-
 tests/rules.mk              |   9 +
 tests/tas_unit/activelist.c | 430 ++++++++++++++++++------------------
 tests/tas_unit/fastpath.c   |   5 +-
 tests/tas_unit/qman_rr.c    | 332 ++++++++++++++--------------
 tests/tas_unit/shmring.c    | 387 ++++++++++++++++++++++++++++++++
 9 files changed, 789 insertions(+), 392 deletions(-)
 create mode 100644 tests/tas_unit/shmring.c

diff --git a/tests/bench_ll_echo.c b/tests/bench_ll_echo.c
index 3a166d09..e17982b6 100644
--- a/tests/bench_ll_echo.c
+++ b/tests/bench_ll_echo.c
@@ -304,7 +304,7 @@ int main(int argc, char *argv[])
 
     for (i = 0; i < num_threads; i++) {
         cs->cn = i;
-        if (flextcp_context_create(&cs->context) != 0) {
+        if (flextcp_context_create(&cs->context, NULL, NULL) != 0) {
             fprintf(stderr, "flextcp_context_create failed %d\n", i);
             return EXIT_FAILURE;
         }
diff --git a/tests/libtas/tas_ll.c b/tests/libtas/tas_ll.c
index 6d90e97e..debc5fc6 100644
--- a/tests/libtas/tas_ll.c
+++ b/tests/libtas/tas_ll.c
@@ -23,7 +23,7 @@ static void test_poll_empty(void *p)
     test_error("flextcp_init failed");
 
   test_randinit(&ctx, sizeof(ctx));
-  if (flextcp_context_create(&ctx) != 0)
+  if (flextcp_context_create(&ctx, NULL, NULL) != 0)
     test_error("flextcp_context_create failed");
 
   num = flextcp_context_poll(&ctx, 4, evs);
@@ -47,7 +47,7 @@ static void test_connect_success(void *p)
     test_error("flextcp_init failed");
 
   test_randinit(&ctx, sizeof(ctx));
-  if (flextcp_context_create(&ctx) != 0)
+  if (flextcp_context_create(&ctx, NULL, NULL) != 0)
     test_error("flextcp_context_create failed");
 
   /* initiate connect */
@@ -107,7 +107,7 @@ static void test_connect_fail(void *p)
     test_error("flextcp_init failed");
 
   test_randinit(&ctx, sizeof(ctx));
-  if (flextcp_context_create(&ctx) != 0)
+  if (flextcp_context_create(&ctx, NULL, NULL) != 0)
     test_error("flextcp_context_create failed");
 
   /* initiate connect */
@@ -148,7 +148,7 @@ static void test_full_rxbuf(void *p)
     test_error("flextcp_init failed");
 
   test_randinit(&ctx, sizeof(ctx));
-  if (flextcp_context_create(&ctx) != 0)
+  if (flextcp_context_create(&ctx, NULL, NULL) != 0)
     test_error("flextcp_context_create failed");
 
   /* initiate connect */
@@ -249,7 +249,7 @@ static void test_full_txbuf(void *p)
     test_error("flextcp_init failed");
 
   test_randinit(&ctx, sizeof(ctx));
-  if (flextcp_context_create(&ctx) != 0)
+  if (flextcp_context_create(&ctx, NULL, NULL) != 0)
     test_error("flextcp_context_create failed");
 
   /* initiate connect */
diff --git a/tests/lowlevel.c b/tests/lowlevel.c
index 25a229d7..ee7ed5a3 100644
--- a/tests/lowlevel.c
+++ b/tests/lowlevel.c
@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
     return -1;
   }
 
-  if (flextcp_context_create(&ctx)) {
+  if (flextcp_context_create(&ctx, NULL, NULL)) {
     fprintf(stderr, "flextcp_context_create failed\n");
     return -1;
   }
diff --git a/tests/lowlevel_echo.c b/tests/lowlevel_echo.c
index 229d4160..2aa5e60d 100644
--- a/tests/lowlevel_echo.c
+++ b/tests/lowlevel_echo.c
@@ -149,12 +149,12 @@ int main(int argc, char *argv[])
   }
   port = atoi(argv[argc - 1]);
 
-  if (flextcp_init()) {
+  if (flextcp_init(0)) {
     fprintf(stderr, "flextcp_init failed\n");
     return -1;
   }
 
-  if (flextcp_context_create(&ctx)) {
+  if (flextcp_context_create(&ctx, NULL, NULL)) {
     fprintf(stderr, "flextcp_context_create failed\n");
     return -1;
   }
diff --git a/tests/rules.mk b/tests/rules.mk
index 84f8655c..a40a321b 100644
--- a/tests/rules.mk
+++ b/tests/rules.mk
@@ -25,6 +25,7 @@ TESTS_AUTO := \
   tests/libtas/tas_ll \
   tests/libtas/tas_sockets \
   tests/tas_unit/fastpath \
+  tests/tas_unit/shmring \
   tests/tas_unit/qman_rr \
   tests/tas_unit/activelist
 
@@ -65,6 +66,13 @@ tests/tas_unit/fastpath: LDLIBS+= -lrte_eal
 tests/tas_unit/fastpath: tests/tas_unit/fastpath.o tests/testutils.o \
   tas/fast/fast_flows.o
 
+tests/tas_unit/shmring: CPPFLAGS+= -Itas/include $(DPDK_CPPFLAGS)
+tests/tas_unit/shmring: CFLAGS+= $(DPDK_CFLAGS)
+tests/tas_unit/shmring: LDFLAGS+= $(DPDK_LDFLAGS)
+tests/tas_unit/shmring: LDLIBS+= -lrte_eal
+tests/tas_unit/shmring: tests/tas_unit/shmring.o tests/testutils.o \
+  proxy/shmring.o
+
 tests/tas_unit/qman_rr: CPPFLAGS+= -Itas/include -Ilib/tas/include/ $(DPDK_CPPFLAGS)
 tests/tas_unit/qman_rr: CFLAGS+= $(DPDK_CFLAGS)
 tests/tas_unit/qman_rr: LDFLAGS+= $(DPDK_LDFLAGS)
@@ -87,6 +95,7 @@ run-tests: $(TESTS_AUTO)
 	tests/libtas/tas_ll
 	tests/libtas/tas_sockets
 	tests/tas_unit/fastpath
+	tests/tas_unit/shmring
 	tests/tas_unit/qman_rr
 	tests/tas_unit/activelist
 
diff --git a/tests/tas_unit/activelist.c b/tests/tas_unit/activelist.c
index e71022fa..6ed1c978 100644
--- a/tests/tas_unit/activelist.c
+++ b/tests/tas_unit/activelist.c
@@ -16,7 +16,7 @@
 
 /* Redefined so tests compile properly */
 /***************************************************************************/
-void *tas_shm = (void *) 0;
+void **vm_shm = (void *) 0;
 struct flextcp_pl_mem state_base;
 struct flextcp_pl_mem *fp_state = &state_base;
 struct configuration config;
@@ -28,21 +28,21 @@ int fast_flows_bump(struct dataplane_context *ctx, uint32_t flow_id,
     return 0;
 }
 
-static void polled_app_init(struct polled_app *app, uint16_t id)
+static void polled_vm_init(struct polled_vm *vm, uint16_t id)
 {
-  app->id = id;
-  app->next = IDXLIST_INVAL;
-  app->prev = IDXLIST_INVAL;
-  app->flags = 0;
-  app->poll_next_ctx = 0;
-  app->act_ctx_head = IDXLIST_INVAL;
-  app->act_ctx_tail = IDXLIST_INVAL;
+  vm->id = id;
+  vm->next = IDXLIST_INVAL;
+  vm->prev = IDXLIST_INVAL;
+  vm->flags = 0;
+  vm->poll_next_ctx = 0;
+  vm->act_ctx_head = IDXLIST_INVAL;
+  vm->act_ctx_tail = IDXLIST_INVAL;
 }
 
-static void polled_ctx_init(struct polled_context *ctx, uint32_t id, uint32_t aid)
+static void polled_ctx_init(struct polled_context *ctx, uint32_t id, uint32_t vmid)
 {
   ctx->id = id;
-  ctx->aid = aid;
+  ctx->vmid = vmid;
   ctx->next = IDXLIST_INVAL;
   ctx->prev = IDXLIST_INVAL;
   ctx->flags = 0;
@@ -51,7 +51,7 @@ static void polled_ctx_init(struct polled_context *ctx, uint32_t id, uint32_t ai
 /***************************************************************************/
 
 
-void test_enqueue_app(void *arg)
+void test_enqueue_vm(void *arg)
 {
     struct dataplane_context *ctx;
     
@@ -60,40 +60,40 @@ void test_enqueue_app(void *arg)
 
     ctx->act_head = IDXLIST_INVAL;
     ctx->act_tail = IDXLIST_INVAL;
-    enqueue_app_to_active(ctx, 0);
-    test_assert("app 0  is head", ctx->act_head == 0);
-    test_assert("app 0  is tail", ctx->act_tail == 0);
-    test_assert("app 0 is active", 
-            (ctx->polled_apps[0].flags & FLAG_ACTIVE) != 0);
-    enqueue_app_to_active(ctx, 1);
-    test_assert("app 0  is head", ctx->act_head == 0);
-    test_assert("app 1  is tail", ctx->act_tail == 1);
-    test_assert("app 1 is active", 
-            (ctx->polled_apps[1].flags & FLAG_ACTIVE) != 0);
-    enqueue_app_to_active(ctx, 2);
-    test_assert("app 0  is head", ctx->act_head == 0);
-    test_assert("app 2  is tail", ctx->act_tail == 2);
-    test_assert("app 2 is active", 
-            (ctx->polled_apps[2].flags & FLAG_ACTIVE) != 0);
+    enqueue_vm_to_active(ctx, 0);
+    test_assert("vm 0  is head", ctx->act_head == 0);
+    test_assert("vm 0  is tail", ctx->act_tail == 0);
+    test_assert("vm 0 is active", 
+            (ctx->polled_vms[0].flags & FLAG_ACTIVE) != 0);
+    enqueue_vm_to_active(ctx, 1);
+    test_assert("vm 0  is head", ctx->act_head == 0);
+    test_assert("vm 1  is tail", ctx->act_tail == 1);
+    test_assert("vm 1 is active", 
+            (ctx->polled_vms[1].flags & FLAG_ACTIVE) != 0);
+    enqueue_vm_to_active(ctx, 2);
+    test_assert("vm 0  is head", ctx->act_head == 0);
+    test_assert("vm 2  is tail", ctx->act_tail == 2);
+    test_assert("vm 2 is active", 
+            (ctx->polled_vms[2].flags & FLAG_ACTIVE) != 0);
 }
 
 void test_enqueue_ctx(void *arg)
 {
-    struct polled_app *app0, *app1;
+    struct polled_vm *vm0, *vm1;
     struct dataplane_context *ctx;
 
     ctx = malloc(sizeof(*ctx));
     memset(ctx, 0, sizeof(*ctx));
 
-    app0 = &ctx->polled_apps[0];
-    app1 = &ctx->polled_apps[1];
+    vm0 = &ctx->polled_vms[0];
+    vm1 = &ctx->polled_vms[1];
     
-    polled_app_init(app0, 0);
-    polled_ctx_init(&app0->ctxs[0], 0, 0);
-    polled_ctx_init(&app0->ctxs[1], 1, 0);
+    polled_vm_init(vm0, 0);
+    polled_ctx_init(&vm0->ctxs[0], 0, 0);
+    polled_ctx_init(&vm0->ctxs[1], 1, 0);
 
-    polled_app_init(app1, 1);
-    polled_ctx_init(&app0->ctxs[0], 0, 1);
+    polled_vm_init(vm1, 1);
+    polled_ctx_init(&vm0->ctxs[0], 0, 1);
 
     ctx = malloc(sizeof(*ctx));
     memset(ctx, 0, sizeof(*ctx));
@@ -101,24 +101,24 @@ void test_enqueue_ctx(void *arg)
     ctx->act_head = IDXLIST_INVAL;
     ctx->act_tail = IDXLIST_INVAL;
 
-    enqueue_ctx_to_active(app0, 0);
-    test_assert("app0: ctx 0 is head", app0->act_ctx_head == 0);
-    test_assert("app0: ctx 0 is tail", app0->act_ctx_tail == 0);
-    test_assert("app0: ctx 0 is active", 
-            (app0->ctxs[0].flags & FLAG_ACTIVE) != 0);
-    enqueue_ctx_to_active(app0, 1);
-    test_assert("app0: ctx 0 is head", app0->act_ctx_head == 0);
-    test_assert("app0: ctx 1 is tail", app0->act_ctx_tail == 1);
-    test_assert("app0: ctx 1 is active", 
-            (app0->ctxs[1].flags & FLAG_ACTIVE) != 0);
-    enqueue_ctx_to_active(app1, 0);
-    test_assert("app1: ctx 0 is head", app1->act_ctx_head == 0);
-    test_assert("app1: ctx 0 is tail", app1->act_ctx_tail == 0);
-    test_assert("app1: ctx 0 is active", 
-            (app1->ctxs[0].flags & FLAG_ACTIVE) != 0);
+    enqueue_ctx_to_active(vm0, 0);
+    test_assert("vm0: ctx 0 is head", vm0->act_ctx_head == 0);
+    test_assert("vm0: ctx 0 is tail", vm0->act_ctx_tail == 0);
+    test_assert("vm0: ctx 0 is active", 
+            (vm0->ctxs[0].flags & FLAG_ACTIVE) != 0);
+    enqueue_ctx_to_active(vm0, 1);
+    test_assert("vm0: ctx 0 is head", vm0->act_ctx_head == 0);
+    test_assert("vm0: ctx 1 is tail", vm0->act_ctx_tail == 1);
+    test_assert("vm0: ctx 1 is active", 
+            (vm0->ctxs[1].flags & FLAG_ACTIVE) != 0);
+    enqueue_ctx_to_active(vm1, 0);
+    test_assert("vm1: ctx 0 is head", vm1->act_ctx_head == 0);
+    test_assert("vm1: ctx 0 is tail", vm1->act_ctx_tail == 0);
+    test_assert("vm1: ctx 0 is active", 
+            (vm1->ctxs[0].flags & FLAG_ACTIVE) != 0);
 }
 
-void test_remove_app(void *arg)
+void test_remove_vm(void *arg)
 {
     struct dataplane_context *ctx;
     
@@ -127,18 +127,18 @@ void test_remove_app(void *arg)
 
     ctx->act_head = IDXLIST_INVAL;
     ctx->act_tail = IDXLIST_INVAL;
-    enqueue_app_to_active(ctx, 0);
-    enqueue_app_to_active(ctx, 1);
-    enqueue_app_to_active(ctx, 2);
-
-    remove_app_from_active(ctx, &ctx->polled_apps[1]);
-    test_assert("app 0 is head", ctx->act_head == 0);
-    test_assert("app 2 is tail", ctx->act_tail == 2);
-    test_assert("app 1 is not active", 
-            (ctx->polled_apps[1].flags & FLAG_ACTIVE) == 0);
+    enqueue_vm_to_active(ctx, 0);
+    enqueue_vm_to_active(ctx, 1);
+    enqueue_vm_to_active(ctx, 2);
+
+    remove_vm_from_active(ctx, &ctx->polled_vms[1]);
+    test_assert("vm 0 is head", ctx->act_head == 0);
+    test_assert("vm 2 is tail", ctx->act_tail == 2);
+    test_assert("vm 1 is not active", 
+            (ctx->polled_vms[1].flags & FLAG_ACTIVE) == 0);
 }
 
-void test_remove_app_head(void *arg)
+void test_remove_vm_head(void *arg)
 {
     struct dataplane_context *ctx;
     
@@ -147,18 +147,18 @@ void test_remove_app_head(void *arg)
 
     ctx->act_head = IDXLIST_INVAL;
     ctx->act_tail = IDXLIST_INVAL;
-    enqueue_app_to_active(ctx, 0);
-    enqueue_app_to_active(ctx, 1);
-    enqueue_app_to_active(ctx, 2);
-
-    remove_app_from_active(ctx, &ctx->polled_apps[0]);
-    test_assert("app 1 is head", ctx->act_head == 1);
-    test_assert("app 2 is tail", ctx->act_tail == 2);
-    test_assert("app 0 is not active", 
-            (ctx->polled_apps[0].flags & FLAG_ACTIVE) == 0);
+    enqueue_vm_to_active(ctx, 0);
+    enqueue_vm_to_active(ctx, 1);
+    enqueue_vm_to_active(ctx, 2);
+
+    remove_vm_from_active(ctx, &ctx->polled_vms[0]);
+    test_assert("vm 1 is head", ctx->act_head == 1);
+    test_assert("vm 2 is tail", ctx->act_tail == 2);
+    test_assert("vm 0 is not active", 
+            (ctx->polled_vms[0].flags & FLAG_ACTIVE) == 0);
 }
 
-void test_remove_app_tail(void *arg)
+void test_remove_vm_tail(void *arg)
 {
     struct dataplane_context *ctx;
     
@@ -167,18 +167,18 @@ void test_remove_app_tail(void *arg)
 
     ctx->act_head = IDXLIST_INVAL;
     ctx->act_tail = IDXLIST_INVAL;
-    enqueue_app_to_active(ctx, 0);
-    enqueue_app_to_active(ctx, 1);
-    enqueue_app_to_active(ctx, 2);
-
-    remove_app_from_active(ctx, &ctx->polled_apps[2]);
-    test_assert("app 0 is head", ctx->act_head == 0);
-    test_assert("app 1 is tail", ctx->act_tail == 1);
-    test_assert("app 2 is not active", 
-            (ctx->polled_apps[2].flags & FLAG_ACTIVE) == 0);
+    enqueue_vm_to_active(ctx, 0);
+    enqueue_vm_to_active(ctx, 1);
+    enqueue_vm_to_active(ctx, 2);
+
+    remove_vm_from_active(ctx, &ctx->polled_vms[2]);
+    test_assert("vm 0 is head", ctx->act_head == 0);
+    test_assert("vm 1 is tail", ctx->act_tail == 1);
+    test_assert("vm 2 is not active", 
+            (ctx->polled_vms[2].flags & FLAG_ACTIVE) == 0);
 }
 
-void test_remove_app_one_elt(void *arg)
+void test_remove_vm_one_elt(void *arg)
 {
     struct dataplane_context *ctx;
     
@@ -187,16 +187,16 @@ void test_remove_app_one_elt(void *arg)
 
     ctx->act_head = IDXLIST_INVAL;
     ctx->act_tail = IDXLIST_INVAL;
-    enqueue_app_to_active(ctx, 0);
+    enqueue_vm_to_active(ctx, 0);
 
-    remove_app_from_active(ctx, &ctx->polled_apps[0]);
+    remove_vm_from_active(ctx, &ctx->polled_vms[0]);
     test_assert("head is invalid", ctx->act_head == IDXLIST_INVAL);
     test_assert("tail is invalid", ctx->act_tail == IDXLIST_INVAL);
-    test_assert("app 0 is not active", 
-            (ctx->polled_apps[0].flags & FLAG_ACTIVE) == 0);
+    test_assert("vm 0 is not active", 
+            (ctx->polled_vms[0].flags & FLAG_ACTIVE) == 0);
 }
 
-void test_remove_multiple_apps(void *arg)
+void test_remove_multiple_vms(void *arg)
 {
     struct dataplane_context *ctx;
     
@@ -205,43 +205,43 @@ void test_remove_multiple_apps(void *arg)
 
     ctx->act_head = IDXLIST_INVAL;
     ctx->act_tail = IDXLIST_INVAL;
-    enqueue_app_to_active(ctx, 0);
-    enqueue_app_to_active(ctx, 1);
-    enqueue_app_to_active(ctx, 2);
-
-    remove_app_from_active(ctx, &ctx->polled_apps[1]);
-    test_assert("app 0 is head", ctx->act_head == 0);
-    test_assert("app 2 is tail", ctx->act_tail == 2);
-    test_assert("app 1 is not active", 
-            (ctx->polled_apps[1].flags & FLAG_ACTIVE) == 0);
-
-    remove_app_from_active(ctx, &ctx->polled_apps[2]);
-    test_assert("app 0 is head", ctx->act_head == 0);
-    test_assert("app 0 is tail", ctx->act_tail == 0);
-    test_assert("app 2 is not active", 
-            (ctx->polled_apps[1].flags & FLAG_ACTIVE) == 0);
-
-    remove_app_from_active(ctx, &ctx->polled_apps[0]);
+    enqueue_vm_to_active(ctx, 0);
+    enqueue_vm_to_active(ctx, 1);
+    enqueue_vm_to_active(ctx, 2);
+
+    remove_vm_from_active(ctx, &ctx->polled_vms[1]);
+    test_assert("vm 0 is head", ctx->act_head == 0);
+    test_assert("vm 2 is tail", ctx->act_tail == 2);
+    test_assert("vm 1 is not active", 
+            (ctx->polled_vms[1].flags & FLAG_ACTIVE) == 0);
+
+    remove_vm_from_active(ctx, &ctx->polled_vms[2]);
+    test_assert("vm 0 is head", ctx->act_head == 0);
+    test_assert("vm 0 is tail", ctx->act_tail == 0);
+    test_assert("vm 2 is not active", 
+            (ctx->polled_vms[1].flags & FLAG_ACTIVE) == 0);
+
+    remove_vm_from_active(ctx, &ctx->polled_vms[0]);
     test_assert("head is invalid", ctx->act_head == IDXLIST_INVAL);
     test_assert("tail is invalid", ctx->act_tail == IDXLIST_INVAL);
-    test_assert("app 0 is not active", 
-            (ctx->polled_apps[0].flags & FLAG_ACTIVE) == 0);
+    test_assert("vm 0 is not active", 
+            (ctx->polled_vms[0].flags & FLAG_ACTIVE) == 0);
 }
 
 void test_remove_ctx(void *arg)
 {
-    struct polled_app *app0;
+    struct polled_vm *vm0;
     struct dataplane_context *ctx;
 
     ctx = malloc(sizeof(*ctx));
     memset(ctx, 0, sizeof(*ctx));
 
-    app0 = &ctx->polled_apps[0];
+    vm0 = &ctx->polled_vms[0];
     
-    polled_app_init(app0, 0);
-    polled_ctx_init(&app0->ctxs[0], 0, 0);
-    polled_ctx_init(&app0->ctxs[1], 1, 0);
-    polled_ctx_init(&app0->ctxs[2], 2, 0);
+    polled_vm_init(vm0, 0);
+    polled_ctx_init(&vm0->ctxs[0], 0, 0);
+    polled_ctx_init(&vm0->ctxs[1], 1, 0);
+    polled_ctx_init(&vm0->ctxs[2], 2, 0);
 
     ctx = malloc(sizeof(*ctx));
     memset(ctx, 0, sizeof(*ctx));
@@ -249,31 +249,31 @@ void test_remove_ctx(void *arg)
     ctx->act_head = IDXLIST_INVAL;
     ctx->act_tail = IDXLIST_INVAL;
 
-    enqueue_ctx_to_active(app0, 0);
-    enqueue_ctx_to_active(app0, 1);
-    enqueue_ctx_to_active(app0, 2);
+    enqueue_ctx_to_active(vm0, 0);
+    enqueue_ctx_to_active(vm0, 1);
+    enqueue_ctx_to_active(vm0, 2);
 
-    remove_ctx_from_active(app0, &app0->ctxs[1]);
-    test_assert("ctx0 is head", app0->act_ctx_head == 0);
-    test_assert("ctx2 is tail", app0->act_ctx_tail == 2);
+    remove_ctx_from_active(vm0, &vm0->ctxs[1]);
+    test_assert("ctx0 is head", vm0->act_ctx_head == 0);
+    test_assert("ctx2 is tail", vm0->act_ctx_tail == 2);
     test_assert("ctx1 is not active", 
-            (app0->ctxs[1].flags & FLAG_ACTIVE) == 0);
+            (vm0->ctxs[1].flags & FLAG_ACTIVE) == 0);
 }
 
 void test_remove_ctx_head(void *arg)
 {
-    struct polled_app *app0;
+    struct polled_vm *vm0;
     struct dataplane_context *ctx;
 
     ctx = malloc(sizeof(*ctx));
     memset(ctx, 0, sizeof(*ctx));
 
-    app0 = &ctx->polled_apps[0];
+    vm0 = &ctx->polled_vms[0];
     
-    polled_app_init(app0, 0);
-    polled_ctx_init(&app0->ctxs[0], 0, 0);
-    polled_ctx_init(&app0->ctxs[1], 1, 0);
-    polled_ctx_init(&app0->ctxs[2], 2, 0);
+    polled_vm_init(vm0, 0);
+    polled_ctx_init(&vm0->ctxs[0], 0, 0);
+    polled_ctx_init(&vm0->ctxs[1], 1, 0);
+    polled_ctx_init(&vm0->ctxs[2], 2, 0);
 
     ctx = malloc(sizeof(*ctx));
     memset(ctx, 0, sizeof(*ctx));
@@ -281,31 +281,31 @@ void test_remove_ctx_head(void *arg)
     ctx->act_head = IDXLIST_INVAL;
     ctx->act_tail = IDXLIST_INVAL;
 
-    enqueue_ctx_to_active(app0, 0);
-    enqueue_ctx_to_active(app0, 1);
-    enqueue_ctx_to_active(app0, 2);
+    enqueue_ctx_to_active(vm0, 0);
+    enqueue_ctx_to_active(vm0, 1);
+    enqueue_ctx_to_active(vm0, 2);
 
-    remove_ctx_from_active(app0, &app0->ctxs[0]);
-    test_assert("ctx1 is head", app0->act_ctx_head == 1);
-    test_assert("ctx2 is tail", app0->act_ctx_tail == 2);
+    remove_ctx_from_active(vm0, &vm0->ctxs[0]);
+    test_assert("ctx1 is head", vm0->act_ctx_head == 1);
+    test_assert("ctx2 is tail", vm0->act_ctx_tail == 2);
     test_assert("ctx0 is not active", 
-            (app0->ctxs[0].flags & FLAG_ACTIVE) == 0);
+            (vm0->ctxs[0].flags & FLAG_ACTIVE) == 0);
 }
 
 void test_remove_ctx_tail(void *arg)
 {
-    struct polled_app *app0;
+    struct polled_vm *vm0;
     struct dataplane_context *ctx;
 
     ctx = malloc(sizeof(*ctx));
     memset(ctx, 0, sizeof(*ctx));
 
-    app0 = &ctx->polled_apps[0];
+    vm0 = &ctx->polled_vms[0];
     
-    polled_app_init(app0, 0);
-    polled_ctx_init(&app0->ctxs[0], 0, 0);
-    polled_ctx_init(&app0->ctxs[1], 1, 0);
-    polled_ctx_init(&app0->ctxs[2], 2, 0);
+    polled_vm_init(vm0, 0);
+    polled_ctx_init(&vm0->ctxs[0], 0, 0);
+    polled_ctx_init(&vm0->ctxs[1], 1, 0);
+    polled_ctx_init(&vm0->ctxs[2], 2, 0);
 
     ctx = malloc(sizeof(*ctx));
     memset(ctx, 0, sizeof(*ctx));
@@ -313,29 +313,29 @@ void test_remove_ctx_tail(void *arg)
     ctx->act_head = IDXLIST_INVAL;
     ctx->act_tail = IDXLIST_INVAL;
 
-    enqueue_ctx_to_active(app0, 0);
-    enqueue_ctx_to_active(app0, 1);
-    enqueue_ctx_to_active(app0, 2);
+    enqueue_ctx_to_active(vm0, 0);
+    enqueue_ctx_to_active(vm0, 1);
+    enqueue_ctx_to_active(vm0, 2);
 
-    remove_ctx_from_active(app0, &app0->ctxs[2]);
-    test_assert("ctx0 is head", app0->act_ctx_head == 0);
-    test_assert("ctx1 is tail", app0->act_ctx_tail == 1);
+    remove_ctx_from_active(vm0, &vm0->ctxs[2]);
+    test_assert("ctx0 is head", vm0->act_ctx_head == 0);
+    test_assert("ctx1 is tail", vm0->act_ctx_tail == 1);
     test_assert("ctx2 is not active", 
-            (app0->ctxs[2].flags & FLAG_ACTIVE) == 0);
+            (vm0->ctxs[2].flags & FLAG_ACTIVE) == 0);
 }
 
 void test_remove_ctx_one_elt(void *arg)
 {
-    struct polled_app *app0;
+    struct polled_vm *vm0;
     struct dataplane_context *ctx;
 
     ctx = malloc(sizeof(*ctx));
     memset(ctx, 0, sizeof(*ctx));
 
-    app0 = &ctx->polled_apps[0];
+    vm0 = &ctx->polled_vms[0];
     
-    polled_app_init(app0, 0);
-    polled_ctx_init(&app0->ctxs[0], 0, 0);
+    polled_vm_init(vm0, 0);
+    polled_ctx_init(&vm0->ctxs[0], 0, 0);
 
     ctx = malloc(sizeof(*ctx));
     memset(ctx, 0, sizeof(*ctx));
@@ -343,35 +343,35 @@ void test_remove_ctx_one_elt(void *arg)
     ctx->act_head = IDXLIST_INVAL;
     ctx->act_tail = IDXLIST_INVAL;
 
-    enqueue_ctx_to_active(app0, 0);
+    enqueue_ctx_to_active(vm0, 0);
 
-    remove_ctx_from_active(app0, &app0->ctxs[0]);
-    test_assert("head is invalid", app0->act_ctx_head == IDXLIST_INVAL);
-    test_assert("tail is invalid", app0->act_ctx_tail == IDXLIST_INVAL);
+    remove_ctx_from_active(vm0, &vm0->ctxs[0]);
+    test_assert("head is invalid", vm0->act_ctx_head == IDXLIST_INVAL);
+    test_assert("tail is invalid", vm0->act_ctx_tail == IDXLIST_INVAL);
     test_assert("ctx0 is not active", 
-            (app0->ctxs[0].flags & FLAG_ACTIVE) == 0);
+            (vm0->ctxs[0].flags & FLAG_ACTIVE) == 0);
 }
 
 void test_remove_multiple_ctx(void *arg)
 {
-    struct polled_app *app0, *app1;
+    struct polled_vm *vm0, *vm1;
     struct dataplane_context *ctx;
 
     ctx = malloc(sizeof(*ctx));
     memset(ctx, 0, sizeof(*ctx));
 
-    app0 = &ctx->polled_apps[0];
-    app1 = &ctx->polled_apps[1];
+    vm0 = &ctx->polled_vms[0];
+    vm1 = &ctx->polled_vms[1];
     
-    polled_app_init(app0, 0);
-    polled_ctx_init(&app0->ctxs[0], 0, 0);
-    polled_ctx_init(&app0->ctxs[1], 1, 0);
-    polled_ctx_init(&app0->ctxs[2], 2, 0);
+    polled_vm_init(vm0, 0);
+    polled_ctx_init(&vm0->ctxs[0], 0, 0);
+    polled_ctx_init(&vm0->ctxs[1], 1, 0);
+    polled_ctx_init(&vm0->ctxs[2], 2, 0);
 
-    polled_app_init(app1, 1);
-    polled_ctx_init(&app1->ctxs[0], 0, 1);
-    polled_ctx_init(&app1->ctxs[1], 1, 1);
-    polled_ctx_init(&app1->ctxs[2], 2, 1);
+    polled_vm_init(vm1, 1);
+    polled_ctx_init(&vm1->ctxs[0], 0, 1);
+    polled_ctx_init(&vm1->ctxs[1], 1, 1);
+    polled_ctx_init(&vm1->ctxs[2], 2, 1);
 
     ctx = malloc(sizeof(*ctx));
     memset(ctx, 0, sizeof(*ctx));
@@ -379,76 +379,76 @@ void test_remove_multiple_ctx(void *arg)
     ctx->act_head = IDXLIST_INVAL;
     ctx->act_tail = IDXLIST_INVAL;
 
-    enqueue_ctx_to_active(app0, 0);
-    enqueue_ctx_to_active(app0, 1);
-    enqueue_ctx_to_active(app0, 2);
-
-    enqueue_ctx_to_active(app1, 0);
-    enqueue_ctx_to_active(app1, 1);
-    enqueue_ctx_to_active(app1, 2);
-
-    /* Remove contexts from app 0 */
-    remove_ctx_from_active(app0, &app0->ctxs[1]);
-    test_assert("app0: ctx0 is head", app0->act_ctx_head == 0);
-    test_assert("app0: ctx2 is tail", app0->act_ctx_tail == 2);
-    test_assert("app0: ctx1 is not active", 
-            (app0->ctxs[1].flags & FLAG_ACTIVE) == 0);
-
-    remove_ctx_from_active(app0, &app0->ctxs[2]);
-    test_assert("app0: ctx0 is head", app0->act_ctx_head == 0);
-    test_assert("app0: ctx0 is tail", app0->act_ctx_tail == 0);
-    test_assert("app0: ctx2 is not active", 
-            (app0->ctxs[2].flags & FLAG_ACTIVE) == 0);
-
-    remove_ctx_from_active(app0, &app0->ctxs[0]);
-    test_assert("app0: head is invalid", app0->act_ctx_head == IDXLIST_INVAL);
-    test_assert("app0: tail is invalid", app0->act_ctx_tail == IDXLIST_INVAL);
-    test_assert("app0: ctx0 is not active", 
-            (app0->ctxs[0].flags & FLAG_ACTIVE) == 0);
-
-    /* Remove contexts from app 1 */
-    remove_ctx_from_active(app1, &app1->ctxs[1]);
-    test_assert("app1: ctx0 is head", app1->act_ctx_head == 0);
-    test_assert("app1: ctx2 is tail", app1->act_ctx_tail == 2);
-    test_assert("app1: ctx1 is not active", 
-            (app1->ctxs[1].flags & FLAG_ACTIVE) == 0);
-
-    remove_ctx_from_active(app1, &app1->ctxs[2]);
-    test_assert("app1: ctx0 is head", app1->act_ctx_head == 0);
-    test_assert("app1: ctx0 is tail", app1->act_ctx_tail == 0);
-    test_assert("app1: ctx2 is not active", 
-            (app1->ctxs[2].flags & FLAG_ACTIVE) == 0);
-
-    remove_ctx_from_active(app1, &app1->ctxs[0]);
-    test_assert("app1: head is invalid", app1->act_ctx_head == IDXLIST_INVAL);
-    test_assert("app1: tail is invalid", app1->act_ctx_tail == IDXLIST_INVAL);
-    test_assert("app1: ctx0 is not active", 
-            (app1->ctxs[0].flags & FLAG_ACTIVE) == 0);
+    enqueue_ctx_to_active(vm0, 0);
+    enqueue_ctx_to_active(vm0, 1);
+    enqueue_ctx_to_active(vm0, 2);
+
+    enqueue_ctx_to_active(vm1, 0);
+    enqueue_ctx_to_active(vm1, 1);
+    enqueue_ctx_to_active(vm1, 2);
+
+    /* Remove contexts from vm 0 */
+    remove_ctx_from_active(vm0, &vm0->ctxs[1]);
+    test_assert("vm0: ctx0 is head", vm0->act_ctx_head == 0);
+    test_assert("vm0: ctx2 is tail", vm0->act_ctx_tail == 2);
+    test_assert("vm0: ctx1 is not active", 
+            (vm0->ctxs[1].flags & FLAG_ACTIVE) == 0);
+
+    remove_ctx_from_active(vm0, &vm0->ctxs[2]);
+    test_assert("vm0: ctx0 is head", vm0->act_ctx_head == 0);
+    test_assert("vm0: ctx0 is tail", vm0->act_ctx_tail == 0);
+    test_assert("vm0: ctx2 is not active", 
+            (vm0->ctxs[2].flags & FLAG_ACTIVE) == 0);
+
+    remove_ctx_from_active(vm0, &vm0->ctxs[0]);
+    test_assert("vm0: head is invalid", vm0->act_ctx_head == IDXLIST_INVAL);
+    test_assert("vm0: tail is invalid", vm0->act_ctx_tail == IDXLIST_INVAL);
+    test_assert("vm0: ctx0 is not active", 
+            (vm0->ctxs[0].flags & FLAG_ACTIVE) == 0);
+
+    /* Remove contexts from vm 1 */
+    remove_ctx_from_active(vm1, &vm1->ctxs[1]);
+    test_assert("vm1: ctx0 is head", vm1->act_ctx_head == 0);
+    test_assert("vm1: ctx2 is tail", vm1->act_ctx_tail == 2);
+    test_assert("vm1: ctx1 is not active", 
+            (vm1->ctxs[1].flags & FLAG_ACTIVE) == 0);
+
+    remove_ctx_from_active(vm1, &vm1->ctxs[2]);
+    test_assert("vm1: ctx0 is head", vm1->act_ctx_head == 0);
+    test_assert("vm1: ctx0 is tail", vm1->act_ctx_tail == 0);
+    test_assert("vm1: ctx2 is not active", 
+            (vm1->ctxs[2].flags & FLAG_ACTIVE) == 0);
+
+    remove_ctx_from_active(vm1, &vm1->ctxs[0]);
+    test_assert("vm1: head is invalid", vm1->act_ctx_head == IDXLIST_INVAL);
+    test_assert("vm1: tail is invalid", vm1->act_ctx_tail == IDXLIST_INVAL);
+    test_assert("vm1: ctx0 is not active", 
+            (vm1->ctxs[0].flags & FLAG_ACTIVE) == 0);
 }
 
 int main(int argc, char *argv[])
 {
     int ret = 0;
 
-    if (test_subcase("enqueue app", test_enqueue_app, NULL))
+    if (test_subcase("enqueue vm", test_enqueue_vm, NULL))
         ret = 1;
     
     if (test_subcase("enqueue ctx", test_enqueue_ctx, NULL))
         ret = 1;
 
-    if (test_subcase("remove app", test_remove_app, NULL))
+    if (test_subcase("remove vm", test_remove_vm, NULL))
         ret = 1;
 
-    if (test_subcase("remove app head", test_remove_app_head, NULL))
+    if (test_subcase("remove vm head", test_remove_vm_head, NULL))
         ret = 1;
 
-    if (test_subcase("remove app tail", test_remove_app_tail, NULL))
+    if (test_subcase("remove vm tail", test_remove_vm_tail, NULL))
         ret = 1;
 
-    if (test_subcase("remove app one elt", test_remove_app_one_elt, NULL))
+    if (test_subcase("remove vm one elt", test_remove_vm_one_elt, NULL))
         ret = 1;
 
-    if (test_subcase("remove mult apps", test_remove_multiple_apps, NULL))
+    if (test_subcase("remove mult vm", test_remove_multiple_vms, NULL))
         ret = 1;
 
     if (test_subcase("remove ctx", test_remove_ctx, NULL))
diff --git a/tests/tas_unit/fastpath.c b/tests/tas_unit/fastpath.c
index 15127ce9..a7f4387e 100644
--- a/tests/tas_unit/fastpath.c
+++ b/tests/tas_unit/fastpath.c
@@ -29,7 +29,7 @@
 #endif
 macaddr_t eth_addr;
 
-void *tas_shm = (void *) 0;
+void **vm_shm = (void *) 0;
 
 struct flextcp_pl_mem state_base;
 struct flextcp_pl_mem *fp_state = &state_base;
@@ -47,7 +47,8 @@ struct qman_set_op {
   uint8_t flags;
 } qm_set_op = { .got_op = 0 };
 
-int qman_set(struct qman_thread *t, uint32_t app_id, uint32_t flow_id, uint32_t rate, uint32_t avail,
+int tas_qman_set(struct qman_thread *t, uint32_t app_id, uint32_t flow_id,
+    uint32_t rate, uint32_t avail,
     uint16_t max_chunk, uint8_t flags)
 {
   qm_set_op.got_op = 1;
diff --git a/tests/tas_unit/qman_rr.c b/tests/tas_unit/qman_rr.c
index 8ca62aae..ff76f227 100644
--- a/tests/tas_unit/qman_rr.c
+++ b/tests/tas_unit/qman_rr.c
@@ -21,10 +21,10 @@ void test_qman_rr_base(void *arg)
   unsigned num;
   struct qman_thread *t;
   uint32_t avail;
-  int all_app1, all_app2, ret;
+  int all_vm1, all_vm2, ret;
   struct dataplane_context *ctx;
   uint16_t q_bytes[TEST_BATCH_SIZE];
-  unsigned app_ids[TEST_BATCH_SIZE], q_ids[TEST_BATCH_SIZE];
+  unsigned vm_ids[TEST_BATCH_SIZE], q_ids[TEST_BATCH_SIZE];
 
   ret = rte_eal_init(3, arg);
   test_assert("rte_eal_init", ret > -1);
@@ -32,56 +32,56 @@ void test_qman_rr_base(void *arg)
   // Allocate memory for one context in 1 core
   ctx = rte_calloc("context", 1, sizeof(ctx), 0);
 
-  ret = qman_thread_init(ctx);
+  ret = tas_qman_thread_init(ctx);
   test_assert("init qman thread", ret > -1);
 
   t = &ctx->qman;
 
-  // Set 1 packet for 4 flows in app 1
-  qman_set(t, 1, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 1, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 1, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 1, 3, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_set set app 1 check app 1", avail == 64 * 4);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_set set app 1 check app 2", avail == 0);
-
-  // Set 1 packet for 4 flows in app 2
-  qman_set(t, 2, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 3, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_set set app 2 check app 1", avail == 64 * 4);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_set set app 2 check app 2", avail == 64 * 4);
+  // Set 1 packet for 4 flows in vm 1
+  tas_qman_set(t, 1, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 1, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 1, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 1, 3, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_set set vm 1 check vm 1", avail == 64 * 4);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_set set vm 1 check vm 2", avail == 0);
+
+  // Set 1 packet for 4 flows in vm 2
+  tas_qman_set(t, 2, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 3, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_set set vm 2 check vm 1", avail == 64 * 4);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_set set vm 2 check vm 2", avail == 64 * 4);
 
   num = TEST_BATCH_SIZE;
-  qman_poll(t, num, app_ids, q_ids, q_bytes);
-  all_app1 = (app_ids[0] == 1) && (app_ids[1] == 1) 
-      && (app_ids[2] == 1) && (app_ids[3] == 1);
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_poll poll app 1 check avail app 1", avail == 0);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_poll poll app 1 check avail app 2", avail == 64 * 4);
-  test_assert("scheduled all packets from app 1", all_app1);
-
-  memset(app_ids, 0, sizeof(*app_ids) * TEST_BATCH_SIZE);
+  tas_qman_poll(ctx, num, vm_ids, q_ids, q_bytes);
+  all_vm1 = (vm_ids[0] == 1) && (vm_ids[1] == 1) 
+      && (vm_ids[2] == 1) && (vm_ids[3] == 1);
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_poll poll vm 1 check avail vm 1", avail == 0);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_poll poll vm 1 check avail vm 2", avail == 64 * 4);
+  test_assert("scheduled all packets from vm 1", all_vm1);
+
+  memset(vm_ids, 0, sizeof(*vm_ids) * TEST_BATCH_SIZE);
   memset(q_ids, 0, sizeof(*q_ids) * TEST_BATCH_SIZE);
   memset(q_bytes, 0, sizeof(*q_bytes) * TEST_BATCH_SIZE);
 
   num = TEST_BATCH_SIZE;
-  qman_poll(t, num, app_ids, q_ids, q_bytes);
-  all_app2 = (app_ids[0] == 2) && (app_ids[1] == 2) 
-      && (app_ids[2] == 2) && (app_ids[3] == 2);
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_poll poll app 2 check avail app 1", avail == 0);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_poll poll app 2 check avail app 2", avail == 0);
-  test_assert("scheduled all packets from app 2", all_app2);
-
-  qman_free_app_cont(ctx);
+  tas_qman_poll(ctx, num, vm_ids, q_ids, q_bytes);
+  all_vm2 = (vm_ids[0] == 2) && (vm_ids[1] == 2) 
+      && (vm_ids[2] == 2) && (vm_ids[3] == 2);
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_poll poll vm 2 check avail vm 1", avail == 0);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_poll poll vm 2 check avail vm 2", avail == 0);
+  test_assert("scheduled all packets from vm 2", all_vm2);
+
+  qman_free_vm_cont(ctx);
   rte_free(ctx);
 }
 
@@ -89,10 +89,10 @@ void test_qman_rr_full_loop(void *arg)
 {
   struct qman_thread *t;
   uint32_t avail;
-  int all_app1, all_app2, ret;
+  int all_vm1, all_vm2, ret;
   struct dataplane_context *ctx;
   uint16_t q_bytes[TEST_BATCH_SIZE];
-  unsigned app_ids[TEST_BATCH_SIZE], q_ids[TEST_BATCH_SIZE];
+  unsigned vm_ids[TEST_BATCH_SIZE], q_ids[TEST_BATCH_SIZE];
   unsigned num = TEST_BATCH_SIZE;
 
   ret = rte_eal_init(3, arg);
@@ -101,92 +101,92 @@ void test_qman_rr_full_loop(void *arg)
   // Allocate memory for one context in 1 core
   ctx = rte_calloc("context", 1, sizeof(ctx), 0);
 
-  ret = qman_thread_init(ctx);
+  ret = tas_qman_thread_init(ctx);
   test_assert("init qman thread", ret > -1);
 
   t = &ctx->qman;
 
-  // Set 8 packets in app 1
-  qman_set(t, 1, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 1, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 1, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 1, 3, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 1, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 1, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 1, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 1, 3, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_set set app 1 check app 1", avail == 64 * 8);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_set set app 1 check app 2", avail == 0);
-
-  // Set 8 packets in app 2
-  qman_set(t, 2, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 3, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 5, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_set set app 2 check app 1", avail == 64 * 8);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_set set app 2 check app 2", avail == 64 * 8);
+  // Set 8 packets in vm 1
+  tas_qman_set(t, 1, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 1, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 1, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 1, 3, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 1, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 1, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 1, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 1, 3, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_set set vm 1 check vm 1", avail == 64 * 8);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_set set vm 1 check vm 2", avail == 0);
+
+  // Set 8 packets in vm 2
+  tas_qman_set(t, 2, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 3, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 5, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_set set vm 2 check vm 1", avail == 64 * 8);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_set set vm 2 check vm 2", avail == 64 * 8);
   
-  // Poll and expect app 1
-  qman_poll(t, num, app_ids, q_ids, q_bytes);
-  all_app1 = (app_ids[0] == 1) && (app_ids[1] == 1) 
-      && (app_ids[2] == 1) && (app_ids[3] == 1);
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_poll (1) poll app 1 check avail app 1", avail == 64 * 4);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_poll (1) poll app 1 check avail app 2", avail == 64 * 8);
-  test_assert("scheduled all packets from app 1", all_app1);
-
-  memset(app_ids, 0, sizeof(*app_ids) * TEST_BATCH_SIZE);
+  // Poll and expect vm 1
+  tas_qman_poll(ctx, num, vm_ids, q_ids, q_bytes);
+  all_vm1 = (vm_ids[0] == 1) && (vm_ids[1] == 1) 
+      && (vm_ids[2] == 1) && (vm_ids[3] == 1);
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_poll (1) poll vm 1 check avail vm 1", avail == 64 * 4);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_poll (1) poll vm 1 check avail vm 2", avail == 64 * 8);
+  test_assert("scheduled all packets from vm 1", all_vm1);
+
+  memset(vm_ids, 0, sizeof(*vm_ids) * TEST_BATCH_SIZE);
   memset(q_ids, 0, sizeof(*q_ids) * TEST_BATCH_SIZE);
   memset(q_bytes, 0, sizeof(*q_bytes) * TEST_BATCH_SIZE);
 
-  // Poll and expect app 2
-  qman_poll(t, num, app_ids, q_ids, q_bytes);
-  all_app2 = (app_ids[0] == 2) && (app_ids[1] == 2) 
-      && (app_ids[2] == 2) && (app_ids[3] == 2);
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_poll (2) poll app 2 check avail app 1", avail == 64 * 4);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_poll (2) poll app 2 check avail app 2", avail == 64 * 4);
-  test_assert("scheduled all packets from app 2", all_app2);
-
-  memset(app_ids, 0, sizeof(*app_ids) * TEST_BATCH_SIZE);
+  // Poll and expect vm 2
+  tas_qman_poll(ctx, num, vm_ids, q_ids, q_bytes);
+  all_vm2 = (vm_ids[0] == 2) && (vm_ids[1] == 2) 
+      && (vm_ids[2] == 2) && (vm_ids[3] == 2);
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_poll (2) poll vm 2 check avail vm 1", avail == 64 * 4);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_poll (2) poll vm 2 check avail vm 2", avail == 64 * 4);
+  test_assert("scheduled all packets from vm 2", all_vm2);
+
+  memset(vm_ids, 0, sizeof(*vm_ids) * TEST_BATCH_SIZE);
   memset(q_ids, 0, sizeof(*q_ids) * TEST_BATCH_SIZE);
   memset(q_bytes, 0, sizeof(*q_bytes) * TEST_BATCH_SIZE);
 
-  // Poll and expect app 1 again
-  qman_poll(t, num, app_ids, q_ids, q_bytes);
-  all_app1 = (app_ids[0] == 1) && (app_ids[1] == 1) 
-      && (app_ids[2] == 1) && (app_ids[3] == 1);
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_poll (3) poll app 1 check avail app 1", avail == 0);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_poll (3) poll app 1 check avail app 2", avail == 64 * 4);
-  test_assert("scheduled all packets from app 1", all_app1);
-
-  memset(app_ids, 0, sizeof(*app_ids) * TEST_BATCH_SIZE);
+  // Poll and expect vm 1 again
+  tas_qman_poll(ctx, num, vm_ids, q_ids, q_bytes);
+  all_vm1 = (vm_ids[0] == 1) && (vm_ids[1] == 1) 
+      && (vm_ids[2] == 1) && (vm_ids[3] == 1);
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_poll (3) poll vm 1 check avail vm 1", avail == 0);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_poll (3) poll vm 1 check avail vm 2", avail == 64 * 4);
+  test_assert("scheduled all packets from vm 1", all_vm1);
+
+  memset(vm_ids, 0, sizeof(*vm_ids) * TEST_BATCH_SIZE);
   memset(q_ids, 0, sizeof(*q_ids) * TEST_BATCH_SIZE);
   memset(q_bytes, 0, sizeof(*q_bytes) * TEST_BATCH_SIZE);
 
-  // Poll and expect app 2 again
-  qman_poll(t, num, app_ids, q_ids, q_bytes);
-  all_app2 = (app_ids[0] == 2) && (app_ids[1] == 2) 
-      && (app_ids[2] == 2) && (app_ids[3] == 2);
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_poll (4) poll app 2 check avail app 1", avail == 0);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_poll (4) poll app 2 check avail app 2", avail == 0);
-  test_assert("scheduled all packets from app 2", all_app2);
-
-  qman_free_app_cont(ctx);
+  // Poll and expect vm 2 again
+  tas_qman_poll(ctx, num, vm_ids, q_ids, q_bytes);
+  all_vm2 = (vm_ids[0] == 2) && (vm_ids[1] == 2) 
+      && (vm_ids[2] == 2) && (vm_ids[3] == 2);
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_poll (4) poll vm 2 check avail vm 1", avail == 0);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_poll (4) poll vm 2 check avail vm 2", avail == 0);
+  test_assert("scheduled all packets from vm 2", all_vm2);
+
+  qman_free_vm_cont(ctx);
   rte_free(ctx);
 }
 
@@ -196,7 +196,7 @@ void test_qman_rr_mix_round(void *arg) {
   int packs_exp, ret;
   struct dataplane_context *ctx;
   uint16_t q_bytes[TEST_BATCH_SIZE];
-  unsigned app_ids[TEST_BATCH_SIZE], q_ids[TEST_BATCH_SIZE];
+  unsigned vm_ids[TEST_BATCH_SIZE], q_ids[TEST_BATCH_SIZE];
   unsigned num = TEST_BATCH_SIZE;
 
   ret = rte_eal_init(3, arg);
@@ -205,72 +205,72 @@ void test_qman_rr_mix_round(void *arg) {
   // Allocate memory for one context in 1 core
   ctx = rte_calloc("context", 1, sizeof(ctx), 0);
 
-  ret = qman_thread_init(ctx);
+  ret = tas_qman_thread_init(ctx);
   test_assert("init qman thread", ret > -1);
 
   t = &ctx->qman;
 
-  // Set 8 packets in app 1
-  qman_set(t, 1, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 1, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 1, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_set set app 1 check app 1", avail == 64 * 3);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_set set app 1 check app 2", avail == 0);
-
-  // Set 8 packets in app 2
-  qman_set(t, 2, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 3, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-  qman_set(t, 2, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
-
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_set set app 2 check app 1", avail == 64 * 3);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_set set app 2 check app 2", avail == 64 * 6);
+  // Set 8 packets in vm 1
+  tas_qman_set(t, 1, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 1, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 1, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_set set vm 1 check vm 1", avail == 64 * 3);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_set set vm 1 check vm 2", avail == 0);
+
+  // Set 8 packets in vm 2
+  tas_qman_set(t, 2, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 1, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 2, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 3, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+  tas_qman_set(t, 2, 0, 0, 64, TEST_TCP_MSS, QMAN_ADD_AVAIL | QMAN_SET_MAXCHUNK);
+
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_set set vm 2 check vm 1", avail == 64 * 3);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_set set vm 2 check vm 2", avail == 64 * 6);
   
-  // Poll and expect app 1 and 2
-  qman_poll(t, num, app_ids, q_ids, q_bytes);
-  packs_exp = (app_ids[0] == 1) && (app_ids[1] == 1) 
-      && (app_ids[2] == 1) && (app_ids[3] == 2);
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_poll (1) poll app 1 check avail app 1", avail == 0);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_poll (1) poll app 1 check avail app 2", avail == 64 * 5);
+  // Poll and expect vm 1 and 2
+  tas_qman_poll(ctx, num, vm_ids, q_ids, q_bytes);
+  packs_exp = (vm_ids[0] == 1) && (vm_ids[1] == 1) 
+      && (vm_ids[2] == 1) && (vm_ids[3] == 2);
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_poll (1) poll vm 1 check avail vm 1", avail == 0);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_poll (1) poll vm 1 check avail vm 2", avail == 64 * 5);
   test_assert("qman poll (1) check correct packets scheduled", packs_exp);
 
-  memset(app_ids, 0, sizeof(*app_ids) * TEST_BATCH_SIZE);
+  memset(vm_ids, 0, sizeof(*vm_ids) * TEST_BATCH_SIZE);
   memset(q_ids, 0, sizeof(*q_ids) * TEST_BATCH_SIZE);
   memset(q_bytes, 0, sizeof(*q_bytes) * TEST_BATCH_SIZE);
 
-  // Poll and expect app 2
-  qman_poll(t, num, app_ids, q_ids, q_bytes);
-  packs_exp = (app_ids[0] == 2) && (app_ids[1] == 2) 
-      && (app_ids[2] == 2) && (app_ids[3] == 2);
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_poll (2) poll app 2 check avail app 1", avail == 0);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_poll (2) poll app 2 check avail app 2", avail == 64);
+  // Poll and expect vm 2
+  tas_qman_poll(ctx, num, vm_ids, q_ids, q_bytes);
+  packs_exp = (vm_ids[0] == 2) && (vm_ids[1] == 2) 
+      && (vm_ids[2] == 2) && (vm_ids[3] == 2);
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_poll (2) poll vm 2 check avail vm 1", avail == 0);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_poll (2) poll vm 2 check avail vm 2", avail == 64);
   test_assert("qman poll (2) check correct packets scheduled", packs_exp);
 
-  memset(app_ids, 0, sizeof(*app_ids) * TEST_BATCH_SIZE);
+  memset(vm_ids, 0, sizeof(*vm_ids) * TEST_BATCH_SIZE);
   memset(q_ids, 0, sizeof(*q_ids) * TEST_BATCH_SIZE);
   memset(q_bytes, 0, sizeof(*q_bytes) * TEST_BATCH_SIZE);
 
-  // Poll and expect app 2 again
-  qman_poll(t, num, app_ids, q_ids, q_bytes);
-  packs_exp = (app_ids[0] == 2);
-  avail = qman_app_get_avail(ctx, 1);
-  test_assert("qman_poll (3) poll app 1 check avail app 1", avail == 0);
-  avail = qman_app_get_avail(ctx, 2);
-  test_assert("qman_poll (3) poll app 1 check avail app 2", avail == 0);
+  // Poll and expect vm 2 again
+  tas_qman_poll(ctx, num, vm_ids, q_ids, q_bytes);
+  packs_exp = (vm_ids[0] == 2);
+  avail = qman_vm_get_avail(ctx, 1);
+  test_assert("qman_poll (3) poll vm 1 check avail vm 1", avail == 0);
+  avail = qman_vm_get_avail(ctx, 2);
+  test_assert("qman_poll (3) poll vm 1 check avail vm 2", avail == 0);
   test_assert("qman poll (3) check correct packets scheduled", packs_exp);
 
-  qman_free_app_cont(ctx);
+  qman_free_vm_cont(ctx);
   rte_free(ctx);
 }
 
diff --git a/tests/tas_unit/shmring.c b/tests/tas_unit/shmring.c
new file mode 100644
index 00000000..a51bc396
--- /dev/null
+++ b/tests/tas_unit/shmring.c
@@ -0,0 +1,387 @@
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "../testutils.h"
+#include "../../proxy/shmring.h"
+
+
+void test_reset_ring()
+{
+    void *base_addr;
+    struct ring_buffer *ring;
+    struct ring_header *hdr;
+    size_t RING_SIZE = 100;
+
+    base_addr = malloc(RING_SIZE);
+    ring = shmring_init(base_addr, RING_SIZE);
+    shmring_reset(ring, RING_SIZE);
+    size_t hdr_size = sizeof(struct ring_header);
+    hdr = ring->hdr_addr;
+    
+    test_assert("read_pos reset", hdr->read_pos == 0);
+    test_assert("write_pos reset", hdr->write_pos == 0);
+    test_assert("full set to not full", hdr->full == 0);
+    test_assert("ring size set", hdr->ring_size == (RING_SIZE - hdr_size));
+
+    free(base_addr);
+}
+
+void test_push_ring()
+{
+    int ret;
+    void *base_addr, *msg;
+    struct ring_buffer *ring;
+    struct ring_header *hdr;
+    size_t RING_SIZE = 100;
+
+    base_addr = malloc(RING_SIZE);
+    ring = shmring_init(base_addr, RING_SIZE);
+    shmring_reset(ring, RING_SIZE);
+    size_t hdr_size = sizeof(struct ring_header);
+    hdr = ring->hdr_addr;
+
+    size_t write_sz = 10;    
+    msg = malloc(write_sz);
+
+    ret = shmring_push(ring, msg, write_sz);
+    test_assert("returned correct number of bytes written", 
+            ret == write_sz);
+    test_assert("write_pos updated", hdr->write_pos == write_sz);
+    test_assert("read not updated", hdr->read_pos == 0);
+    test_assert("ring is not full", hdr->full == 0);
+    test_assert("hdr_size stayed the same", 
+            hdr->ring_size == (RING_SIZE - hdr_size));
+
+    free(base_addr);
+    free(msg);
+}
+
+void test_push_full_ring()
+{
+    int ret;
+    void *base_addr, *msg;
+    struct ring_buffer *ring;
+    struct ring_header *hdr;
+    size_t RING_SIZE = 100;
+
+    base_addr = malloc(RING_SIZE);
+    ring = shmring_init(base_addr, RING_SIZE);
+    shmring_reset(ring, RING_SIZE);
+    size_t hdr_size = sizeof(struct ring_header);
+    hdr = ring->hdr_addr;
+
+    size_t write_sz = RING_SIZE - hdr_size;    
+    msg = malloc(write_sz);
+
+    ret = shmring_push(ring, msg, write_sz);
+    test_assert("returned correct number of bytes written", 
+            ret == write_sz);
+    test_assert("write_pos updated", hdr->write_pos == 0);
+    test_assert("read not updated", hdr->read_pos == 0);
+    test_assert("ring is full", hdr->full == 1);
+    test_assert("hdr_size stayed the same", 
+            hdr->ring_size == (RING_SIZE - hdr_size));
+    
+    ret = shmring_push(ring, msg, 1);
+    test_assert("write to full ring failed", ret == 0);
+    test_assert("write_pos not updated", hdr->write_pos == 0);
+    test_assert("read not updated", hdr->read_pos == 0);
+    test_assert("ring is still full", hdr->full == 1);
+    test_assert("hdr_size still stayed the same", 
+            hdr->ring_size == (RING_SIZE - hdr_size));
+
+    free(base_addr);
+    free(msg);
+}
+
+void test_fragmented_push()
+{
+    int ret;
+    void *base_addr, *msg, *dst;
+    struct ring_buffer *ring;
+    struct ring_header *hdr;
+    size_t RING_SIZE = 100;
+
+    base_addr = malloc(RING_SIZE);
+    ring = shmring_init(base_addr, RING_SIZE);
+    shmring_reset(ring, RING_SIZE);
+    size_t hdr_size = sizeof(struct ring_header);
+    hdr = ring->hdr_addr;
+
+    size_t write_sz = RING_SIZE - hdr_size - 5;    
+    msg = malloc(write_sz);
+    ret = shmring_push(ring, msg, write_sz);
+    
+    test_assert("returned correct number of bytes written", 
+            ret == write_sz);
+    test_assert("write_pos updated", hdr->write_pos == write_sz);
+    test_assert("read not updated", hdr->read_pos == 0);
+    test_assert("ring is full", hdr->full == 0);
+    test_assert("hdr_size stayed the same", 
+            hdr->ring_size == (RING_SIZE - hdr_size));
+
+    size_t read_sz = 10;
+    dst = malloc(read_sz);
+    shmring_pop(ring, dst, read_sz);
+
+    size_t fwrite_sz = 8;
+    assert(fwrite_sz < write_sz);
+    ret = shmring_push(ring, msg, fwrite_sz);
+
+    test_assert("returned correct number of bytes written for frag write", 
+            ret == fwrite_sz);
+    test_assert("write_pos updated for frag write", 
+            hdr->write_pos == 3);
+    test_assert("read not updated for frag write", hdr->read_pos == read_sz);
+    test_assert("ring is not full", hdr->full == 0);
+    test_assert("hdr_size stayed the same for frag write", 
+            hdr->ring_size == (RING_SIZE - hdr_size));
+
+    free(msg);
+    free(dst);
+}
+
+
+void test_pop_ring()
+{
+    int ret;
+    void *base_addr;
+    struct ring_buffer *ring;
+    struct ring_header *hdr;
+    size_t RING_SIZE = 100;
+    uint8_t write_msg[3] = {0, 1, 2};
+    uint8_t *dst;
+
+    base_addr = malloc(RING_SIZE);
+    ring = shmring_init(base_addr, RING_SIZE);
+    shmring_reset(ring, RING_SIZE);
+    size_t hdr_size = sizeof(struct ring_header);
+    hdr = ring->hdr_addr;
+
+    size_t write_sz = 3;    
+    shmring_push(ring, write_msg, write_sz);
+
+    dst = malloc(write_sz);
+    ret = shmring_pop(ring, dst, write_sz);
+
+    test_assert("returned correct number of bytes read", ret == write_sz);
+    test_assert("read did not update write pos", hdr->write_pos == write_sz);
+    test_assert("read pos updated", hdr->read_pos == write_sz);
+    test_assert("ring is not full", hdr->full == 0);
+    test_assert("values are correct", 
+            dst[0] == 0 && dst[1] == 1 && dst[2] == 2);
+    test_assert("ring size stayed the same after read",
+            hdr->ring_size == (RING_SIZE - hdr_size));
+
+    free(base_addr);
+    free(dst);
+}
+
+void test_pop_too_large()
+{
+    int ret;
+    void *base_addr, *write_msg;
+    struct ring_buffer *ring;
+    struct ring_header *hdr;
+    size_t RING_SIZE = 100;
+    uint8_t *dst;
+
+    base_addr = malloc(RING_SIZE);
+    ring = shmring_init(base_addr, RING_SIZE);
+    shmring_reset(ring, RING_SIZE);
+    size_t hdr_size = sizeof(struct ring_header);
+    hdr = ring->hdr_addr;
+
+    size_t write_sz = 3;    
+    write_msg = malloc(write_sz);
+    shmring_push(ring, write_msg, write_sz);
+
+    size_t read_sz = 4;
+    dst = malloc(read_sz);
+    ret = shmring_pop(ring, dst, read_sz);
+
+    test_assert("returned no bytes read", ret == 0);
+    test_assert("read did not update write pos", hdr->write_pos == write_sz);
+    test_assert("read pos was not updated", hdr->read_pos == 0);
+    test_assert("ring is not full", hdr->full == 0);
+    test_assert("ring size stayed the same after read",
+            hdr->ring_size == (RING_SIZE - hdr_size));
+
+    free(base_addr);
+    free(write_msg);
+    free(dst);
+}
+
+void test_pop_empty_ring()
+{
+    int ret;
+    void *base_addr, *write_msg;
+    struct ring_buffer *ring;
+    struct ring_header *hdr;
+    size_t RING_SIZE = 100;
+    size_t msg_sz = 4;
+    uint8_t *dst;
+
+    base_addr = malloc(RING_SIZE);
+    ring = shmring_init(base_addr, RING_SIZE);
+    shmring_reset(ring, RING_SIZE);
+    size_t hdr_size = sizeof(struct ring_header);
+    hdr = ring->hdr_addr;
+
+    dst = malloc(msg_sz);
+    ret = shmring_pop(ring, dst, msg_sz);
+
+    test_assert("returned no bytes read", ret == 0);
+    test_assert("read did not update write pos", hdr->write_pos == 0);
+    test_assert("read pos was not updated", hdr->read_pos == 0);
+    test_assert("ring is not full", hdr->full == 0);
+    test_assert("ring size stayed the same after read",
+            hdr->ring_size == (RING_SIZE - hdr_size));
+ 
+    write_msg = malloc(msg_sz);
+    shmring_push(ring, write_msg, msg_sz);
+    shmring_pop(ring, dst, msg_sz);
+
+    ret = shmring_pop(ring, dst, msg_sz);
+    
+    test_assert("second empty read returned no bytes", ret == 0);
+    test_assert("second empty read did not update write pos",
+            hdr->write_pos == msg_sz);
+    test_assert("second empty read pos was not updated", 
+            hdr->read_pos == msg_sz);
+    test_assert("ring is not full after second empty read",
+            hdr->full == 0);
+    test_assert("ring size stayed the same after second empty read",
+            hdr->ring_size == (RING_SIZE - hdr_size));
+
+    free(base_addr);
+    free(write_msg);
+    free(dst);
+}
+
+void test_pop_ring_till_empty()
+{
+    int ret;
+    void *base_addr, *msg, *dst;
+    struct ring_buffer *ring;
+    struct ring_header *hdr;
+    size_t RING_SIZE = 100;
+
+    base_addr = malloc(RING_SIZE);
+    ring = shmring_init(base_addr, RING_SIZE);
+    shmring_reset(ring, RING_SIZE);
+    size_t hdr_size = sizeof(struct ring_header);
+    hdr = ring->hdr_addr;
+
+    size_t write_sz = RING_SIZE - hdr_size;    
+    msg = malloc(write_sz);
+    shmring_push(ring, msg, write_sz);
+
+    dst = malloc(write_sz);
+    ret = shmring_pop(ring, dst, write_sz);
+    test_assert("returned correct number of bytes read", ret == write_sz);
+    test_assert("read did not update write pos", hdr->write_pos == 0);
+    test_assert("read pos updated", hdr->read_pos == 0);
+    test_assert("ring is not full", hdr->full == 0);
+    test_assert("ring size stayed the same after read",
+            hdr->ring_size == (RING_SIZE - hdr_size));
+
+    ret = shmring_pop(ring, dst, 1);
+    test_assert("returned no read bytes", ret == 0);
+    test_assert("second read did not update write pos", 
+            hdr->write_pos == 0);
+    test_assert("read pos not updated", hdr->read_pos == 0);
+    test_assert("ring is still not full", hdr->full == 0);
+    test_assert("ring size stayed the same after second read",
+            hdr->ring_size == (RING_SIZE - hdr_size));
+
+}
+
+void test_fragmented_pop()
+{
+    int ret;
+    void *base_addr, *jumbled_msg;
+    struct ring_buffer *ring;
+    struct ring_header *hdr;
+    size_t RING_SIZE = 100;
+    uint8_t write_msg[3] = {0, 1, 2};
+    uint8_t *read_msg;
+    uint8_t *dst;
+
+    base_addr = malloc(RING_SIZE);
+    ring = shmring_init(base_addr, RING_SIZE);
+    shmring_reset(ring, RING_SIZE);
+    size_t hdr_size = sizeof(struct ring_header);
+    hdr = ring->hdr_addr;
+
+    size_t write_sz = RING_SIZE - hdr_size - 1;   
+    jumbled_msg = malloc(write_sz); 
+    shmring_push(ring, write_msg, write_sz);
+    dst = malloc(write_sz);
+    shmring_pop(ring, dst, write_sz);
+    shmring_push(ring, write_msg, 3);
+
+    read_msg = malloc(3);
+    ret = shmring_pop(ring, read_msg, 3);
+
+    test_assert("returned correct number of bytes read", ret = 3);
+    test_assert("read did not update write pos", hdr->write_pos == 2);
+    test_assert("read pos got updated", hdr->read_pos == 2);
+    test_assert("ring is not full", hdr->full == 0);
+    test_assert("values are correct", 
+            read_msg[0] == 0 && read_msg[1] == 1 && read_msg[2] == 2);
+    test_assert("ring size statyed the same after read",
+            hdr->ring_size == (RING_SIZE - hdr_size));
+
+    free(base_addr);
+    free(dst);
+    free(read_msg);
+    free(jumbled_msg);
+}
+
+void test_ring_is_empty()
+{
+
+}
+
+void test_ring_get_freesz()
+{
+
+}
+
+int main(int argc, char *argv[])
+{
+    int ret = 0;
+
+    if (test_subcase("reset ring", test_reset_ring, NULL))
+        ret = 1;
+
+    if (test_subcase("push ring", test_push_ring, NULL))
+        ret = 1;
+
+    if (test_subcase("push full ring", test_push_full_ring, NULL))
+        ret = 1;
+
+    if (test_subcase("push frag write to ring", test_fragmented_push, NULL))
+        ret = 1;
+    
+    if (test_subcase("pop ring", test_pop_ring, NULL))
+        ret = 1;
+
+    if (test_subcase("pop too large", test_pop_too_large, NULL))
+        ret = 1;
+    
+    if (test_subcase("pop empty ring", test_pop_empty_ring, NULL))
+        ret = 1;
+
+    if (test_subcase("pop ring until empty", test_pop_ring_till_empty, NULL))
+        ret = 1;
+
+    if (test_subcase("pop frag write to ring", test_fragmented_pop, NULL))
+        ret = 1;
+
+
+    return ret;
+}
\ No newline at end of file

From 6bc4358e1a19340c13912e84e0077b846e6f310b Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Mon, 3 Apr 2023 11:08:46 +0200
Subject: [PATCH 36/50] add tests for get free sz of ring and check if it's
 empty

---
 tests/tas_unit/shmring.c | 82 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/tests/tas_unit/shmring.c b/tests/tas_unit/shmring.c
index a51bc396..84f93ea2 100644
--- a/tests/tas_unit/shmring.c
+++ b/tests/tas_unit/shmring.c
@@ -343,12 +343,88 @@ void test_fragmented_pop()
 
 void test_ring_is_empty()
 {
+    int ret;
+    void *base_addr, *msg, *dst;
+    struct ring_buffer *ring;
+    size_t RING_SIZE = 100;
+
+    base_addr = malloc(RING_SIZE);
+    ring = shmring_init(base_addr, RING_SIZE);
+    shmring_reset(ring, RING_SIZE);
+
+    ret = shmring_is_empty(ring);
+    test_assert("ring is empty after initialization", ret);
 
+    size_t hdr_size = sizeof(struct ring_header);
+    msg = malloc(RING_SIZE - hdr_size);
+    dst = malloc(RING_SIZE - hdr_size);
+
+    shmring_push(ring, msg, 10);
+    ret = shmring_is_empty(ring);
+    test_assert("ring is not empty after pushing one message", ret == 0);
+
+    shmring_pop(ring, dst, 10);
+    ret = shmring_is_empty(ring);
+    test_assert("ring is empty after pushing and popping message", ret);
+
+    shmring_push(ring, msg, RING_SIZE - hdr_size);
+    ret = shmring_is_empty(ring);
+    test_assert("ring is not empty when full", ret == 0);
+
+    shmring_pop(ring, dst, RING_SIZE - hdr_size);
+    ret = shmring_is_empty(ring);
+    test_assert("ring is empty after being full and popped completely", ret);
+
+    shmring_push(ring, msg, RING_SIZE - hdr_size);
+    shmring_pop(ring, dst, 10);
+    shmring_push(ring, msg, 5);
+    ret = shmring_is_empty(ring);
+    test_assert("ring is not empty when write_pos < read_pos", ret == 0);
 }
 
 void test_ring_get_freesz()
 {
+    int ret;
+    void *base_addr, *msg, *dst;
+    struct ring_buffer *ring;
+    size_t RING_SIZE = 100;
 
+    base_addr = malloc(RING_SIZE);
+    ring = shmring_init(base_addr, RING_SIZE);
+    shmring_reset(ring, RING_SIZE);
+    size_t hdr_size = sizeof(struct ring_header);
+
+    ret = shmring_get_freesz(ring);
+    test_assert("get free size after initialization",
+                ret == RING_SIZE - hdr_size);
+
+    msg = malloc(RING_SIZE - hdr_size);
+    dst = malloc(RING_SIZE - hdr_size);
+
+    shmring_push(ring, msg, 10);
+    ret = shmring_get_freesz(ring);
+    test_assert("get free size after pushing one message", 
+                ret == RING_SIZE - hdr_size - 10);
+
+    shmring_pop(ring, dst, 10);
+    ret = shmring_get_freesz(ring);
+    test_assert("get free size after pushing and popping message", 
+                ret == RING_SIZE - hdr_size);
+
+    shmring_push(ring, msg, RING_SIZE - hdr_size);
+    ret = shmring_get_freesz(ring);
+    test_assert("get free size when full", ret == 0);
+
+    shmring_pop(ring, dst, RING_SIZE - hdr_size);
+    ret = shmring_get_freesz(ring);
+    test_assert("get free size after being full and popped completely", 
+                ret == RING_SIZE - hdr_size);
+
+    shmring_push(ring, msg, RING_SIZE - hdr_size);
+    shmring_pop(ring, dst, 10);
+    shmring_push(ring, msg, 5);
+    ret = shmring_get_freesz(ring);
+    test_assert("get free size when write_pos < read_pos", ret == 5);
 }
 
 int main(int argc, char *argv[])
@@ -382,6 +458,12 @@ int main(int argc, char *argv[])
     if (test_subcase("pop frag write to ring", test_fragmented_pop, NULL))
         ret = 1;
 
+    if (test_subcase("ring is empty check", test_ring_is_empty, NULL))
+        ret = 1;
+
+    if (test_subcase("get free size", test_ring_get_freesz, NULL))
+        ret = 1;
+
 
     return ret;
 }
\ No newline at end of file

From 89fa5dfdc1cdd5a53c717d04f900494db8e8ac5b Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Mon, 3 Apr 2023 11:17:54 +0200
Subject: [PATCH 37/50] add memory barrier after reading is empty

---
 proxy/guest/ivshmem.c | 2 ++
 proxy/host/ivshmem.c  | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/proxy/guest/ivshmem.c b/proxy/guest/ivshmem.c
index eaed6a23..e3bcc4f2 100644
--- a/proxy/guest/ivshmem.c
+++ b/proxy/guest/ivshmem.c
@@ -88,6 +88,8 @@ int ivshmem_channel_poll(struct guest_proxy *pxy)
   shmring_lock(pxy->chan->rx);
   is_empty = shmring_is_empty(pxy->chan->rx);
   shmring_unlock(pxy->chan->rx);
+
+  MEM_BARRIER();
   if (is_empty)
   {
     return 0;
diff --git a/proxy/host/ivshmem.c b/proxy/host/ivshmem.c
index fe63c623..836ad2c8 100644
--- a/proxy/host/ivshmem.c
+++ b/proxy/host/ivshmem.c
@@ -451,7 +451,9 @@ static int channel_poll_vm(struct v_machine *vm)
     /* Move on if rx channel for this vm is empty */
     shmring_lock(vm->chan->rx);
     is_empty = shmring_is_empty(vm->chan->rx);
-    shmring_unlock(vm->chan->rx); 
+    shmring_unlock(vm->chan->rx);
+
+    MEM_BARRIER();
     if (is_empty)
     {
         return 0;

From d48908739a9becca66e1d781e6a08f8949553ddb Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Mon, 3 Apr 2023 13:07:21 +0200
Subject: [PATCH 38/50] add logs to channel to trace messages sent back and
 forth

---
 proxy/guest/flextcp.c |  4 ++++
 proxy/guest/ivshmem.c |  6 ++++++
 proxy/host/ivshmem.c  |  6 +++++-
 proxy/shmring.c       | 15 +++++++++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/proxy/guest/flextcp.c b/proxy/guest/flextcp.c
index 975aa6e5..c2648eef 100644
--- a/proxy/guest/flextcp.c
+++ b/proxy/guest/flextcp.c
@@ -331,6 +331,7 @@ static int vflextcp_uxsocket_accept(struct guest_proxy *pxy)
   /* Register app with host */
   req_msg.msg_type = MSG_TYPE_NEWAPP_REQ;
   req_msg.cfd = cfd;
+  printf("MSG_TYPE_NEWAPP_REQ\n");
   ret = channel_write(pxy->chan, &req_msg, sizeof(req_msg));
   if (ret != sizeof(req_msg))
   {
@@ -498,6 +499,7 @@ static int vflextcp_uxsocket_handle_msg(struct guest_proxy *pxy,
     msg.ctxreq_id = ctx_req->ctxreq_id;
     msg.actx_evfd = ctx_req->actx_evfd;
 
+    printf("MSG_TYPE_CONTEXT_REQ\n");
     ret = channel_write(pxy->chan, &msg, sizeof(struct context_req_msg)); 
     if (ret < sizeof(struct context_req_msg))
     {
@@ -551,6 +553,7 @@ static int vflextcp_handle_tas_kernel_poke(struct guest_proxy *pxy,
   int ret;
 
   ivshmem_drain_evfd(pxy->kernel_notifyfd);
+  printf("MSG_TYPE_POKE_TAS_KERNEL\n");
   ret = channel_write(pxy->chan, msg, sizeof(struct poke_tas_kernel_msg));
 
   if (ret != sizeof(struct poke_tas_kernel_msg))
@@ -570,6 +573,7 @@ static int vflextcp_handle_tas_core_poke(struct guest_proxy *pxy,
   int ret;
 
   ivshmem_drain_evfd(pxy->core_evfds[msg->core_id]);
+  printf("MSG_TYPE_POKE_TAS_CORE\n");
   ret = channel_write(pxy->chan, msg, sizeof(struct poke_tas_core_msg));
 
   if (ret != sizeof(struct poke_tas_core_msg))
diff --git a/proxy/guest/ivshmem.c b/proxy/guest/ivshmem.c
index e3bcc4f2..6785907a 100644
--- a/proxy/guest/ivshmem.c
+++ b/proxy/guest/ivshmem.c
@@ -109,18 +109,23 @@ int ivshmem_channel_poll(struct guest_proxy *pxy)
   switch(msg_type)
   {
     case MSG_TYPE_HELLO:
+      printf("MSG_TYPE_HELLO\n");
       channel_handle_hello(pxy);
       break;
     case MSG_TYPE_TASINFO_RES:
+      printf("MSG_TYPE_TASINFO_RES\n");
       channel_handle_tasinfo_res(pxy, (struct tasinfo_res_msg *) msg);
       break;
     case MSG_TYPE_NEWAPP_RES:
+      printf("MSG_TYPE_NEWAPP_RES\n");
       channel_handle_newapp_res(pxy, (struct newapp_res_msg *) msg);
       break;
     case MSG_TYPE_CONTEXT_RES:
+      printf("MSG_TYPE_CONTEXT_RES\n");
       channel_handle_ctx_res(pxy, (struct context_res_msg *) msg);
       break;
     case MSG_TYPE_POKE_APP_CTX:
+      printf("MSG_TYPE_POKE_APP_CTX\n");
       channel_handle_vpoke(pxy, (struct poke_app_ctx_msg *) msg);
       break;
     default:
@@ -137,6 +142,7 @@ static int channel_handle_hello(struct guest_proxy *pxy)
 
   /* Send tasinfo request and wait for the response in the channel poll */
   treq_msg.msg_type = MSG_TYPE_TASINFO_REQ;
+  printf("MSG_TYPE_TASINFO_REQ\n");
   ret = channel_write(pxy->chan, &treq_msg, sizeof(struct tasinfo_req_msg));
   if (ret != sizeof(struct tasinfo_req_msg))
   {
diff --git a/proxy/host/ivshmem.c b/proxy/host/ivshmem.c
index 836ad2c8..6b81fef9 100644
--- a/proxy/host/ivshmem.c
+++ b/proxy/host/ivshmem.c
@@ -380,6 +380,7 @@ static int uxsocket_accept()
     h_msg.msg_type = MSG_TYPE_HELLO;
     h_msg.n_cores = flexnic_info_pxy->cores_num;
 
+    printf("MSG_TYPE_HELLO\n");
     ret = channel_write(chan, &h_msg, sizeof(struct hello_msg));
     if (ret < 0)
     {
@@ -522,6 +523,7 @@ static int channel_handle_tasinforeq_msg(struct v_machine *vm)
         goto free_msg;
     }
 
+    printf("MSG_TYPE_TASINFO_RES\n");
     ret = channel_write(vm->chan, msg, sizeof(struct tasinfo_res_msg));
     if (ret < sizeof(struct tasinfo_res_msg))
     {
@@ -592,6 +594,7 @@ static int channel_handle_ctx_req(struct v_machine *vm,
   res_msg.ctxreq_id = msg->ctxreq_id;
   res_msg.app_id = msg->app_id;
 
+  printf("MSG_TYPE_CONTEXT_RES\n");
   ret = channel_write(vm->chan, &res_msg, sizeof(struct context_res_msg));
   if (ret < sizeof(struct context_res_msg))
   {
@@ -631,6 +634,7 @@ static int channel_handle_newapp(struct v_machine *vm,
     msg_res.msg_type = MSG_TYPE_NEWAPP_RES;
     msg_res.cfd = msg_req->cfd;
 
+    printf("MSG_TYPE_NEWAPP_RES\n");
     ret = channel_write(vm->chan, &msg_res, sizeof(msg_res));
     
     if (ret != sizeof(msg_res))
@@ -642,7 +646,6 @@ static int channel_handle_newapp(struct v_machine *vm,
 
     notify_guest(vm->ifd);
 
-    printf("REGISTERED APP IN VM=%d\n", vm->id);
     return 0;
 }
 
@@ -690,6 +693,7 @@ static int app_ctxs_poll()
 
             msg.msg_type = MSG_TYPE_POKE_APP_CTX;
             msg.ctxreq_id = vctx->ctxreq_id;
+            printf("MSG_TYPE_POKE_APP_CTX\n");
             ret = channel_write(vctx->vm->chan, &msg, sizeof(struct poke_app_ctx_msg));
         
 
diff --git a/proxy/shmring.c b/proxy/shmring.c
index 10c6960d..f90a2dcd 100644
--- a/proxy/shmring.c
+++ b/proxy/shmring.c
@@ -134,6 +134,10 @@ size_t shmring_pop(struct ring_buffer *rx_ring, void *dst, size_t size)
   hdr->read_pos %= hdr->ring_size;
   hdr->full = 0;
 
+  int is_empty = shmring_is_empty(rx_ring);
+  printf("shmring_pop: write_pos=%d read_pos=%d ring_size=%ld full=%d is_empty=%d\n",
+      hdr->write_pos, hdr->read_pos, hdr->ring_size, hdr->full, is_empty);
+
   return size;
 }
 
@@ -168,6 +172,10 @@ size_t pop_fragmented(struct ring_buffer *rx_ring,
   hdr->read_pos %= hdr->ring_size;
   hdr->full = 0;
 
+  int is_empty = shmring_is_empty(rx_ring);
+  printf("pop_fragmented: write_pos=%d read_pos=%d ring_size=%ld full=%d is_empty=%d\n",
+      hdr->write_pos, hdr->read_pos, hdr->ring_size, hdr->full, is_empty);
+
   return size;
 }
 
@@ -275,6 +283,9 @@ size_t shmring_push(struct ring_buffer *tx_ring, void *src, size_t size)
     hdr->full = 1;
   }
 
+  int is_empty = shmring_is_empty(tx_ring);
+  printf("shmring_push: write_pos=%d read_pos=%d ring_size=%ld full=%d is_empty=%d\n",
+      hdr->write_pos, hdr->read_pos, hdr->ring_size, hdr->full, is_empty);
   return size;
 }
 
@@ -311,6 +322,10 @@ size_t push_fragmented(struct ring_buffer *tx_ring,
     hdr->full = 1;
   }
 
+  int is_empty = shmring_is_empty(tx_ring);
+  printf("push_fragmented: write_pos=%d read_pos=%d ring_size=%ld full=%d is_empty=%d\n",
+      hdr->write_pos, hdr->read_pos, hdr->ring_size, hdr->full, is_empty);
+
   return size;
 }
 

From 51b23bf0480b0b52713993e52e3561a2a5af053a Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Mon, 3 Apr 2023 13:12:51 +0200
Subject: [PATCH 39/50] position msg type log after write

---
 proxy/guest/flextcp.c |  8 ++++----
 proxy/guest/ivshmem.c |  2 +-
 proxy/host/ivshmem.c  | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/proxy/guest/flextcp.c b/proxy/guest/flextcp.c
index c2648eef..8918ca58 100644
--- a/proxy/guest/flextcp.c
+++ b/proxy/guest/flextcp.c
@@ -331,8 +331,8 @@ static int vflextcp_uxsocket_accept(struct guest_proxy *pxy)
   /* Register app with host */
   req_msg.msg_type = MSG_TYPE_NEWAPP_REQ;
   req_msg.cfd = cfd;
-  printf("MSG_TYPE_NEWAPP_REQ\n");
   ret = channel_write(pxy->chan, &req_msg, sizeof(req_msg));
+  printf("MSG_TYPE_NEWAPP_REQ\n");
   if (ret != sizeof(req_msg))
   {
     fprintf(stderr, "vflextcp_uxsocket_accept: "
@@ -499,8 +499,8 @@ static int vflextcp_uxsocket_handle_msg(struct guest_proxy *pxy,
     msg.ctxreq_id = ctx_req->ctxreq_id;
     msg.actx_evfd = ctx_req->actx_evfd;
 
-    printf("MSG_TYPE_CONTEXT_REQ\n");
     ret = channel_write(pxy->chan, &msg, sizeof(struct context_req_msg)); 
+    printf("MSG_TYPE_CONTEXT_REQ\n");
     if (ret < sizeof(struct context_req_msg))
     {
       fprintf(stderr, "vflextcp_uxsocket_handle_msg: "
@@ -553,8 +553,8 @@ static int vflextcp_handle_tas_kernel_poke(struct guest_proxy *pxy,
   int ret;
 
   ivshmem_drain_evfd(pxy->kernel_notifyfd);
-  printf("MSG_TYPE_POKE_TAS_KERNEL\n");
   ret = channel_write(pxy->chan, msg, sizeof(struct poke_tas_kernel_msg));
+  printf("MSG_TYPE_POKE_TAS_KERNEL\n");
 
   if (ret != sizeof(struct poke_tas_kernel_msg))
   {
@@ -573,8 +573,8 @@ static int vflextcp_handle_tas_core_poke(struct guest_proxy *pxy,
   int ret;
 
   ivshmem_drain_evfd(pxy->core_evfds[msg->core_id]);
-  printf("MSG_TYPE_POKE_TAS_CORE\n");
   ret = channel_write(pxy->chan, msg, sizeof(struct poke_tas_core_msg));
+  printf("MSG_TYPE_POKE_TAS_CORE\n");
 
   if (ret != sizeof(struct poke_tas_core_msg))
   {
diff --git a/proxy/guest/ivshmem.c b/proxy/guest/ivshmem.c
index 6785907a..ee54adfe 100644
--- a/proxy/guest/ivshmem.c
+++ b/proxy/guest/ivshmem.c
@@ -142,8 +142,8 @@ static int channel_handle_hello(struct guest_proxy *pxy)
 
   /* Send tasinfo request and wait for the response in the channel poll */
   treq_msg.msg_type = MSG_TYPE_TASINFO_REQ;
-  printf("MSG_TYPE_TASINFO_REQ\n");
   ret = channel_write(pxy->chan, &treq_msg, sizeof(struct tasinfo_req_msg));
+  printf("MSG_TYPE_TASINFO_REQ\n");
   if (ret != sizeof(struct tasinfo_req_msg))
   {
     fprintf(stderr, "channel_handle_hello: failed to write tasinfo req msg.\n");
diff --git a/proxy/host/ivshmem.c b/proxy/host/ivshmem.c
index 6b81fef9..352a352d 100644
--- a/proxy/host/ivshmem.c
+++ b/proxy/host/ivshmem.c
@@ -380,8 +380,8 @@ static int uxsocket_accept()
     h_msg.msg_type = MSG_TYPE_HELLO;
     h_msg.n_cores = flexnic_info_pxy->cores_num;
 
-    printf("MSG_TYPE_HELLO\n");
     ret = channel_write(chan, &h_msg, sizeof(struct hello_msg));
+    printf("MSG_TYPE_HELLO\n");
     if (ret < 0)
     {
         fprintf(stderr, "ivshmem_uxsocket_accept: failed to send number "
@@ -523,8 +523,8 @@ static int channel_handle_tasinforeq_msg(struct v_machine *vm)
         goto free_msg;
     }
 
-    printf("MSG_TYPE_TASINFO_RES\n");
     ret = channel_write(vm->chan, msg, sizeof(struct tasinfo_res_msg));
+    printf("MSG_TYPE_TASINFO_RES\n");
     if (ret < sizeof(struct tasinfo_res_msg))
     {
         fprintf(stderr, "ivshmem_handle_tasinforeq_msg: "
@@ -594,8 +594,8 @@ static int channel_handle_ctx_req(struct v_machine *vm,
   res_msg.ctxreq_id = msg->ctxreq_id;
   res_msg.app_id = msg->app_id;
 
-  printf("MSG_TYPE_CONTEXT_RES\n");
   ret = channel_write(vm->chan, &res_msg, sizeof(struct context_res_msg));
+  printf("MSG_TYPE_CONTEXT_RES\n");
   if (ret < sizeof(struct context_res_msg))
   {
     fprintf(stderr, "ivshmem_handle_ctxreq: failed to send ctx res.\n");
@@ -634,8 +634,8 @@ static int channel_handle_newapp(struct v_machine *vm,
     msg_res.msg_type = MSG_TYPE_NEWAPP_RES;
     msg_res.cfd = msg_req->cfd;
 
-    printf("MSG_TYPE_NEWAPP_RES\n");
     ret = channel_write(vm->chan, &msg_res, sizeof(msg_res));
+    printf("MSG_TYPE_NEWAPP_RES\n");
     
     if (ret != sizeof(msg_res))
     {
@@ -693,8 +693,8 @@ static int app_ctxs_poll()
 
             msg.msg_type = MSG_TYPE_POKE_APP_CTX;
             msg.ctxreq_id = vctx->ctxreq_id;
-            printf("MSG_TYPE_POKE_APP_CTX\n");
             ret = channel_write(vctx->vm->chan, &msg, sizeof(struct poke_app_ctx_msg));
+            printf("MSG_TYPE_POKE_APP_CTX\n");
         
 
             if (ret != sizeof(struct poke_app_ctx_msg))

From d2aa04918bea4211784f7ca3e30c8dfd2818b9b3 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Mon, 3 Apr 2023 13:46:18 +0200
Subject: [PATCH 40/50] add msg size to log

---
 proxy/shmring.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/proxy/shmring.c b/proxy/shmring.c
index f90a2dcd..cf9394b6 100644
--- a/proxy/shmring.c
+++ b/proxy/shmring.c
@@ -135,8 +135,8 @@ size_t shmring_pop(struct ring_buffer *rx_ring, void *dst, size_t size)
   hdr->full = 0;
 
   int is_empty = shmring_is_empty(rx_ring);
-  printf("shmring_pop: write_pos=%d read_pos=%d ring_size=%ld full=%d is_empty=%d\n",
-      hdr->write_pos, hdr->read_pos, hdr->ring_size, hdr->full, is_empty);
+  printf("shmring_pop: write_pos=%d read_pos=%d ring_size=%ld full=%d is_empty=%d size=%ld\n",
+      hdr->write_pos, hdr->read_pos, hdr->ring_size, hdr->full, is_empty, size);
 
   return size;
 }
@@ -173,8 +173,8 @@ size_t pop_fragmented(struct ring_buffer *rx_ring,
   hdr->full = 0;
 
   int is_empty = shmring_is_empty(rx_ring);
-  printf("pop_fragmented: write_pos=%d read_pos=%d ring_size=%ld full=%d is_empty=%d\n",
-      hdr->write_pos, hdr->read_pos, hdr->ring_size, hdr->full, is_empty);
+  printf("pop_fragmented: write_pos=%d read_pos=%d ring_size=%ld full=%d is_empty=%d size=%ld\n",
+      hdr->write_pos, hdr->read_pos, hdr->ring_size, hdr->full, is_empty, size);
 
   return size;
 }
@@ -284,8 +284,8 @@ size_t shmring_push(struct ring_buffer *tx_ring, void *src, size_t size)
   }
 
   int is_empty = shmring_is_empty(tx_ring);
-  printf("shmring_push: write_pos=%d read_pos=%d ring_size=%ld full=%d is_empty=%d\n",
-      hdr->write_pos, hdr->read_pos, hdr->ring_size, hdr->full, is_empty);
+  printf("shmring_push: write_pos=%d read_pos=%d ring_size=%ld full=%d is_empty=%d size=%ld\n",
+      hdr->write_pos, hdr->read_pos, hdr->ring_size, hdr->full, is_empty, size);
   return size;
 }
 
@@ -323,8 +323,8 @@ size_t push_fragmented(struct ring_buffer *tx_ring,
   }
 
   int is_empty = shmring_is_empty(tx_ring);
-  printf("push_fragmented: write_pos=%d read_pos=%d ring_size=%ld full=%d is_empty=%d\n",
-      hdr->write_pos, hdr->read_pos, hdr->ring_size, hdr->full, is_empty);
+  printf("push_fragmented: write_pos=%d read_pos=%d ring_size=%ld full=%d is_empty=%d size=%ld\n",
+      hdr->write_pos, hdr->read_pos, hdr->ring_size, hdr->full, is_empty, size);
 
   return size;
 }

From 13cb770741a02e0c88499fe7210d529891e006a2 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Mon, 3 Apr 2023 17:14:12 +0200
Subject: [PATCH 41/50] add break condition after ring write is successful

---
 proxy/channel.c       | 8 +++++---
 proxy/guest/ivshmem.c | 1 -
 proxy/host/ivshmem.c  | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/proxy/channel.c b/proxy/channel.c
index 072b5c90..d0772163 100644
--- a/proxy/channel.c
+++ b/proxy/channel.c
@@ -52,10 +52,12 @@ size_t channel_write(struct channel *chan, void *buf, size_t size)
   do {
     shmring_lock(chan->tx);
     free_sz = shmring_get_freesz(chan->tx);
-
-    if (free_sz >= size)
+    if (free_sz >= size) 
+    {
       ret = shmring_push(chan->tx, buf, size);
-    
+      shmring_unlock(chan->tx);
+      break;
+    }
     shmring_unlock(chan->tx);
   } while(free_sz < size);
 
diff --git a/proxy/guest/ivshmem.c b/proxy/guest/ivshmem.c
index ee54adfe..890be1c7 100644
--- a/proxy/guest/ivshmem.c
+++ b/proxy/guest/ivshmem.c
@@ -89,7 +89,6 @@ int ivshmem_channel_poll(struct guest_proxy *pxy)
   is_empty = shmring_is_empty(pxy->chan->rx);
   shmring_unlock(pxy->chan->rx);
 
-  MEM_BARRIER();
   if (is_empty)
   {
     return 0;
diff --git a/proxy/host/ivshmem.c b/proxy/host/ivshmem.c
index 352a352d..2806f0de 100644
--- a/proxy/host/ivshmem.c
+++ b/proxy/host/ivshmem.c
@@ -454,7 +454,6 @@ static int channel_poll_vm(struct v_machine *vm)
     is_empty = shmring_is_empty(vm->chan->rx);
     shmring_unlock(vm->chan->rx);
 
-    MEM_BARRIER();
     if (is_empty)
     {
         return 0;

From 7bcd932957593f73d6428b4aba970ae0525a3d7d Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Mon, 3 Apr 2023 18:22:13 +0200
Subject: [PATCH 42/50] add assert to channel write

---
 proxy/channel.c       | 2 ++
 proxy/guest/ivshmem.c | 2 ++
 proxy/shmring.c       | 1 +
 3 files changed, 5 insertions(+)

diff --git a/proxy/channel.c b/proxy/channel.c
index d0772163..34da6166 100644
--- a/proxy/channel.c
+++ b/proxy/channel.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <assert.h>
 
 #include "channel.h"
 #include "shmring.h"
@@ -55,6 +56,7 @@ size_t channel_write(struct channel *chan, void *buf, size_t size)
     if (free_sz >= size) 
     {
       ret = shmring_push(chan->tx, buf, size);
+      assert(ret == size || ret == 0);
       shmring_unlock(chan->tx);
       break;
     }
diff --git a/proxy/guest/ivshmem.c b/proxy/guest/ivshmem.c
index 890be1c7..ed57765b 100644
--- a/proxy/guest/ivshmem.c
+++ b/proxy/guest/ivshmem.c
@@ -85,10 +85,12 @@ int ivshmem_channel_poll(struct guest_proxy *pxy)
   size_t msg_size;
   
   /* Return if there are no messages in channel */
+  MEM_BARRIER();
   shmring_lock(pxy->chan->rx);
   is_empty = shmring_is_empty(pxy->chan->rx);
   shmring_unlock(pxy->chan->rx);
 
+  MEM_BARRIER();
   if (is_empty)
   {
     return 0;
diff --git a/proxy/shmring.c b/proxy/shmring.c
index cf9394b6..243749f8 100644
--- a/proxy/shmring.c
+++ b/proxy/shmring.c
@@ -28,6 +28,7 @@ struct ring_buffer* shmring_init(void *base_addr, size_t size)
   ring->buf_addr = base_addr + sizeof(struct ring_header);
   ring->size = size;
 
+  memset(base_addr, 0, size);
   return ring;
 }
 

From 392cf337812a61cbfdadef39284cf77dba57f3c4 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Mon, 3 Apr 2023 18:30:21 +0200
Subject: [PATCH 43/50] actually add memset to 0 in shmring reset instead of
 init

---
 proxy/shmring.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/shmring.c b/proxy/shmring.c
index 243749f8..0de1ac09 100644
--- a/proxy/shmring.c
+++ b/proxy/shmring.c
@@ -28,7 +28,6 @@ struct ring_buffer* shmring_init(void *base_addr, size_t size)
   ring->buf_addr = base_addr + sizeof(struct ring_header);
   ring->size = size;
 
-  memset(base_addr, 0, size);
   return ring;
 }
 
@@ -37,6 +36,7 @@ void shmring_reset(struct ring_buffer *ring, size_t size)
 {
   struct ring_header *hdr = ring->hdr_addr;
 
+  memset(ring->hdr_addr, 0, size);
   hdr->read_pos = 0;
   hdr->write_pos = 0;
   hdr->full = 0;

From 68f99823c3b3ca66785095521ba8fdcd98be13e5 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Tue, 4 Apr 2023 16:06:15 +0200
Subject: [PATCH 44/50] change ovstas to use vhost instead of tap

---
 experiments/components/client.py              | 23 ++++++------
 experiments/components/proxy.py               |  8 +++--
 experiments/components/server.py              | 15 +++++---
 experiments/components/tas.py                 |  8 +++--
 experiments/components/vm.py                  | 21 ++++++++---
 experiments/nodes/node.py                     | 30 +++++++++++-----
 experiments/nodes/ovs_linux/ovslinux.py       |  7 ++--
 .../nodes/ovs_linux/ovslinux_client.py        |  3 ++
 experiments/nodes/ovs_tas/ovstas.py           | 35 +++++++++----------
 experiments/nodes/tap_tas/ttas.py             |  3 ++
 experiments/nodes/virt_linux/vlinux.py        |  3 ++
 experiments/nodes/virt_tas/vtas.py            |  5 +++
 images/{br_down.sh => br-down.sh}             |  0
 images/{br_up.sh => br-up.sh}                 |  0
 images/{dpdk_bind.sh => dpdk-bind.sh}         |  0
 images/dpdk-ovsbr-add.sh                      | 32 +++++++++++++++++
 images/ovs-start.sh                           | 17 +++++++++
 images/ovs-stop.sh                            |  5 +++
 images/start-vm.sh                            | 12 ++++---
 images/{tap_down.sh => tap-down.sh}           |  0
 images/{tap_up.sh => tap-up.sh}               |  0
 21 files changed, 167 insertions(+), 60 deletions(-)
 rename images/{br_down.sh => br-down.sh} (100%)
 rename images/{br_up.sh => br-up.sh} (100%)
 rename images/{dpdk_bind.sh => dpdk-bind.sh} (100%)
 create mode 100644 images/dpdk-ovsbr-add.sh
 create mode 100644 images/ovs-start.sh
 create mode 100644 images/ovs-stop.sh
 rename images/{tap_down.sh => tap-down.sh} (100%)
 rename images/{tap_up.sh => tap-up.sh} (100%)

diff --git a/experiments/components/client.py b/experiments/components/client.py
index 1848757e..9c0f8c11 100644
--- a/experiments/components/client.py
+++ b/experiments/components/client.py
@@ -17,7 +17,7 @@ def __init__(self, defaults, machine_config, client_config, vm_config, wmanager)
                 machine_config.is_remote)
 
     def run_bare(self, w_sudo, ld_preload):
-        self.run_benchmark_rpc(w_sudo, ld_preload)
+        self.run_benchmark_rpc(w_sudo, ld_preload, clean=False)
 
     def run_virt(self, w_sudo, ld_preload):
         ssh_com = utils.get_ssh_command(self.machine_config, self.vm_config)
@@ -25,18 +25,24 @@ def run_virt(self, w_sudo, ld_preload):
         time.sleep(3)
         self.pane.send_keys("tas")
         time.sleep(3)
-        self.run_benchmark_rpc(w_sudo, ld_preload)
+        self.run_benchmark_rpc(w_sudo, ld_preload, clean=False)
 
-    def run_benchmark_rpc(self, w_sudo, ld_preload):
+    def run_benchmark_rpc(self, w_sudo, ld_preload, clean):
         self.pane.send_keys('cd ' + self.client_config.comp_dir)
+
+        if clean:
+            self.pane.send_keys(self.client_config.clean_cmd)
+            time.sleep(1)
+
         self.pane.send_keys(self.client_config.comp_cmd)
+        time.sleep(1)
         self.pane.send_keys("cd " + self.client_config.tas_dir)
         time.sleep(3)
 
         cmd = 'stdbuf -oL '
         
         if w_sudo:
-            cmd += 'sudo '
+            cmd += 'sudo -E '
         
         if ld_preload:
             cmd += 'LD_PRELOAD=' + self.client_config.lib_so + ' '
@@ -46,18 +52,9 @@ def run_benchmark_rpc(self, w_sudo, ld_preload):
                 ' | tee ' + \
                 self.client_config.out
     
-        print(cmd) 
         self.pane.send_keys(cmd)
     
     def save_log_virt(self, exp_path):
-        # kill process to force flush to file
-        # ssh_com = utils.get_ssh_command(self.machine_config, self.vm_config)
-        # ssh_com += " 'sudo pkill testclient'"
-        # self.save_logs_pane.send_keys(ssh_com)
-        # time.sleep(3)
-        # self.save_logs_pane.send_keys(suppress_history=False, cmd='tas')
-        # time.sleep(1)
-
         split_path = exp_path.split("/")
         n = len(split_path)
         
diff --git a/experiments/components/proxy.py b/experiments/components/proxy.py
index f0ea467d..543f969b 100644
--- a/experiments/components/proxy.py
+++ b/experiments/components/proxy.py
@@ -22,9 +22,11 @@ def run(self):
                 pane=self.pane,
                 comp_dir=self.proxy_config.comp_dir,
                 comp_cmd=self.proxy_config.comp_cmd,
+                clean_cmd=self.proxy_config.clean_cmd,
                 exec_file=self.proxy_config.exec_file,
                 out=self.proxy_config.out,
-                args='')
+                args='',
+                clean=False)
 
 class ProxyGuest(Proxy):
     
@@ -44,7 +46,9 @@ def run(self):
                 pane=self.pane,
                 comp_dir=self.proxy_config.comp_dir,
                 comp_cmd=self.proxy_config.comp_cmd,
+                clean_cmd=self.proxy_config.clean_cmd,
                 exec_file=self.proxy_config.exec_file,
                 out=self.proxy_config.out,
                 args='',
-                bg=False)
\ No newline at end of file
+                bg=False,
+                clean=False)
\ No newline at end of file
diff --git a/experiments/components/server.py b/experiments/components/server.py
index ea714326..e41feef1 100644
--- a/experiments/components/server.py
+++ b/experiments/components/server.py
@@ -15,18 +15,24 @@ def __init__(self, defaults, machine_config,
             machine_config.is_remote)
     
     def run_bare(self, w_sudo, ld_preload):
-        self.run_benchmark_rpc(w_sudo, ld_preload)
+        self.run_benchmark_rpc(w_sudo, ld_preload, clean=False)
 
     def run_virt(self, w_sudo, ld_preload):
         ssh_com = utils.get_ssh_command(self.machine_config, self.vm_config)
         self.pane.send_keys(ssh_com)
         time.sleep(3)
         self.pane.send_keys("tas")
-        self.run_benchmark_rpc(w_sudo, ld_preload)
+        self.run_benchmark_rpc(w_sudo, ld_preload, clean=False)
 
-    def run_benchmark_rpc(self, w_sudo, ld_preload):
+    def run_benchmark_rpc(self, w_sudo, ld_preload, clean):
         self.pane.send_keys('cd ' + self.server_config.comp_dir)
+
+        if clean:
+            self.pane.send_keys(self.server_config.clean_cmd)
+            time.sleep(1)
+
         self.pane.send_keys(self.server_config.comp_cmd)
+        time.sleep(1)
         self.pane.send_keys("cd " + self.server_config.tas_dir)
         time.sleep(3)
 
@@ -34,7 +40,7 @@ def run_benchmark_rpc(self, w_sudo, ld_preload):
         stack = self.machine_config.stack
         
         if w_sudo:
-            cmd = 'sudo '
+            cmd = 'sudo -E '
         
         if ld_preload:
             cmd += 'LD_PRELOAD=' + self.server_config.lib_so + ' '
@@ -45,5 +51,4 @@ def run_benchmark_rpc(self, w_sudo, ld_preload):
                 # ' | tee ' + \
                 # self.server_config.out
     
-        print(cmd) 
         self.pane.send_keys(cmd)
\ No newline at end of file
diff --git a/experiments/components/tas.py b/experiments/components/tas.py
index 00cc0ce7..cdf4093d 100644
--- a/experiments/components/tas.py
+++ b/experiments/components/tas.py
@@ -19,10 +19,12 @@ def run_bare(self):
         utils.compile_and_run(pane=self.pane,
                 comp_dir=self.tas_config.comp_dir,
                 comp_cmd=self.tas_config.comp_cmd,
+                clean_cmd=self.tas_config.clean_cmd,
                 exec_file=self.tas_config.exec_file,
                 out=self.tas_config.out,
                 args=tas_args,
-                save_log=True)
+                save_log=True,
+                clean=False)
 
     def run_virt(self):
         ssh_com = utils.get_ssh_command(self.machine_config, self.vm_config)
@@ -35,10 +37,12 @@ def run_virt(self):
         utils.compile_and_run(pane=self.pane,
                 comp_dir=self.tas_config.comp_dir,
                 comp_cmd=self.tas_config.comp_cmd,
+                clean_cmd=self.tas_config.clean_cmd,
                 exec_file=self.tas_config.exec_file,
                 out=self.tas_config.out,
                 args=tas_args,
-                save_log=True)
+                save_log=True,
+                clean=False)
 
     def save_log_bare(self, exp_path):
         # # kill process to force flush to file
diff --git a/experiments/components/vm.py b/experiments/components/vm.py
index 791a9235..687d72d3 100644
--- a/experiments/components/vm.py
+++ b/experiments/components/vm.py
@@ -12,8 +12,9 @@ def __init__(self, defaults, machine_config, vm_config, wmanager):
     
     def start(self):
         self.pane.send_keys('cd ' + self.vm_config.manager_dir)
-        start_vm_cmd = "sudo bash start-vm.sh {} {}".format(
-                self.machine_config.stack, self.vm_config.id)
+        start_vm_cmd = "sudo bash start-vm.sh {} {} {}".format(
+                self.machine_config.stack, self.vm_config.id,
+                self.machine_config.interface)
         self.pane.send_keys(start_vm_cmd)
        
         print("Started VM")
@@ -46,7 +47,7 @@ def init_interface(self, ip, interface):
     def dpdk_bind(self, ip, interface, pci_id):
         cmd = 'cd ' + self.vm_config.manager_dir_virt
         self.pane.send_keys(cmd)
-        cmd = 'bash dpdk_bind.sh {} {} {}'.format(ip, interface, pci_id)
+        cmd = 'bash dpdk-bind.sh {} {} {}'.format(ip, interface, pci_id)
         self.pane.send_keys(cmd)
         time.sleep(3)
 
@@ -55,4 +56,16 @@ def login_vm(self):
         time.sleep(3)
         self.pane.send_keys(suppress_history=False, cmd='tas')
         self.pane.enter()
-        time.sleep(5)
\ No newline at end of file
+        time.sleep(5)
+
+    def shutdown(self):
+        self.pane.send_keys(suppress_history=False, cmd='whoami')
+        
+        captured_pane = self.pane.capture_pane()
+        user = captured_pane[len(captured_pane) - 2]
+        
+        # This means we are in the vm, so we don't 
+        # accidentally shutdown machine
+        if user == 'tas':
+            self.pane.send_keys(suppress_history=False, cmd='sudo shutdown -h now')
+            time.sleep(2)
\ No newline at end of file
diff --git a/experiments/nodes/node.py b/experiments/nodes/node.py
index 275ce937..ce7c792f 100644
--- a/experiments/nodes/node.py
+++ b/experiments/nodes/node.py
@@ -22,7 +22,7 @@ def tap_up(self, interface, script_dir, multi_queue):
     cmd = "cd {}".format(script_dir)
     self.setup_pane.send_keys(cmd)
     time.sleep(1)
-    cmd = "sudo bash tap_up.sh {} {}".format(interface, multi_queue)
+    cmd = "sudo bash tap-up.sh {} {}".format(interface, multi_queue)
     self.setup_pane.send_keys(cmd)
     time.sleep(2)
 
@@ -30,7 +30,7 @@ def tap_down(self, interface, script_dir):
     cmd = "cd {}".format(script_dir)
     self.cleanup_pane.send_keys(cmd)
     time.sleep(1)
-    cmd = "sudo bash tap_down.sh {}".format(interface)
+    cmd = "sudo bash tap-down.sh {}".format(interface)
     self.cleanup_pane.send_keys(cmd)
     time.sleep(2)
 
@@ -40,7 +40,7 @@ def bridge_up(self, ip, interface, script_dir):
       cmd = "cd {}".format(script_dir)
       self.setup_pane.send_keys(cmd)
       time.sleep(1)
-      cmd = "sudo bash br_up.sh {} {}/24".format(interface, ip)
+      cmd = "sudo bash br-up.sh {} {}/24".format(interface, ip)
       self.setup_pane.send_keys(cmd)
       time.sleep(2)
   
@@ -50,17 +50,23 @@ def bridge_down(self, ip, interface, script_dir):
       cmd = "cd {}".format(script_dir)
       self.cleanup_pane.send_keys(cmd)
       time.sleep(1)
-      cmd = "sudo bash br_down.sh {} {}/24".format(interface, ip)
+      cmd = "sudo bash br-down.sh {} {}/24".format(interface, ip)
       self.cleanup_pane.send_keys(cmd)
       time.sleep(2)
 
-  def start_ovs(self, ovsctl_path):
-      cmd = "sudo {} start".format(ovsctl_path)
+  def start_ovs(self, script_dir):
+      cmd = "cd {}".format(script_dir)
+      self.setup_pane.send_keys(cmd)
+      time.sleep(1)
+      cmd = "sudo bash ovs-start.sh"
       self.setup_pane.send_keys(cmd)
       time.sleep(2)
 
-  def stop_ovs(self, ovsctl_path):
-      cmd = "sudo {} stop".format(ovsctl_path)
+  def stop_ovs(self, script_dir):
+      cmd = "cd {}".format(script_dir)
+      self.cleanup_pane.send_keys(cmd)
+      time.sleep(1)
+      cmd = "sudo bash ovs-stop.sh"
       self.cleanup_pane.send_keys(cmd)
       time.sleep(2)
 
@@ -72,6 +78,14 @@ def ovsbr_add(self, br_name, ip, interface, script_dir):
       self.setup_pane.send_keys(cmd)
       time.sleep(2)
 
+  def dpdk_ovsbr_add(self, br_name, ip, interface, script_dir):
+      cmd = "cd {}".format(script_dir)
+      self.setup_pane.send_keys(cmd)
+      time.sleep(1)
+      cmd = "sudo bash dpdk-ovsbr-add.sh {} {} {}".format(br_name, ip, interface)
+      self.setup_pane.send_keys(cmd)
+      time.sleep(2)
+
   def ovsbr_del(self, br_name):
       cmd = "sudo ovs-vsctl del-br {}".format(br_name)
       self.cleanup_pane.send_keys(cmd)
diff --git a/experiments/nodes/ovs_linux/ovslinux.py b/experiments/nodes/ovs_linux/ovslinux.py
index 86b28110..dbf8aa4f 100644
--- a/experiments/nodes/ovs_linux/ovslinux.py
+++ b/experiments/nodes/ovs_linux/ovslinux.py
@@ -19,7 +19,7 @@ def __init__(self, defaults, machine_config,
   def setup(self):
     super().setup()
 
-    self.start_ovs(self.defaults.ovs_ctl_path)
+    self.start_ovs(self.vm_configs[0].manager_dir)
     self.ovsbr_add("br0", 
                    self.machine_config.ip + "/24", 
                    self.machine_config.interface,
@@ -35,7 +35,7 @@ def setup(self):
   def cleanup(self):
     super().cleanup()
     self.ovsbr_del("br0")
-    self.stop_ovs(self.defaults.ovs_ctl_path)
+    self.stop_ovs(self.vm_configs[0].manager_dir)
 
     cmd = "sudo ip addr add {} dev {}".format(self.machine_config.ip + "/24",
                                               self.machine_config.interface)
@@ -48,6 +48,9 @@ def cleanup(self):
 
     for vm_config in self.vm_configs:
       self.tap_down("tap{}".format(vm_config.id), vm_config.manager_dir)
+
+    for vm in self.vms:
+      vm.shutdown()
     
   def start_vm(self, vm, vm_config):
     vm.start()
diff --git a/experiments/nodes/ovs_linux/ovslinux_client.py b/experiments/nodes/ovs_linux/ovslinux_client.py
index e25bef41..755afdd2 100644
--- a/experiments/nodes/ovs_linux/ovslinux_client.py
+++ b/experiments/nodes/ovs_linux/ovslinux_client.py
@@ -17,6 +17,9 @@ def __init__(self, config, wmanager):
     self.cnum = config.cnum
     self.clients = []
 
+  def cleanup(self):
+    super().cleanup()
+
   def start_clients(self):
     for i in range(self.nodenum):
       vm_config = self.vm_configs[i]
diff --git a/experiments/nodes/ovs_tas/ovstas.py b/experiments/nodes/ovs_tas/ovstas.py
index bfd83f34..5aa7cb6b 100644
--- a/experiments/nodes/ovs_tas/ovstas.py
+++ b/experiments/nodes/ovs_tas/ovstas.py
@@ -22,28 +22,23 @@ def __init__(self, defaults, machine_config, tas_configs,
   def setup(self):
     super().setup()
 
-    self.start_ovs(self.defaults.ovs_ctl_path)
-    self.ovsbr_add("br0", 
+    self.start_ovs(self.vm_configs[0].manager_dir)
+    self.dpdk_ovsbr_add("br0", 
                    self.machine_config.ip + "/24", 
                    self.machine_config.interface,
                    self.vm_configs[0].manager_dir)
     
-    for vm_config in self.vm_configs:
-      # Tap that allows us to ssh to VM
-      self.ovstap_add("br0", 
-                      "tap{}".format(vm_config.id),
-                      0, 
-                      vm_config.manager_dir)
-      # TAP used by OvS
-      self.ovstap_add("br0", 
-                      "ovstap{}".format(vm_config.id),
-                      1, 
-                      vm_config.manager_dir)
+    # for vm_config in self.vm_configs:
+    #   # Tap that allows us to ssh to VM
+    #   self.ovstap_add("br0", 
+    #                   "tap{}".format(vm_config.id),
+    #                   0, 
+    #                   vm_config.manager_dir)
 
   def cleanup(self):
     super().cleanup()
     self.ovsbr_del("br0")
-    self.stop_ovs(self.defaults.ovs_ctl_path)
+    self.stop_ovs(self.vm_configs[0].manager_dir)
 
     cmd = "sudo ip addr add {} dev {}".format(self.machine_config.ip + "/24",
                                               self.machine_config.interface)
@@ -54,9 +49,12 @@ def cleanup(self):
     self.cleanup_pane.send_keys(cmd)
     time.sleep(1)
 
-    for vm_config in self.vm_configs:
-      self.tap_down("tap{}".format(vm_config.id), vm_config.manager_dir)
-      self.tap_down("ovstap{}".format(vm_config.id), vm_config.manager_dir)
+    # for vm_config in self.vm_configs:
+    #   self.tap_down("tap{}".format(vm_config.id), vm_config.manager_dir)
+    #   self.tap_down("ovstap{}".format(vm_config.id), vm_config.manager_dir)
+
+    for vm in self.vms:
+      vm.shutdown()
     
   def start_tas(self):
     for i in range(self.nodenum):
@@ -77,8 +75,7 @@ def start_vm(self, vm, vm_config):
     vm.enable_hugepages()
     vm.enable_noiommu("1af4 1110")
     vm.init_interface(vm_config.vm_ip, self.defaults.vm_interface)
-    vm.init_interface(vm_config.tas_tap_ip, self.defaults.tas_interface)
-    vm.dpdk_bind(vm_config.tas_tap_ip, self.defaults.tas_interface,
+    vm.dpdk_bind(vm_config.vm_ip, self.defaults.vm_interface,
         self.defaults.pci_id)
 
   def start_vms(self):
diff --git a/experiments/nodes/tap_tas/ttas.py b/experiments/nodes/tap_tas/ttas.py
index 6a3017a3..880af0b7 100644
--- a/experiments/nodes/tap_tas/ttas.py
+++ b/experiments/nodes/tap_tas/ttas.py
@@ -39,6 +39,9 @@ def cleanup(self):
       self.tap_down("tap{}".format(vm_config.id), vm_config.manager_dir)
       self.tap_down("tastap{}".format(vm_config.id), vm_config.manager_dir)
 
+    for vm in self.vms:
+      vm.shutdown()
+
   def start_tas(self):
     for i in range(self.nodenum):
       tas_config = self.tas_configs[i]
diff --git a/experiments/nodes/virt_linux/vlinux.py b/experiments/nodes/virt_linux/vlinux.py
index 90d36f7f..0b78471f 100644
--- a/experiments/nodes/virt_linux/vlinux.py
+++ b/experiments/nodes/virt_linux/vlinux.py
@@ -33,6 +33,9 @@ def cleanup(self):
     for vm_config in self.vm_configs:
       self.tap_down("tap{}".format(vm_config.id), vm_config.manager_dir)
 
+    for vm in self.vms:
+      vm.shutdown()
+
   def start_vm(self, vm, vm_config):
     vm.start()
     vm.init_interface(vm_config.vm_ip, self.defaults.vm_interface)
diff --git a/experiments/nodes/virt_tas/vtas.py b/experiments/nodes/virt_tas/vtas.py
index ca3a509d..59b09b9a 100644
--- a/experiments/nodes/virt_tas/vtas.py
+++ b/experiments/nodes/virt_tas/vtas.py
@@ -24,6 +24,11 @@ def start_vm(self, vm):
     vm.start()
     vm.enable_noiommu("1af4 1110")
 
+  def cleanup(self):
+    super().cleanup()
+    for vm in self.vms:
+      vm.shutdown()
+
   def start_vms(self):
     threads = []
     for vm_config in self.vm_configs:
diff --git a/images/br_down.sh b/images/br-down.sh
similarity index 100%
rename from images/br_down.sh
rename to images/br-down.sh
diff --git a/images/br_up.sh b/images/br-up.sh
similarity index 100%
rename from images/br_up.sh
rename to images/br-up.sh
diff --git a/images/dpdk_bind.sh b/images/dpdk-bind.sh
similarity index 100%
rename from images/dpdk_bind.sh
rename to images/dpdk-bind.sh
diff --git a/images/dpdk-ovsbr-add.sh b/images/dpdk-ovsbr-add.sh
new file mode 100644
index 00000000..0e47355c
--- /dev/null
+++ b/images/dpdk-ovsbr-add.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+if [ "$#" -ne 3 ]; then
+    echo "Illegal number of parameters"
+    echo "usage:"
+    echo "[br_name ip interface]"
+    exit
+fi
+
+br_name=$1
+ip=$2
+interface=$3
+
+
+# Create bridge using OvS
+echo "Creating bridge ${br_name} using OvS"
+ovs-vsctl add-br $br_name
+echo "Set bridge ${br_name} datapath type to netdev"
+ovs-vsctl set bridge $br_name datapath_type=netdev
+echo "Adding interface ${interface} to port"
+ovs-vsctl add-port $br_name $interface 
+echo "Set dpdkvhost interface ${interface}"
+ovs-vsctl set Interface $interface type=dpdkvhostuser options:n_rxq=12
+
+# Delete ip config from interface so that it can be added to bridge
+echo "Delete ip config from interface ${interface}"
+sudo ip addr del $ip dev $interface
+
+# Add ip address to bridge
+echo "Add ip ${ip} to bridge ${br_name}"
+sudo ip addr add $ip dev $br_name
+ifconfig $br_name up
\ No newline at end of file
diff --git a/images/ovs-start.sh b/images/ovs-start.sh
new file mode 100644
index 00000000..1a33e90b
--- /dev/null
+++ b/images/ovs-start.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# Start database server
+export DB_SOCK=/usr/local/var/run/openvswitch/db.sock
+echo "Creating conf.db and ovsschema"
+ovsdb-tool create /usr/local/etc/openvswitch/conf.db /usr/local/share/openvswitch/vswitch.ovsschema
+echo "Starting serverver at ${DB_SOCK}"
+ovsdb-server --remote=punix:${DB_SOCK} --remote=db:Open_vSwitch,Open_vSwitch,manager_options --pidfile --detach
+
+# Start OVS
+echo "Starting OVS"
+ovs-vsctl --no-wait init
+ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-lcore-mask=0xf
+ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-socket-mem=1024
+ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-init=true
+
+ovs-vswitchd unix:${DB_SOCK} --pidfile --detach --log-file=/usr/local/var/log/openvswitch/ovs-vswitchd.log
\ No newline at end of file
diff --git a/images/ovs-stop.sh b/images/ovs-stop.sh
new file mode 100644
index 00000000..cc057d37
--- /dev/null
+++ b/images/ovs-stop.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+killall ovsdb-server ovs-vswitchd
+rm -f /var/run/openvswitch/vhost-user*
+rm -f /usr/local/etc/openvswitch/conf.db
\ No newline at end of file
diff --git a/images/start-vm.sh b/images/start-vm.sh
index 9b1cc42b..767bfe6d 100755
--- a/images/start-vm.sh
+++ b/images/start-vm.sh
@@ -4,6 +4,7 @@ set -ex
 
 stack=$1
 vm_id=$2
+interface=$3
 
 stty intr ^]
 stty susp ^]
@@ -24,6 +25,8 @@ printf -v alt_mac '02:00:00:%02X:%02X:%02X' $((RANDOM%256)) $((RANDOM%256)) $((R
 echo $mac
 echo $alt_mac
 
+# Note: vectors=<2 + 2 * queues_nr>
+
 if [[ "$stack" == 'virt-tas' ]]; then
   sudo qemu-system-x86_64 \
     -nographic -monitor none -serial stdio \
@@ -77,12 +80,11 @@ elif [[ "$stack" == 'ovs-tas' ]]; then
     -smp 12 \
     -m 25G \
     -snapshot \
-    -netdev user,id=net0 \
+    -netdev user,id=net0,hostfwd=tcp::222${vm_id}-:22 \
     -device virtio-net-pci,netdev=net0 \
-    -netdev tap,ifname=$tap,script=no,downscript=no,vhost=on,id=net1 \
-    -device virtio-net-pci,mac=$mac,netdev=net1 \
-    -netdev tap,ifname=$ovstap,script=no,downscript=no,vhost=on,queues=10,id=net2 \
-    -device virtio-net-pci,mac=$alt_mac,vectors=18,mq=on,rss=on,hash=off,netdev=net2 \
+    -chardev socket,id=char0,path=/usr/local/var/run/openvswitch/$interface \
+    -netdev type=vhost-user,chardev=char0,vhostforce=on,queues=12,id=net1 \
+    -device virtio-net-pci,netdev=net1,mac=$alt_mac,mq=on,vectors=26 \
     -drive if=virtio,format=qcow2,file="base.snapshot.qcow2" \
     -drive if=virtio,format=raw,file="seed.img" \
     ;
diff --git a/images/tap_down.sh b/images/tap-down.sh
similarity index 100%
rename from images/tap_down.sh
rename to images/tap-down.sh
diff --git a/images/tap_up.sh b/images/tap-up.sh
similarity index 100%
rename from images/tap_up.sh
rename to images/tap-up.sh

From 59c7d2b0d01b5dd98bea562543d71189d8b3a21d Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Tue, 4 Apr 2023 16:06:51 +0200
Subject: [PATCH 45/50] turn off shmring lock for now

---
 proxy/shmring.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/proxy/shmring.c b/proxy/shmring.c
index 0de1ac09..638e9f03 100644
--- a/proxy/shmring.c
+++ b/proxy/shmring.c
@@ -79,24 +79,24 @@ int shmring_init_mux(struct ring_buffer *ring)
 
 int shmring_lock(struct ring_buffer *ring)
 {
-  struct ring_header *hdr = ring->hdr_addr;
-  if (pthread_mutex_lock(&hdr->mux) < 0)
-  {
-    fprintf(stderr, "shmring_lock: failed to acquire lock.\n");
-    return -1;
-  }
+  // struct ring_header *hdr = ring->hdr_addr;
+  // if (pthread_mutex_lock(&hdr->mux) < 0)
+  // {
+  //   fprintf(stderr, "shmring_lock: failed to acquire lock.\n");
+  //   return -1;
+  // }
 
   return 0;
 }
 
 int shmring_unlock(struct ring_buffer *ring)
 {
-  struct ring_header *hdr = ring->hdr_addr;
-  if (pthread_mutex_unlock(&hdr->mux) < 0)
-  {
-    fprintf(stderr, "shmring_lock: failed to release lock.\n");
-    return -1;
-  }
+  // struct ring_header *hdr = ring->hdr_addr;
+  // if (pthread_mutex_unlock(&hdr->mux) < 0)
+  // {
+  //   fprintf(stderr, "shmring_lock: failed to release lock.\n");
+  //   return -1;
+  // }
   return 0;
 }
 

From a733d0e32bff633ce409620bf72683d91c76cf82 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Tue, 4 Apr 2023 16:09:30 +0200
Subject: [PATCH 46/50] add param to do multiple runs of an experiment

---
 experiments/configs/gen_config.py             |  16 +++--
 .../perf_iso_latconn/configs/ovs_linux.py     |   4 +-
 .../exps/perf_iso_latconn/configs/ovs_tas.py  |   8 +--
 experiments/exps/perf_iso_latconn/parse.py    |  57 ++++++----------
 .../exps/perf_iso_latconn/perf_iso_latconn.py |  26 ++++----
 .../perf_iso_latmsize/configs/ovs_linux.py    |   4 +-
 .../exps/perf_iso_latmsize/configs/ovs_tas.py |   8 +--
 experiments/exps/perf_iso_latmsize/parse.py   |  62 +++++++-----------
 .../perf_iso_latmsize/perf_iso_latmsize.py    |  26 ++++----
 .../exps/perf_iso_tpconn/configs/bare_tas.py  |   4 +-
 .../exps/perf_iso_tpconn/configs/ovs_tas.py   |   4 +-
 experiments/exps/perf_iso_tpconn/parse.py     |  61 +++++++++--------
 .../exps/perf_iso_tpconn/perf_iso_tpconn.py   |  26 ++++----
 experiments/exps/perf_iso_tpconn/plot.pdf     | Bin 10765 -> 0 bytes
 .../exps/perf_iso_tpmsize/configs/ovs_tas.py  |   4 +-
 experiments/exps/perf_iso_tpmsize/parse.py    |  61 +++++++++--------
 .../exps/perf_iso_tpmsize/perf_iso_tpmsize.py |  26 ++++----
 .../exps/scalability/configs/tap_tas.py       |   4 +-
 experiments/plot_utils.py                     |  49 ++++++++++++++
 experiments/run.py                            |   2 -
 experiments/utils.py                          |  15 ++++-
 21 files changed, 251 insertions(+), 216 deletions(-)
 delete mode 100644 experiments/exps/perf_iso_tpconn/plot.pdf

diff --git a/experiments/configs/gen_config.py b/experiments/configs/gen_config.py
index 2995a89e..c5a93897 100644
--- a/experiments/configs/gen_config.py
+++ b/experiments/configs/gen_config.py
@@ -37,9 +37,9 @@ def __init__(self):
         # Network interface used to set ip for a VM
         self.vm_interface = "enp0s3"
         # Network interface used to bind TAS in tap VM
-        self.tas_interface = "enp0s4"
+        self.tas_interface = "enp0s3"
         # PCI Id of tas interface
-        self.pci_id = "0000:00:04.0"
+        self.pci_id = "0000:00:03.0"
 
         self.remote_connect_cmd = 'ssh swsnetlab04'
 
@@ -82,7 +82,8 @@ def __init__(self, pane, machine_config, project_dir, ip, n_cores,
         self.out = self.out_dir + '/' + self.out_file
         
         self.comp_dir = self.project_dir
-        self.comp_cmd = 'make'
+        self.comp_cmd = 'make -j6'
+        self.clean_cmd = 'make clean'
         self.lib_so = self.comp_dir + 'lib/libtas_interpose.so'
         self.exec_file = self.comp_dir + '/tas/tas'
         self.args = '--ip-addr={}/24 --fp-cores-max={}'.format(ip, n_cores) + \
@@ -119,7 +120,8 @@ def __init__(self, machine_config, comp_dir):
         self.ivshm_socket_path = '/run/tasproxy'
         
         self.comp_dir = comp_dir
-        self.comp_cmd = 'make'
+        self.comp_cmd = 'make -j6'
+        self.clean_cmd = 'make clean'
 
 class HostProxyConfig(ProxyConfig):
     def __init__(self, pane, machine_config, comp_dir):
@@ -152,7 +154,8 @@ def __init__(self, pane, idx, vmid,
         self.tas_dir = tas_dir
        
         self.comp_dir = bench_dir + "/micro_rpc"
-        self.comp_cmd = 'make'
+        self.comp_cmd = 'make -j6'
+        self.clean_cmd = 'make clean'
        
         self.bench_dir = bench_dir
         self.lib_so = tas_dir + '/lib/libtas_interpose.so'
@@ -180,7 +183,8 @@ def __init__(self, pane, idx, vmid,
         
         self.bench_dir = bench_dir
         self.comp_dir = bench_dir + "/micro_rpc"
-        self.comp_cmd = 'make'
+        self.comp_cmd = 'make -j6'
+        self.clean_cmd = 'make clean'
         self.lib_so = tas_dir + '/lib/libtas_interpose.so'
         self.exec_file = self.comp_dir + '/echoserver_linux'
         self.args = '{} {} foo {} {}'.format(port, ncores, \
diff --git a/experiments/exps/perf_iso_latconn/configs/ovs_linux.py b/experiments/exps/perf_iso_latconn/configs/ovs_linux.py
index 19545cd7..320c27c9 100644
--- a/experiments/exps/perf_iso_latconn/configs/ovs_linux.py
+++ b/experiments/exps/perf_iso_latconn/configs/ovs_linux.py
@@ -78,8 +78,8 @@ def __init__(self, exp_name, nconns):
         client0_config = ClientConfig(exp_name=exp_name, 
                 pane=self.defaults.c_client_pane,
                 idx=0, vmid=0, stack=self.cstack,
-                ip=self.defaults.server_ip, port=1234, ncores=3,
-                msize=64, mpending=64, nconns=128,
+                ip=self.defaults.server_ip, port=1234, ncores=1,
+                msize=64, mpending=64, nconns=1,
                 open_delay=15, max_msgs_conn=0, max_pend_conns=1,
                 bench_dir=self.defaults.default_vbenchmark_dir_virt,
                 tas_dir=self.defaults.default_vtas_dir_virt)
diff --git a/experiments/exps/perf_iso_latconn/configs/ovs_tas.py b/experiments/exps/perf_iso_latconn/configs/ovs_tas.py
index fe194204..283e5243 100644
--- a/experiments/exps/perf_iso_latconn/configs/ovs_tas.py
+++ b/experiments/exps/perf_iso_latconn/configs/ovs_tas.py
@@ -71,7 +71,7 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.c_machine_config,
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm0_config.tas_tap_ip,
-                n_cores=1, dpdk_extra="00:04.0")
+                n_cores=1, dpdk_extra="00:03.0")
         tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
         
 
@@ -84,7 +84,7 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.c_machine_config,
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm1_config.tas_tap_ip,
-                n_cores=1, dpdk_extra="00:04.0")
+                n_cores=1, dpdk_extra="00:03.0")
         tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
 
 
@@ -96,8 +96,8 @@ def __init__(self, exp_name, nconns):
         client0_config = ClientConfig(exp_name=exp_name, 
                 pane=self.defaults.c_client_pane,
                 idx=0, vmid=0, stack=self.cstack,
-                ip=self.defaults.server_ip, port=1234, ncores=3,
-                msize=64, mpending=64, nconns=128,
+                ip=self.defaults.server_ip, port=1234, ncores=1,
+                msize=64, mpending=64, nconns=1,
                 open_delay=15, max_msgs_conn=0, max_pend_conns=1,
                 bench_dir=self.defaults.default_obenchmark_dir_virt,
                 tas_dir=self.defaults.default_otas_dir_virt)
diff --git a/experiments/exps/perf_iso_latconn/parse.py b/experiments/exps/perf_iso_latconn/parse.py
index 66fd9e29..963ee77d 100644
--- a/experiments/exps/perf_iso_latconn/parse.py
+++ b/experiments/exps/perf_iso_latconn/parse.py
@@ -2,19 +2,9 @@
 sys.path.append("../../../")
 
 import os
-import re
-import functools
 import experiments.plot_utils as putils
 
 
-# For this experiment get the number of connections
-# from the experiment name, since client 0 and client 1
-# have a different number of connections
-def get_conns(fname):
-  regex = "(?<=-conns)[0-9]*"
-  nconns = re.search(regex, fname).group(0)
-  return nconns
-
 def check_nconns(data, nconns):
   if nconns not in data:
     data[nconns] = {}
@@ -23,29 +13,18 @@ def check_stack(data, nconns, stack):
   if stack not in data[nconns]:
     data[nconns][stack] = {}
 
-def check_nid(data, nconns, stack, nid):
-  if nid not in data[nconns][stack]:
-    data[nconns][stack][nid] = {}
-
-def check_cid(data, nconns, stack, nid, cid):
-  if cid not in data[nconns][stack][nid]:
-    data[nconns][stack][nid][cid] = ""
+def check_run(data, nconns, stack, run):
+  if run not in data[nconns][stack]:
+    data[nconns][stack][run] = {}
 
-def get_latencies(fname_c0):
-  f = open(fname_c0)
-  lines = f.readlines()
+def check_nid(data, nconns, stack, run, nid):
+  if nid not in data[nconns][stack][run]:
+    data[nconns][stack][run][nid] = {}
 
-  # Latencies are already accumulated over all time
-  # period in the logs
-  line = lines[len(lines) - 1]
-  latencies = {}
-  latencies["50p"] = putils.get_50p_lat(line)
-  latencies["90p"] = putils.get_90p_lat(line)
-  latencies["99p"] = putils.get_99p_lat(line)
-  latencies["99.9p"] = putils.get_99_9p_lat(line)
-  latencies["99.99p"] = putils.get_99_99p_lat(line)
+def check_cid(data, nconns, stack, run, nid, cid):
+  if cid not in data[nconns][stack][run][nid]:
+    data[nconns][stack][run][nid][cid] = ""
 
-  return latencies
 
 def parse_metadata():
   dir_path = "./out/"
@@ -57,17 +36,19 @@ def parse_metadata():
     if "tas_c" == fname:
       continue
 
-    nconns = get_conns(fname)
+    run = putils.get_expname_run(fname)
+    nconns = putils.get_expname_conns(fname)
     cid = putils.get_client_id(fname)
     nid = putils.get_node_id(fname)
     stack = putils.get_stack(fname)
 
     check_nconns(data, nconns)
     check_stack(data, nconns, stack)
-    check_nid(data, nconns, stack, nid)
-    check_cid(data, nconns, stack, nid, cid)
+    check_run(data, nconns, stack, run)
+    check_nid(data, nconns, stack, run, nid)
+    check_cid(data, nconns, stack, run, nid, cid)
 
-    data[nconns][stack][nid][cid] = fname
+    data[nconns][stack][run][nid][cid] = fname
 
   return data
 
@@ -77,8 +58,12 @@ def parse_data(parsed_md):
   for nconns in parsed_md:
     data_point = {}
     for stack in parsed_md[nconns]:
-      fname_c0 = out_dir + parsed_md[nconns][stack]['0']['0']
-      latencies = get_latencies(fname_c0)
+      latencies = putils.init_latencies()
+      for run in parsed_md[nconns][stack]:
+        fname_c0 = out_dir + parsed_md[nconns][stack][run]['0']['0']
+        putils.add_latencies(latencies, fname_c0)
+      
+      putils.divide_latencies(latencies, len(parsed_md[nconns][stack]))
       data_point[stack] = latencies
   
     lat_list[nconns] = data_point
diff --git a/experiments/exps/perf_iso_latconn/perf_iso_latconn.py b/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
index cbfb6c7b..54998a2e 100644
--- a/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
+++ b/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
@@ -9,18 +9,20 @@
 experiments = []
 
 n_conns = [128, 256, 512, 1024, 2048, 4096, 8192]
+n_runs = 3
 
-for n in n_conns:
-  exp_name = "perf-iso-latconn-conns{}_".format(n)
-  tas_bare_exp = exp.Experiment(TasBareConf(exp_name + "bare-tas", n), name=exp_name)
-  vtas_bare_exp = exp.Experiment(VTasBareConf(exp_name + "bare-vtas", n), name=exp_name)
-  tas_virt_exp = exp.Experiment(TasVirtConf(exp_name + "virt-tas", n), name=exp_name)
-  ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n), name=exp_name)
-  ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n), name=exp_name)
+for n_r in range(n_runs):
+  for n_c in n_conns:
+    exp_name = "perf-iso-latconn-run{}-conns{}_".format(n_r, n_c)
+    tas_bare_exp = exp.Experiment(TasBareConf(exp_name + "bare-tas", n_c), name=exp_name)
+    vtas_bare_exp = exp.Experiment(VTasBareConf(exp_name + "bare-vtas", n_c), name=exp_name)
+    tas_virt_exp = exp.Experiment(TasVirtConf(exp_name + "virt-tas", n_c), name=exp_name)
+    ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n_c), name=exp_name)
+    ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n_c), name=exp_name)
 
-  experiments.append(tas_bare_exp)
-  experiments.append(vtas_bare_exp)
-  experiments.append(tas_virt_exp)
-  experiments.append(ovs_tas_exp)
-  experiments.append(ovs_linux_exp)
+    experiments.append(tas_bare_exp)
+    experiments.append(vtas_bare_exp)
+    experiments.append(tas_virt_exp)
+    experiments.append(ovs_tas_exp)
+    experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/perf_iso_latmsize/configs/ovs_linux.py b/experiments/exps/perf_iso_latmsize/configs/ovs_linux.py
index eafeb4d1..fbf948b3 100644
--- a/experiments/exps/perf_iso_latmsize/configs/ovs_linux.py
+++ b/experiments/exps/perf_iso_latmsize/configs/ovs_linux.py
@@ -78,8 +78,8 @@ def __init__(self, exp_name, msize):
         client0_config = ClientConfig(exp_name=exp_name, 
                 pane=self.defaults.c_client_pane,
                 idx=0, vmid=0, stack=self.cstack,
-                ip=self.defaults.server_ip, port=1234, ncores=3,
-                msize=64, mpending=64, nconns=128,
+                ip=self.defaults.server_ip, port=1234, ncores=1,
+                msize=64, mpending=64, nconns=1,
                 open_delay=15, max_msgs_conn=0, max_pend_conns=1,
                 bench_dir=self.defaults.default_vbenchmark_dir_virt,
                 tas_dir=self.defaults.default_vtas_dir_virt)
diff --git a/experiments/exps/perf_iso_latmsize/configs/ovs_tas.py b/experiments/exps/perf_iso_latmsize/configs/ovs_tas.py
index b87e3c04..cd985cd3 100644
--- a/experiments/exps/perf_iso_latmsize/configs/ovs_tas.py
+++ b/experiments/exps/perf_iso_latmsize/configs/ovs_tas.py
@@ -71,7 +71,7 @@ def __init__(self, exp_name, msize):
                 machine_config=self.c_machine_config,
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm0_config.tas_tap_ip,
-                n_cores=1, dpdk_extra="00:04.0")
+                n_cores=1, dpdk_extra="00:03.0")
         tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
         
 
@@ -84,7 +84,7 @@ def __init__(self, exp_name, msize):
                 machine_config=self.c_machine_config,
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm1_config.tas_tap_ip,
-                n_cores=1, dpdk_extra="00:04.0")
+                n_cores=1, dpdk_extra="00:03.0")
         tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
 
 
@@ -96,8 +96,8 @@ def __init__(self, exp_name, msize):
         client0_config = ClientConfig(exp_name=exp_name, 
                 pane=self.defaults.c_client_pane,
                 idx=0, vmid=0, stack=self.cstack,
-                ip=self.defaults.server_ip, port=1234, ncores=3,
-                msize=64, mpending=64, nconns=128,
+                ip=self.defaults.server_ip, port=1234, ncores=1,
+                msize=64, mpending=64, nconns=1,
                 open_delay=15, max_msgs_conn=0, max_pend_conns=1,
                 bench_dir=self.defaults.default_obenchmark_dir_virt,
                 tas_dir=self.defaults.default_otas_dir_virt)
diff --git a/experiments/exps/perf_iso_latmsize/parse.py b/experiments/exps/perf_iso_latmsize/parse.py
index d73d36da..1251fdf0 100644
--- a/experiments/exps/perf_iso_latmsize/parse.py
+++ b/experiments/exps/perf_iso_latmsize/parse.py
@@ -2,19 +2,9 @@
 sys.path.append("../../../")
 
 import os
-import re
-import functools
 import experiments.plot_utils as putils
 
 
-# For this experiment get the message size
-# from the experiment name, since client 0 and client 1
-# have a different message size
-def get_msize(fname):
-  regex = "(?<=-msize)[0-9]*"
-  msize = re.search(regex, fname).group(0)
-  return msize
-
 def check_msize(data, msize):
   if msize not in data:
     data[msize] = {}
@@ -23,29 +13,17 @@ def check_stack(data, nconns, stack):
   if stack not in data[nconns]:
     data[nconns][stack] = {}
 
-def check_nid(data, nconns, stack, nid):
-  if nid not in data[nconns][stack]:
-    data[nconns][stack][nid] = {}
-
-def check_cid(data, nconns, stack, nid, cid):
-  if cid not in data[nconns][stack][nid]:
-    data[nconns][stack][nid][cid] = ""
+def check_run(data, msize, stack, run):
+  if run not in data[msize][stack]:
+    data[msize][stack][run] = {}
 
-def get_latencies(fname_c0):
-  f = open(fname_c0)
-  lines = f.readlines()
+def check_nid(data, msize, stack, run, nid):
+  if nid not in data[msize][stack][run]:
+    data[msize][stack][run][nid] = {}
 
-  # Latencies are already accumulated over all time
-  # period in the logs
-  line = lines[len(lines) - 1]
-  latencies = {}
-  latencies["50p"] = putils.get_50p_lat(line)
-  latencies["90p"] = putils.get_90p_lat(line)
-  latencies["99p"] = putils.get_99p_lat(line)
-  latencies["99.9p"] = putils.get_99_9p_lat(line)
-  latencies["99.99p"] = putils.get_99_99p_lat(line)
-
-  return latencies
+def check_cid(data, msize, stack, run, nid, cid):
+  if cid not in data[msize][stack][run][nid]:
+    data[msize][stack][run][nid][cid] = ""
 
 def parse_metadata():
   dir_path = "./out/"
@@ -56,18 +34,20 @@ def parse_metadata():
     
     if "tas_c" == fname:
       continue
-
-    msize = get_msize(fname)
-    cid = putils.get_client_id(fname)
+    
+    run = putils.get_expname_runs(fname)
+    msize = putils.get_expname_msize(fname)
     nid = putils.get_node_id(fname)
+    cid = putils.get_client_id(fname)
     stack = putils.get_stack(fname)
 
     check_msize(data, msize)
     check_stack(data, msize, stack)
-    check_nid(data, msize, stack, nid)
-    check_cid(data, msize, stack, nid, cid)
+    check_run(data, msize, stack, run)
+    check_nid(data, msize, stack, run, nid)
+    check_cid(data, msize, stack, run, nid, cid)
 
-    data[msize][stack][nid][cid] = fname
+    data[msize][stack][run][nid][cid] = fname
 
   return data
 
@@ -77,8 +57,12 @@ def parse_data(parsed_md):
   for msize in parsed_md:
     data_point = {}
     for stack in parsed_md[msize]:
-      fname_c0 = out_dir + parsed_md[msize][stack]['0']['0']
-      latencies = get_latencies(fname_c0)
+      latencies = putils.init_latencies()
+      for run in parsed_md[msize][stack]:
+        fname_c0 = out_dir + parsed_md[msize][stack][run]['0']['0']
+        putils.add_latencies(latencies, fname_c0)
+      
+      putils.divide_latencies(latencies, len(parsed_md[msize][stack]))
       data_point[stack] = latencies
   
     lat_list[msize] = data_point
diff --git a/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py b/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py
index 12f95188..78bae988 100644
--- a/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py
+++ b/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py
@@ -9,18 +9,20 @@
 experiments = []
 
 msize = [64, 128, 256, 512, 1024, 2048]
+n_runs = 3
 
-for n in msize:
-  exp_name = "perf-iso-latmsize-msize{}_".format(n)
-  tas_bare_exp = exp.Experiment(TasBareConf(exp_name + "bare-tas", n), name=exp_name)
-  vtas_bare_exp = exp.Experiment(VTasBareConf(exp_name + "bare-vtas", n), name=exp_name)
-  tas_virt_exp = exp.Experiment(TasVirtConf(exp_name + "virt-tas", n), name=exp_name)
-  ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n), name=exp_name)
-  ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n), name=exp_name)
+for n_r in range(n_runs):
+  for n_m in msize:
+    exp_name = "perf-iso-latmsize-run{}-msize{}_".format(n_r, n_m)
+    tas_bare_exp = exp.Experiment(TasBareConf(exp_name + "bare-tas", n_m), name=exp_name)
+    vtas_bare_exp = exp.Experiment(VTasBareConf(exp_name + "bare-vtas", n_m), name=exp_name)
+    tas_virt_exp = exp.Experiment(TasVirtConf(exp_name + "virt-tas", n_m), name=exp_name)
+    ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n_m), name=exp_name)
+    ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n_m), name=exp_name)
 
-  experiments.append(tas_bare_exp)
-  experiments.append(vtas_bare_exp)
-  experiments.append(tas_virt_exp)
-  experiments.append(ovs_tas_exp)
-  experiments.append(ovs_linux_exp)
+    experiments.append(tas_bare_exp)
+    experiments.append(vtas_bare_exp)
+    experiments.append(tas_virt_exp)
+    experiments.append(ovs_tas_exp)
+    experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/perf_iso_tpconn/configs/bare_tas.py b/experiments/exps/perf_iso_tpconn/configs/bare_tas.py
index 5b482190..74a375f8 100644
--- a/experiments/exps/perf_iso_tpconn/configs/bare_tas.py
+++ b/experiments/exps/perf_iso_tpconn/configs/bare_tas.py
@@ -34,12 +34,12 @@ def __init__(self, exp_name, nconns):
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=1024,
+                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=1024,
+                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
diff --git a/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py b/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
index fe194204..cda97e28 100644
--- a/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
+++ b/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
@@ -71,7 +71,7 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.c_machine_config,
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm0_config.tas_tap_ip,
-                n_cores=1, dpdk_extra="00:04.0")
+                n_cores=1, dpdk_extra="00:03.0")
         tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
         
 
@@ -84,7 +84,7 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.c_machine_config,
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm1_config.tas_tap_ip,
-                n_cores=1, dpdk_extra="00:04.0")
+                n_cores=1, dpdk_extra="00:03.0")
         tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
 
 
diff --git a/experiments/exps/perf_iso_tpconn/parse.py b/experiments/exps/perf_iso_tpconn/parse.py
index 703c9e5c..c0b58d50 100644
--- a/experiments/exps/perf_iso_tpconn/parse.py
+++ b/experiments/exps/perf_iso_tpconn/parse.py
@@ -5,15 +5,6 @@
 import re
 import experiments.plot_utils as putils
 
-
-# For this experiment get the number of connections
-# from the experiment name, since client 0 and client 1
-# have a different number of connections
-def get_conns(fname):
-  regex = "(?<=-conns)[0-9]*"
-  nconns = re.search(regex, fname).group(0)
-  return nconns
-
 def check_nconns(data, nconns):
   if nconns not in data:
     data[nconns] = {}
@@ -22,13 +13,17 @@ def check_stack(data, nconns, stack):
   if stack not in data[nconns]:
     data[nconns][stack] = {}
 
-def check_nid(data, nconns, stack, nid):
-  if nid not in data[nconns][stack]:
-    data[nconns][stack][nid] = {}
+def check_run(data, nconns, stack, run):
+  if run not in data[nconns][stack]:
+    data[nconns][stack][run] = {}
+
+def check_nid(data, nconns, stack, run, nid):
+  if nid not in data[nconns][stack][run]:
+    data[nconns][stack][run][nid] = {}
 
-def check_cid(data, nconns, stack, nid, cid):
-  if cid not in data[nconns][stack][nid]:
-    data[nconns][stack][nid][cid] = ""
+def check_cid(data, nconns, stack, run, nid, cid):
+  if cid not in data[nconns][stack][run][nid]:
+    data[nconns][stack][run][nid][cid] = ""
 
 def get_avg_tp(fname_c0, fname_c1):
   n_messages = 0
@@ -48,7 +43,7 @@ def get_avg_tp(fname_c0, fname_c1):
   msize = int(putils.get_msize(fname_c0))
   n = len(lines) - idx
 
-  return str((n_messages * msize * 8 / n) / 1000000)
+  return (n_messages * msize * 8 / n) / 1000000
 
 def parse_metadata():
   dir_path = "./out/"
@@ -60,17 +55,19 @@ def parse_metadata():
     if "tas_c" == fname:
       continue
 
-    nconns = get_conns(fname)
+    run = putils.get_expname_run(fname)
+    nconns = putils.get_expname_conns(fname)
     cid = putils.get_client_id(fname)
     nid = putils.get_node_id(fname)
     stack = putils.get_stack(fname)
 
     check_nconns(data, nconns)
     check_stack(data, nconns, stack)
-    check_nid(data, nconns, stack, nid)
-    check_cid(data, nconns, stack, nid, cid)
+    check_run(data, nconns, stack, run)
+    check_nid(data, nconns, stack, run, nid)
+    check_cid(data, nconns, stack, run, nid, cid)
 
-    data[nconns][stack][nid][cid] = fname
+    data[nconns][stack][run][nid][cid] = fname
 
   return data
 
@@ -80,17 +77,19 @@ def parse_data(parsed_md):
   for nconns in parsed_md:
     data_point = {"nconns": nconns}
     for stack in parsed_md[nconns]:
-      is_virt = stack == "virt-tas" or stack == "ovs-tas" or stack == "ovs-linux"
-      if is_virt:
-        c0_fname = out_dir + parsed_md[nconns][stack]["0"]["0"]
-        c1_fname = out_dir + parsed_md[nconns][stack]["1"]["0"]
-      else:
-        c0_fname = out_dir + parsed_md[nconns][stack]["0"]["0"]
-        c1_fname = out_dir + parsed_md[nconns][stack]["0"]["1"]
-
-      avg_tp = get_avg_tp(c0_fname, c1_fname)
-
-      data_point[stack] = avg_tp
+      avg_tp = 0
+      for run in parsed_md[nconns][stack]:
+        is_virt = stack == "virt-tas" or stack == "ovs-tas" or stack == "ovs-linux"
+        if is_virt:
+          c0_fname = out_dir + parsed_md[nconns][stack][run]["0"]["0"]
+          c1_fname = out_dir + parsed_md[nconns][stack][run]["1"]["0"]
+        else:
+          c0_fname = out_dir + parsed_md[nconns][stack][run]["0"]["0"]
+          c1_fname = out_dir + parsed_md[nconns][stack][run]["0"]["1"]
+
+        avg_tp += get_avg_tp(c0_fname, c1_fname)
+
+      data_point[stack] = avg_tp / len(parsed_md[nconns][stack])
   
     tp.append(data_point)
   
diff --git a/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py b/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
index fac2cb1d..017a3143 100644
--- a/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
+++ b/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
@@ -9,18 +9,20 @@
 experiments = []
 
 n_conns = [128, 256, 512, 1024, 2048, 4096, 8192]
+n_runs = 3
 
-for n in n_conns:
-  exp_name = "perf-iso-tpconn-conns{}_".format(n)
-  tas_bare_exp = exp.Experiment(TasBareConf(exp_name + "bare-tas", n), name=exp_name)
-  vtas_bare_exp = exp.Experiment(VTasBareConf(exp_name + "bare-vtas", n), name=exp_name)
-  tas_virt_exp = exp.Experiment(TasVirtConf(exp_name + "virt-tas", n), name=exp_name)
-  ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n), name=exp_name)
-  ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n), name=exp_name)
+for n_r in range(n_runs):
+  for n_c in n_conns:
+    exp_name = "perf-iso-tpconn-run{}-conns{}_".format(n_r, n_c)
+    tas_bare_exp = exp.Experiment(TasBareConf(exp_name + "bare-tas", n_c), name=exp_name)
+    vtas_bare_exp = exp.Experiment(VTasBareConf(exp_name + "bare-vtas", n_c), name=exp_name)
+    tas_virt_exp = exp.Experiment(TasVirtConf(exp_name + "virt-tas", n_c), name=exp_name)
+    ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n_c), name=exp_name)
+    ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n_c), name=exp_name)
 
-  experiments.append(tas_bare_exp)
-  experiments.append(vtas_bare_exp)
-  experiments.append(tas_virt_exp)
-  experiments.append(ovs_tas_exp)
-  experiments.append(ovs_linux_exp)
+    experiments.append(tas_bare_exp)
+    experiments.append(vtas_bare_exp)
+    experiments.append(tas_virt_exp)
+    experiments.append(ovs_tas_exp)
+    experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/perf_iso_tpconn/plot.pdf b/experiments/exps/perf_iso_tpconn/plot.pdf
deleted file mode 100644
index 964aa0c37914bc5e48cf09c79c9ae9b244b33933..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10765
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

diff --git a/experiments/exps/perf_iso_tpmsize/configs/ovs_tas.py b/experiments/exps/perf_iso_tpmsize/configs/ovs_tas.py
index b87e3c04..3c5942ec 100644
--- a/experiments/exps/perf_iso_tpmsize/configs/ovs_tas.py
+++ b/experiments/exps/perf_iso_tpmsize/configs/ovs_tas.py
@@ -71,7 +71,7 @@ def __init__(self, exp_name, msize):
                 machine_config=self.c_machine_config,
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm0_config.tas_tap_ip,
-                n_cores=1, dpdk_extra="00:04.0")
+                n_cores=1, dpdk_extra="00:03.0")
         tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
         
 
@@ -84,7 +84,7 @@ def __init__(self, exp_name, msize):
                 machine_config=self.c_machine_config,
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm1_config.tas_tap_ip,
-                n_cores=1, dpdk_extra="00:04.0")
+                n_cores=1, dpdk_extra="00:03.0")
         tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
 
 
diff --git a/experiments/exps/perf_iso_tpmsize/parse.py b/experiments/exps/perf_iso_tpmsize/parse.py
index 6c3d482f..fba9b93b 100644
--- a/experiments/exps/perf_iso_tpmsize/parse.py
+++ b/experiments/exps/perf_iso_tpmsize/parse.py
@@ -2,18 +2,9 @@
 sys.path.append("../../../")
 
 import os
-import re
 import experiments.plot_utils as putils
 
 
-# For this experiment get the message size
-# from the experiment name, since client 0 and client 1
-# have different message sizes
-def get_msize(fname):
-  regex = "(?<=-msize)[0-9]*"
-  msize = re.search(regex, fname).group(0)
-  return msize
-
 def check_msize(data, msize):
   if msize not in data:
     data[msize] = {}
@@ -22,13 +13,17 @@ def check_stack(data, msize, stack):
   if stack not in data[msize]:
     data[msize][stack] = {}
 
-def check_nid(data, msize, stack, nid):
-  if nid not in data[msize][stack]:
-    data[msize][stack][nid] = {}
+def check_run(data, msize, stack, run):
+  if run not in data[msize][stack]:
+    data[msize][stack][run] = {}
+
+def check_nid(data, msize, stack, run, nid):
+  if nid not in data[msize][stack][run]:
+    data[msize][stack][run][nid] = {}
 
-def check_cid(data, msize, stack, nid, cid):
-  if cid not in data[msize][stack][nid]:
-    data[msize][stack][nid][cid] = ""
+def check_cid(data, msize, stack, run, nid, cid):
+  if cid not in data[msize][stack][run][nid]:
+    data[msize][stack][run][nid][cid] = ""
 
 def get_avg_tp(fname_c0, fname_c1):
   n_messages = 0
@@ -48,7 +43,7 @@ def get_avg_tp(fname_c0, fname_c1):
   msize = int(putils.get_msize(fname_c0))
   n = len(lines) - idx
 
-  return str((n_messages * msize * 8 / n) / 1000000)
+  return (n_messages * msize * 8 / n) / 1000000
 
 def parse_metadata():
   dir_path = "./out/"
@@ -60,17 +55,19 @@ def parse_metadata():
     if "tas_c" == fname:
       continue
 
-    msize = get_msize(fname)
+    run = putils.get_expname_run(fname)
+    msize = putils.get_expname_msize(fname)
     cid = putils.get_client_id(fname)
     nid = putils.get_node_id(fname)
     stack = putils.get_stack(fname)
 
     check_msize(data, msize)
     check_stack(data, msize, stack)
-    check_nid(data, msize, stack, nid)
-    check_cid(data, msize, stack, nid, cid)
+    check_run(data, msize, stack, run)
+    check_nid(data, msize, stack, run, nid)
+    check_cid(data, msize, stack, run, nid, cid)
 
-    data[msize][stack][nid][cid] = fname
+    data[msize][stack][run][nid][cid] = fname
 
   return data
 
@@ -80,17 +77,19 @@ def parse_data(parsed_md):
   for msize in parsed_md:
     data_point = {"msize": msize}
     for stack in parsed_md[msize]:
-      is_virt = stack == "virt-tas" or stack == "ovs-tas" or stack == "ovs-linux"
-      if is_virt:
-        c0_fname = out_dir + parsed_md[msize][stack]["0"]["0"]
-        c1_fname = out_dir + parsed_md[msize][stack]["1"]["0"]
-      else:
-        c0_fname = out_dir + parsed_md[msize][stack]["0"]["0"]
-        c1_fname = out_dir + parsed_md[msize][stack]["0"]["1"]
-
-      avg_tp = get_avg_tp(c0_fname, c1_fname)
-
-      data_point[stack] = avg_tp
+      avg_tp = 0
+      for run in parsed_md[msize][stack]:
+        is_virt = stack == "virt-tas" or stack == "ovs-tas" or stack == "ovs-linux"
+        if is_virt:
+          c0_fname = out_dir + parsed_md[msize][stack][run]["0"]["0"]
+          c1_fname = out_dir + parsed_md[msize][stack][run]["1"]["0"]
+        else:
+          c0_fname = out_dir + parsed_md[msize][stack][run]["0"]["0"]
+          c1_fname = out_dir + parsed_md[msize][stack][run]["0"]["1"]
+
+        avg_tp += get_avg_tp(c0_fname, c1_fname)
+
+      data_point[stack] = avg_tp / len(parsed_md[msize][stack])
   
     tp.append(data_point)
   
diff --git a/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py b/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
index 92958476..e209c033 100644
--- a/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
+++ b/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
@@ -9,18 +9,20 @@
 experiments = []
 
 msize = [64, 128, 256, 512, 1024, 2048]
+n_runs = 3
 
-for n in msize:
-  exp_name = "perf-iso-tpconn-msize{}_".format(n)
-  tas_bare_exp = exp.Experiment(TasBareConf(exp_name + "bare-tas", n), name=exp_name)
-  vtas_bare_exp = exp.Experiment(VTasBareConf(exp_name + "bare-vtas", n), name=exp_name)
-  tas_virt_exp = exp.Experiment(TasVirtConf(exp_name + "virt-tas", n), name=exp_name)
-  ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n), name=exp_name)
-  ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n), name=exp_name)
+for n_r in range(n_runs):
+  for n_m in msize:
+    exp_name = "perf-iso-tpconn-run{}-msize{}_".format(n_r, n_m)
+    tas_bare_exp = exp.Experiment(TasBareConf(exp_name + "bare-tas", n_m), name=exp_name)
+    vtas_bare_exp = exp.Experiment(VTasBareConf(exp_name + "bare-vtas", n_m), name=exp_name)
+    tas_virt_exp = exp.Experiment(TasVirtConf(exp_name + "virt-tas", n_m), name=exp_name)
+    ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n_m), name=exp_name)
+    ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n_m), name=exp_name)
 
-  experiments.append(tas_bare_exp)
-  experiments.append(vtas_bare_exp)
-  experiments.append(tas_virt_exp)
-  experiments.append(ovs_tas_exp)
-  experiments.append(ovs_linux_exp)
+    experiments.append(tas_bare_exp)
+    experiments.append(vtas_bare_exp)
+    experiments.append(tas_virt_exp)
+    experiments.append(ovs_tas_exp)
+    experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/scalability/configs/tap_tas.py b/experiments/exps/scalability/configs/tap_tas.py
index 5a247c5d..b4529c79 100644
--- a/experiments/exps/scalability/configs/tap_tas.py
+++ b/experiments/exps/scalability/configs/tap_tas.py
@@ -37,7 +37,7 @@ def __init__(self, exp_name, nconns):
                     machine_config=self.s_machine_config,
                     project_dir=self.defaults.default_otas_dir_virt,
                     ip=vm_config.tas_tap_ip,
-                    n_cores=10, dpdk_extra="00:04.0")
+                    n_cores=10, dpdk_extra="00:03.0")
             self.s_tas_configs.append(tas_config)
 
             for j in range(self.snum):
@@ -75,7 +75,7 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.c_machine_config,
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm_config.tas_tap_ip,
-                n_cores=10, dpdk_extra="00:04.0")
+                n_cores=10, dpdk_extra="00:03.0")
             self.c_tas_configs.append(tas_config)
 
             for j in range(self.cnum):
diff --git a/experiments/plot_utils.py b/experiments/plot_utils.py
index d72fdc08..2d36b0e4 100644
--- a/experiments/plot_utils.py
+++ b/experiments/plot_utils.py
@@ -1,5 +1,54 @@
+
 import re
 
+def init_latencies():
+  latencies = {
+    "50p": 0,
+    "90p": 0,
+    "99p": 0,
+    "99.9p": 0,
+    "99.99p": 0
+  }
+
+  return latencies
+
+def divide_latencies(latencies, den):
+  latencies["50p"] /= den
+  latencies["90p"] /= den
+  latencies["99p"] /= den
+  latencies["99.9p"] /= den
+  latencies["99.99p"] /= den
+
+def add_latencies(latencies, fname_c0):
+  f = open(fname_c0)
+  lines = f.readlines()
+
+  # Latencies are already accumulated over all time
+  # period in the logs
+  line = lines[len(lines) - 1]
+  latencies["50p"] += int(get_50p_lat(line))
+  latencies["90p"] += int(get_90p_lat(line))
+  latencies["99p"] += int(get_99p_lat(line))
+  latencies["99.9p"] += int(get_99_9p_lat(line))
+  latencies["99.99p"] += int(get_99_99p_lat(line))
+
+  return latencies
+
+def get_expname_msize(fname):
+  regex = "(?<=-msize)[0-9]*"
+  msize = re.search(regex, fname).group(0)
+  return msize
+
+def get_expname_run(fname):
+  run_id_regex = "(?<=-run)[0-9]*"
+  run_id = re.search(run_id_regex, fname).group(0)
+  return run_id
+
+def get_expname_conns(fname):
+  regex = "(?<=-conns)[0-9]*"
+  nconns = re.search(regex, fname).group(0)
+  return nconns
+
 def get_stack(line):
   stack_regex = "(?<=_)([a-z]+-[a-z]+)(?=_)"
   stack = re.search(stack_regex, line).group(0)
diff --git a/experiments/run.py b/experiments/run.py
index de21a74b..bb749cb7 100644
--- a/experiments/run.py
+++ b/experiments/run.py
@@ -29,7 +29,6 @@
 
 for path in args.experiments:
     modname, _ = os.path.splitext(os.path.basename(path))
-    print(modname)
     spec = importlib.util.spec_from_file_location(modname, path)
     mod = importlib.util.module_from_spec(spec)
     spec.loader.exec_module(mod)
@@ -53,7 +52,6 @@
             continue
     print('******' + e.get_name() + '********')
     e.run()
-    print(e.get_name()) 
     time.sleep(80)
     e.save_logs()
     time.sleep(15)
diff --git a/experiments/utils.py b/experiments/utils.py
index 7c9a035a..b7ec6adb 100644
--- a/experiments/utils.py
+++ b/experiments/utils.py
@@ -2,7 +2,7 @@
 
 def get_ssh_command(machine_config, vm_config):
     stack = machine_config.stack
-    if stack == "virt-tas":
+    if stack == "virt-tas" or stack == "ovs-tas":
         ssh_com = "ssh -p 222{} tas@localhost".format(vm_config.id)
     else:
         ssh_com = "ssh tas@{}".format(vm_config.vm_ip)
@@ -19,18 +19,27 @@ def get_scp_command(machine_config, vm_config, src_path, save_path):
     
     return ssh_com
 
-def compile_and_run(pane, comp_dir, comp_cmd, 
+def compile_and_run(pane, comp_dir, comp_cmd, clean_cmd,
         exec_file, args, out,
-        bg=False, gdb=False, 
+        bg=False, gdb=False,
+        valgrind=False, clean=False,
         break_file=None, line_break=None, save_log=False):
 
     pane.send_keys('cd ' + comp_dir)
     pane.send_keys('git pull')
     time.sleep(1)
+    
+    if clean:
+        pane.send_keys(clean_cmd)
+        time.sleep(1)
+    
     pane.send_keys(comp_cmd)
+    time.sleep(3)
 
     if gdb:
         cmd = 'sudo gdb --args ' + exec_file + ' ' + args
+    elif valgrind:
+        cmd = 'sudo valgrind --leak-check=yes ' + exec_file + ' ' + args
     else:
         cmd = 'sudo ' + exec_file + ' ' + args
 

From 9b6199829f7c50f19fb96a2afe6896d6ec4df0e9 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Wed, 5 Apr 2023 00:40:36 +0200
Subject: [PATCH 47/50] get ovs-linux to work with vhost

---
 experiments/exps/perf_iso_latconn/parse.py    |  9 ++----
 .../{plot_script => plot_script.plt}          | 16 +++++-----
 experiments/exps/perf_iso_latmsize/parse.py   |  4 +--
 .../{plot_script => plot_script.plt}          | 16 +++++-----
 .../exps/perf_iso_tpconn/configs/ovs_tas.py   |  5 ++-
 .../exps/perf_iso_tpconn/plot_script.plt      |  5 +--
 .../exps/perf_iso_tpmsize/plot_script.plt     |  1 +
 experiments/nodes/node.py                     | 15 +++++----
 experiments/nodes/ovs_linux/ovslinux.py       | 10 ++----
 experiments/nodes/ovs_tas/ovstas.py           | 22 +++++--------
 experiments/nodes/tap_tas/ttas.py             |  2 +-
 experiments/utils.py                          |  5 +--
 images/dpdk-ovsbr-add.sh                      | 32 -------------------
 images/ovsbr-add.sh                           |  1 +
 images/ovsvhost-add.sh                        | 18 +++++++++++
 images/start-vm.sh                            | 20 ++++++++----
 16 files changed, 82 insertions(+), 99 deletions(-)
 rename experiments/exps/perf_iso_latconn/{plot_script => plot_script.plt} (78%)
 rename experiments/exps/perf_iso_latmsize/{plot_script => plot_script.plt} (78%)
 delete mode 100644 images/dpdk-ovsbr-add.sh
 create mode 100644 images/ovsvhost-add.sh

diff --git a/experiments/exps/perf_iso_latconn/parse.py b/experiments/exps/perf_iso_latconn/parse.py
index 963ee77d..5d0e0b9d 100644
--- a/experiments/exps/perf_iso_latconn/parse.py
+++ b/experiments/exps/perf_iso_latconn/parse.py
@@ -71,7 +71,7 @@ def parse_data(parsed_md):
   return lat_list
 
 def save_dat_file(exp_lats):
-  header = "nconns bare-tas bare-vtas virt-tas ovs-linux ovs-tas\n"
+  header = "nconns bare-tas bare-vtas\n"
   
   nconns = list(exp_lats.keys())
   nconns = list(map(str, sorted(map(int, nconns))))
@@ -84,13 +84,10 @@ def save_dat_file(exp_lats):
       f.write(header)
 
       for nconn in nconns:
-        f.write("{} {} {} {} {} {}\n".format(
+        f.write("{} {} {}\n".format(
           nconn,
           exp_lats[nconn]['bare-tas'][percentile],
-          exp_lats[nconn]['bare-vtas'][percentile],
-          exp_lats[nconn]['virt-tas'][percentile],
-          exp_lats[nconn]['ovs-linux'][percentile],
-          exp_lats[nconn]['ovs-tas'][percentile])
+          exp_lats[nconn]['bare-vtas'][percentile])
         )
         
 def main():
diff --git a/experiments/exps/perf_iso_latconn/plot_script b/experiments/exps/perf_iso_latconn/plot_script.plt
similarity index 78%
rename from experiments/exps/perf_iso_latconn/plot_script
rename to experiments/exps/perf_iso_latconn/plot_script.plt
index b93692b7..40ecd88d 100644
--- a/experiments/exps/perf_iso_latconn/plot_script
+++ b/experiments/exps/perf_iso_latconn/plot_script.plt
@@ -26,8 +26,8 @@ set yrange [0:]
 set title "50p Latency"
 set key center right
 plot 'lat_50p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
-     'lat_50p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
-     'lat_50p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_50p.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 ps 0.3 w lp, \
+     'lat_50p.dat' using 1:4:xtic(1) title 'virtuoso' linetype 4 ps 0.3 w lp, \
      'lat_50p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
      'lat_50p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
 
@@ -37,8 +37,8 @@ set yrange [0:]
 set title "90p Latency"
 set key center right
 plot 'lat_90p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
-     'lat_90p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
-     'lat_90p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_90p.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 ps 0.3 w lp, \
+     'lat_90p.dat' using 1:4:xtic(1) title 'virtuoso' linetype 4 ps 0.3 w lp, \
      'lat_90p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
      'lat_90p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
 
@@ -49,8 +49,8 @@ set yrange [0:]
 set title "99p Latency"
 set key center right
 plot 'lat_99p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
-     'lat_99p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
-     'lat_99p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_99p.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 ps 0.3 w lp, \
+     'lat_99p.dat' using 1:4:xtic(1) title 'virtuoso' linetype 4 ps 0.3 w lp, \
      'lat_99p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
      'lat_99p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
 
@@ -61,7 +61,7 @@ set yrange [0:]
 set title "99.9p Latency"
 set key left top
 plot 'lat_99.9p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
-     'lat_99.9p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
-     'lat_99.9p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_99.9p.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 ps 0.3 w lp, \
+     'lat_99.9p.dat' using 1:4:xtic(1) title 'virtuoso' linetype 4 ps 0.3 w lp, \
      'lat_99.9p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
      'lat_99.9p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
diff --git a/experiments/exps/perf_iso_latmsize/parse.py b/experiments/exps/perf_iso_latmsize/parse.py
index 1251fdf0..edc29989 100644
--- a/experiments/exps/perf_iso_latmsize/parse.py
+++ b/experiments/exps/perf_iso_latmsize/parse.py
@@ -35,7 +35,7 @@ def parse_metadata():
     if "tas_c" == fname:
       continue
     
-    run = putils.get_expname_runs(fname)
+    run = putils.get_expname_run(fname)
     msize = putils.get_expname_msize(fname)
     nid = putils.get_node_id(fname)
     cid = putils.get_client_id(fname)
@@ -89,7 +89,7 @@ def save_dat_file(exp_lats):
           exp_lats[msize]['bare-vtas'][percentile],
           exp_lats[msize]['virt-tas'][percentile],
           exp_lats[msize]['ovs-linux'][percentile],
-          exp_lats[msize]['ovs-tas'][percentile],)
+          exp_lats[msize]['ovs-tas'][percentile])
         )
         
 def main():
diff --git a/experiments/exps/perf_iso_latmsize/plot_script b/experiments/exps/perf_iso_latmsize/plot_script.plt
similarity index 78%
rename from experiments/exps/perf_iso_latmsize/plot_script
rename to experiments/exps/perf_iso_latmsize/plot_script.plt
index 707e2650..e7d6de98 100644
--- a/experiments/exps/perf_iso_latmsize/plot_script
+++ b/experiments/exps/perf_iso_latmsize/plot_script.plt
@@ -26,8 +26,8 @@ set key center left
 set yrange [0:]
 set title "50p Latency"
 plot 'lat_50p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
-     'lat_50p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
-     'lat_50p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_50p.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 ps 0.3 w lp, \
+     'lat_50p.dat' using 1:4:xtic(1) title 'virtuoso' linetype 4 ps 0.3 w lp, \
      'lat_50p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
      'lat_50p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
 
@@ -37,8 +37,8 @@ set key top right
 set yrange [0:]
 set title "90p Latency"
 plot 'lat_90p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
-     'lat_90p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
-     'lat_90p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_90p.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 ps 0.3 w lp, \
+     'lat_90p.dat' using 1:4:xtic(1) title 'virtuoso' linetype 4 ps 0.3 w lp, \
      'lat_90p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
      'lat_90p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
 
@@ -50,8 +50,8 @@ set key center left
 set yrange [0:]
 set title "99p Latency"
 plot 'lat_99p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
-     'lat_99p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
-     'lat_99p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_99p.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 ps 0.3 w lp, \
+     'lat_99p.dat' using 1:4:xtic(1) title 'virtuoso' linetype 4 ps 0.3 w lp, \
      'lat_99p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
      'lat_99p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
 
@@ -62,7 +62,7 @@ set key center right
 set yrange [0:]
 set title "99.9p Latency"
 plot 'lat_99.9p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
-     'lat_99.9p.dat' using 1:3:xtic(1) title 'bare-vtas' linetype 3 ps 0.3 w lp, \
-     'lat_99.9p.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 ps 0.3 w lp, \
+     'lat_99.9p.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 ps 0.3 w lp, \
+     'lat_99.9p.dat' using 1:4:xtic(1) title 'virtuoso' linetype 4 ps 0.3 w lp, \
      'lat_99.9p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
      'lat_99.9p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
diff --git a/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py b/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
index cda97e28..d7c95f24 100644
--- a/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
+++ b/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
@@ -60,7 +60,6 @@ def __init__(self, exp_name, nconns):
                 stack=self.cstack,
                 is_remote=False,
                 is_server=False)
-
         
         vm0_config = VMConfig(pane=self.defaults.c_vm_pane,
                 machine_config=self.c_machine_config,
@@ -70,7 +69,7 @@ def __init__(self, exp_name, nconns):
         tas0_config = TasConfig(pane=self.defaults.c_tas_pane,
                 machine_config=self.c_machine_config,
                 project_dir=self.defaults.default_otas_dir_virt,
-                ip=vm0_config.tas_tap_ip,
+                ip=vm0_config.vm_ip,
                 n_cores=1, dpdk_extra="00:03.0")
         tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
         
@@ -83,7 +82,7 @@ def __init__(self, exp_name, nconns):
         tas1_config = TasConfig(pane=self.defaults.c_tas_pane,
                 machine_config=self.c_machine_config,
                 project_dir=self.defaults.default_otas_dir_virt,
-                ip=vm1_config.tas_tap_ip,
+                ip=vm1_config.vm_ip,
                 n_cores=1, dpdk_extra="00:03.0")
         tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
 
diff --git a/experiments/exps/perf_iso_tpconn/plot_script.plt b/experiments/exps/perf_iso_tpconn/plot_script.plt
index 324cac1b..0f2321a6 100644
--- a/experiments/exps/perf_iso_tpconn/plot_script.plt
+++ b/experiments/exps/perf_iso_tpconn/plot_script.plt
@@ -12,7 +12,8 @@ set label 1 "Aggressor Client # Connections" at screen 0.5, 0.03 center
 set label 2 "Victim Client Throughput (Mbps)" at screen 0.01, 0.5 rotate by 90 center
 
 set yrange [0:2000]
-plot 'tp.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 w lp, \
-     'tp.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 w lp, \
+plot 'tp.dat' using 1:2:xtic(1) title 'tas' linetype 2 w lp, \
+     'tp.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 w lp, \
+     'tp.dat' using 1:4:xtic(1) title 'virtuoso' linetype 4 w lp, \
      'tp.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 w lp, \
      'tp.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 w lp, \
diff --git a/experiments/exps/perf_iso_tpmsize/plot_script.plt b/experiments/exps/perf_iso_tpmsize/plot_script.plt
index 7caa7cd8..7d3d7445 100644
--- a/experiments/exps/perf_iso_tpmsize/plot_script.plt
+++ b/experiments/exps/perf_iso_tpmsize/plot_script.plt
@@ -13,6 +13,7 @@ set label 2 "Victim Client Throughput (Mbps)" at screen 0.01, 0.5 rotate by 90 c
 
 set yrange [0:2000]
 plot 'tp.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 w lp, \
+     'tp.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 w lp, \
      'tp.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 w lp, \
      'tp.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 w lp, \
      'tp.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 w lp, \
diff --git a/experiments/nodes/node.py b/experiments/nodes/node.py
index ce7c792f..c70f84bd 100644
--- a/experiments/nodes/node.py
+++ b/experiments/nodes/node.py
@@ -78,19 +78,20 @@ def ovsbr_add(self, br_name, ip, interface, script_dir):
       self.setup_pane.send_keys(cmd)
       time.sleep(2)
 
-  def dpdk_ovsbr_add(self, br_name, ip, interface, script_dir):
+  def ovsbr_del(self, br_name):
+      cmd = "sudo ovs-vsctl del-br {}".format(br_name)
+      self.cleanup_pane.send_keys(cmd)
+      time.sleep(2)
+  
+  def ovsvhost_add(self, br_name, vhost_name, script_dir):
       cmd = "cd {}".format(script_dir)
       self.setup_pane.send_keys(cmd)
       time.sleep(1)
-      cmd = "sudo bash dpdk-ovsbr-add.sh {} {} {}".format(br_name, ip, interface)
+      cmd = "sudo bash ovsvhost-add.sh {} {}".format(
+          br_name, vhost_name)
       self.setup_pane.send_keys(cmd)
       time.sleep(2)
 
-  def ovsbr_del(self, br_name):
-      cmd = "sudo ovs-vsctl del-br {}".format(br_name)
-      self.cleanup_pane.send_keys(cmd)
-      time.sleep(2)
-  
   def ovstap_add(self, br_name, tap_name, multi_queue, script_dir):
       cmd = "cd {}".format(script_dir)
       self.setup_pane.send_keys(cmd)
diff --git a/experiments/nodes/ovs_linux/ovslinux.py b/experiments/nodes/ovs_linux/ovslinux.py
index dbf8aa4f..afac2d21 100644
--- a/experiments/nodes/ovs_linux/ovslinux.py
+++ b/experiments/nodes/ovs_linux/ovslinux.py
@@ -27,10 +27,9 @@ def setup(self):
     
     for vm_config in self.vm_configs:
       # Tap that allows us to ssh to VM
-      self.ovstap_add("br0", 
-                      "tap{}".format(vm_config.id),
-                      0,
-                      vm_config.manager_dir)
+      self.ovsvhost_add("br0", 
+                        "vhost{}".format(vm_config.id),
+                         vm_config.manager_dir)
 
   def cleanup(self):
     super().cleanup()
@@ -46,9 +45,6 @@ def cleanup(self):
     self.cleanup_pane.send_keys(cmd)
     time.sleep(1)
 
-    for vm_config in self.vm_configs:
-      self.tap_down("tap{}".format(vm_config.id), vm_config.manager_dir)
-
     for vm in self.vms:
       vm.shutdown()
     
diff --git a/experiments/nodes/ovs_tas/ovstas.py b/experiments/nodes/ovs_tas/ovstas.py
index 5aa7cb6b..b7f8d85d 100644
--- a/experiments/nodes/ovs_tas/ovstas.py
+++ b/experiments/nodes/ovs_tas/ovstas.py
@@ -23,17 +23,15 @@ def setup(self):
     super().setup()
 
     self.start_ovs(self.vm_configs[0].manager_dir)
-    self.dpdk_ovsbr_add("br0", 
-                   self.machine_config.ip + "/24", 
+    self.ovsbr_add("br0", 
+                   self.machine_config.ip + "/24",
                    self.machine_config.interface,
                    self.vm_configs[0].manager_dir)
     
-    # for vm_config in self.vm_configs:
-    #   # Tap that allows us to ssh to VM
-    #   self.ovstap_add("br0", 
-    #                   "tap{}".format(vm_config.id),
-    #                   0, 
-    #                   vm_config.manager_dir)
+    for vm_config in self.vm_configs:
+      self.ovsvhost_add("br0", 
+                        "vhost{}".format(vm_config.id),
+                         vm_config.manager_dir)
 
   def cleanup(self):
     super().cleanup()
@@ -49,10 +47,6 @@ def cleanup(self):
     self.cleanup_pane.send_keys(cmd)
     time.sleep(1)
 
-    # for vm_config in self.vm_configs:
-    #   self.tap_down("tap{}".format(vm_config.id), vm_config.manager_dir)
-    #   self.tap_down("ovstap{}".format(vm_config.id), vm_config.manager_dir)
-
     for vm in self.vms:
       vm.shutdown()
     
@@ -74,8 +68,8 @@ def start_vm(self, vm, vm_config):
     vm.start()
     vm.enable_hugepages()
     vm.enable_noiommu("1af4 1110")
-    vm.init_interface(vm_config.vm_ip, self.defaults.vm_interface)
-    vm.dpdk_bind(vm_config.vm_ip, self.defaults.vm_interface,
+    vm.init_interface(vm_config.vm_ip, self.defaults.tas_interface)
+    vm.dpdk_bind(vm_config.vm_ip, self.defaults.tas_interface,
         self.defaults.pci_id)
 
   def start_vms(self):
diff --git a/experiments/nodes/tap_tas/ttas.py b/experiments/nodes/tap_tas/ttas.py
index 880af0b7..a5a325bb 100644
--- a/experiments/nodes/tap_tas/ttas.py
+++ b/experiments/nodes/tap_tas/ttas.py
@@ -60,7 +60,7 @@ def start_vm(self, vm, vm_config):
       vm.start()
       vm.enable_hugepages()
       vm.enable_noiommu("1af4 1110")
-      vm.init_interface(vm_config.vm_ip, self.defaults.vm_interface)
+      vm.init_interface(vm_config.vm_ip, self.defaults.tas_interface)
       vm.init_interface(vm_config.tas_tap_ip, self.defaults.tas_interface)
       vm.dpdk_bind(vm_config.tas_tap_ip, self.defaults.tas_interface,
           self.defaults.pci_id)
diff --git a/experiments/utils.py b/experiments/utils.py
index b7ec6adb..58a95669 100644
--- a/experiments/utils.py
+++ b/experiments/utils.py
@@ -2,7 +2,7 @@
 
 def get_ssh_command(machine_config, vm_config):
     stack = machine_config.stack
-    if stack == "virt-tas" or stack == "ovs-tas":
+    if stack == "virt-tas" or stack == "ovs-tas" or stack == "ovs-linux":
         ssh_com = "ssh -p 222{} tas@localhost".format(vm_config.id)
     else:
         ssh_com = "ssh tas@{}".format(vm_config.vm_ip)
@@ -12,7 +12,8 @@ def get_ssh_command(machine_config, vm_config):
 def get_scp_command(machine_config, vm_config, src_path, save_path):
     ip = vm_config.vm_ip
     idx = vm_config.id
-    if machine_config.stack == "virt-tas":
+    stack = machine_config.stack
+    if stack == "virt-tas" or stack == "ovs-tas" or stack == "ovs-linux":
         ssh_com = "scp -P 222{} tas@localhost:{} {}".format(idx, src_path, save_path)
     else:
         ssh_com = "scp tas@{}:{} {}".format(ip, src_path, save_path)
diff --git a/images/dpdk-ovsbr-add.sh b/images/dpdk-ovsbr-add.sh
deleted file mode 100644
index 0e47355c..00000000
--- a/images/dpdk-ovsbr-add.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-if [ "$#" -ne 3 ]; then
-    echo "Illegal number of parameters"
-    echo "usage:"
-    echo "[br_name ip interface]"
-    exit
-fi
-
-br_name=$1
-ip=$2
-interface=$3
-
-
-# Create bridge using OvS
-echo "Creating bridge ${br_name} using OvS"
-ovs-vsctl add-br $br_name
-echo "Set bridge ${br_name} datapath type to netdev"
-ovs-vsctl set bridge $br_name datapath_type=netdev
-echo "Adding interface ${interface} to port"
-ovs-vsctl add-port $br_name $interface 
-echo "Set dpdkvhost interface ${interface}"
-ovs-vsctl set Interface $interface type=dpdkvhostuser options:n_rxq=12
-
-# Delete ip config from interface so that it can be added to bridge
-echo "Delete ip config from interface ${interface}"
-sudo ip addr del $ip dev $interface
-
-# Add ip address to bridge
-echo "Add ip ${ip} to bridge ${br_name}"
-sudo ip addr add $ip dev $br_name
-ifconfig $br_name up
\ No newline at end of file
diff --git a/images/ovsbr-add.sh b/images/ovsbr-add.sh
index d3d92248..9fae4fb5 100644
--- a/images/ovsbr-add.sh
+++ b/images/ovsbr-add.sh
@@ -13,6 +13,7 @@ interface=$3
 
 # Create bridge using OvS
 ovs-vsctl add-br $br_name
+
 ovs-vsctl add-port $br_name $interface
 
 # Delete ip config from interface so that it can be added to bridge
diff --git a/images/ovsvhost-add.sh b/images/ovsvhost-add.sh
new file mode 100644
index 00000000..518997b7
--- /dev/null
+++ b/images/ovsvhost-add.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+if [ "$#" -ne 2 ]; then
+    echo "Illegal number of parameters"
+    echo "usage:"
+    echo "[br_name vhost_name]"
+    exit
+fi
+
+br_name=$1
+vhost_name=$2
+
+echo "Set bridge datapath type to netdev"
+ovs-vsctl set bridge ${br_name} datapath_type=netdev
+
+echo "Adding interface ${vhost_name} to port"
+ovs-vsctl add-port ${br_name} ${vhost_name} -- set Interface ${vhost_name} type=dpdkvhostuser
+
diff --git a/images/start-vm.sh b/images/start-vm.sh
index 767bfe6d..61aa80b8 100755
--- a/images/start-vm.sh
+++ b/images/start-vm.sh
@@ -18,6 +18,7 @@ disk_img_snapshot="base.snapshot.qcow2"
 tap=tap$vm_id
 tastap=tastap$vm_id
 ovstap=ovstap$vm_id
+vhost=vhost$vm_id
 
 printf -v mac '02:00:00:%02X:%02X:%02X' $((RANDOM%256)) $((RANDOM%256)) $((RANDOM%256))
 printf -v alt_mac '02:00:00:%02X:%02X:%02X' $((RANDOM%256)) $((RANDOM%256)) $((RANDOM%256))
@@ -63,12 +64,15 @@ elif [[ "$stack" == 'ovs-linux' ]]; then
     -machine accel=kvm,type=q35 \
     -cpu host \
     -smp 12 \
-    -m 25G \
+    -m 10G \
     -snapshot \
-    -netdev user,id=net0 \
+    -netdev user,id=net0,hostfwd=tcp::222${vm_id}-:22 \
     -device virtio-net-pci,netdev=net0 \
-    -netdev tap,ifname=$tap,script=no,downscript=no,vhost=on,id=net1 \
-    -device virtio-net-pci,mac=$mac,netdev=net1 \
+    -chardev socket,id=char0,path=/usr/local/var/run/openvswitch/$vhost \
+    -netdev type=vhost-user,chardev=char0,vhostforce=on,queues=12,id=net1 \
+    -device virtio-net-pci,netdev=net1,mac=$alt_mac,mq=on,vectors=26 \
+    -object memory-backend-file,id=mem,size=10G,mem-path=/dev/hugepages,share=on \
+    -numa node,memdev=mem -mem-prealloc \
     -drive if=virtio,format=qcow2,file="base.snapshot.qcow2" \
     -drive if=virtio,format=raw,file="seed.img" \
     ;
@@ -78,13 +82,15 @@ elif [[ "$stack" == 'ovs-tas' ]]; then
     -machine accel=kvm,type=q35 \
     -cpu host \
     -smp 12 \
-    -m 25G \
+    -m 10G \
     -snapshot \
     -netdev user,id=net0,hostfwd=tcp::222${vm_id}-:22 \
     -device virtio-net-pci,netdev=net0 \
-    -chardev socket,id=char0,path=/usr/local/var/run/openvswitch/$interface \
+    -chardev socket,id=char0,path=/usr/local/var/run/openvswitch/$vhost \
     -netdev type=vhost-user,chardev=char0,vhostforce=on,queues=12,id=net1 \
     -device virtio-net-pci,netdev=net1,mac=$alt_mac,mq=on,vectors=26 \
+    -object memory-backend-file,id=mem,size=10G,mem-path=/dev/hugepages,share=on \
+    -numa node,memdev=mem -mem-prealloc \
     -drive if=virtio,format=qcow2,file="base.snapshot.qcow2" \
     -drive if=virtio,format=raw,file="seed.img" \
     ;
@@ -94,7 +100,7 @@ elif [[ "$stack" == 'tap-tas' ]]; then
     -machine accel=kvm,type=q35 \
     -cpu host \
     -smp 12 \
-    -m 25G \
+    -m 6G \
     -snapshot \
     -netdev user,id=net0 \
     -device virtio-net-pci,netdev=net0 \

From 13d6d2a8172bd1394a9d7fdaa6298229d637be5d Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Thu, 6 Apr 2023 15:57:23 +0200
Subject: [PATCH 48/50] add error bars

---
 .../exps/perf_iso_latconn/perf_iso_latconn.py |  8 ++--
 .../perf_iso_latmsize/perf_iso_latmsize.py    |  8 ++--
 experiments/exps/perf_iso_tpconn/parse.py     | 47 +++++++++++--------
 .../exps/perf_iso_tpconn/perf_iso_tpconn.py   |  8 ++--
 .../exps/perf_iso_tpconn/plot_script.plt      | 10 ++--
 .../exps/perf_iso_tpmsize/perf_iso_tpmsize.py |  8 ++--
 6 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/experiments/exps/perf_iso_latconn/perf_iso_latconn.py b/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
index 54998a2e..f41e3679 100644
--- a/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
+++ b/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
@@ -20,9 +20,9 @@
     ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n_c), name=exp_name)
     ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n_c), name=exp_name)
 
-    experiments.append(tas_bare_exp)
-    experiments.append(vtas_bare_exp)
-    experiments.append(tas_virt_exp)
+    # experiments.append(tas_bare_exp)
+    # experiments.append(vtas_bare_exp)
+    # experiments.append(tas_virt_exp)
     experiments.append(ovs_tas_exp)
-    experiments.append(ovs_linux_exp)
+    # experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py b/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py
index 78bae988..434b4b25 100644
--- a/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py
+++ b/experiments/exps/perf_iso_latmsize/perf_iso_latmsize.py
@@ -20,9 +20,9 @@
     ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n_m), name=exp_name)
     ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n_m), name=exp_name)
 
-    experiments.append(tas_bare_exp)
-    experiments.append(vtas_bare_exp)
-    experiments.append(tas_virt_exp)
+    # experiments.append(tas_bare_exp)
+    # experiments.append(vtas_bare_exp)
+    # experiments.append(tas_virt_exp)
     experiments.append(ovs_tas_exp)
-    experiments.append(ovs_linux_exp)
+    # experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/perf_iso_tpconn/parse.py b/experiments/exps/perf_iso_tpconn/parse.py
index c0b58d50..60cc62f6 100644
--- a/experiments/exps/perf_iso_tpconn/parse.py
+++ b/experiments/exps/perf_iso_tpconn/parse.py
@@ -3,6 +3,7 @@
 
 import os
 import re
+import numpy as np
 import experiments.plot_utils as putils
 
 def check_nconns(data, nconns):
@@ -72,12 +73,12 @@ def parse_metadata():
   return data
 
 def parse_data(parsed_md):
-  tp = []
+  data = []
   out_dir = "./out/"
   for nconns in parsed_md:
     data_point = {"nconns": nconns}
     for stack in parsed_md[nconns]:
-      avg_tp = 0
+      tp_x = np.array([])
       for run in parsed_md[nconns][stack]:
         is_virt = stack == "virt-tas" or stack == "ovs-tas" or stack == "ovs-linux"
         if is_virt:
@@ -87,33 +88,39 @@ def parse_data(parsed_md):
           c0_fname = out_dir + parsed_md[nconns][stack][run]["0"]["0"]
           c1_fname = out_dir + parsed_md[nconns][stack][run]["0"]["1"]
 
-        avg_tp += get_avg_tp(c0_fname, c1_fname)
+        tp = get_avg_tp(c0_fname, c1_fname)
+        if tp > 0:
+          tp_x = np.append(tp_x, tp)
 
-      data_point[stack] = avg_tp / len(parsed_md[nconns][stack])
+      data_point[stack] = {
+        "tp": tp_x.mean(),
+        "std": tp_x.std(),
+      }
   
-    tp.append(data_point)
+    data.append(data_point)
   
-  tp = sorted(tp, key=lambda d: int(d['nconns']))
-  return tp
+  data = sorted(data, key=lambda d: int(d['nconns']))
+  return data
 
-def save_dat_file(avg_tps, fname):
+def save_dat_file(data, fname):
   f = open(fname, "w+")
-  header = "nconns bare-tas bare-vtas virt-tas ovs-linux ovs-tas\n"
+  header = "nconns bare-tas-avg bare-vtas-avg " + \
+      "virt-tas-avg ovs-linux-avg ovs-tas-avg " + \
+      "bare-tas-std " + \
+      "virt-tas-std ovs-linux-std\n"
   f.write(header)
-  for tp in avg_tps:
-    f.write("{} {} {} {} {} {}\n".format(
-      tp["nconns"],
-      tp["bare-tas"],
-      tp["bare-vtas"],
-      tp["virt-tas"],
-      tp["ovs-linux"],
-      tp["ovs-tas"]
-    ))
+  for dp in data:
+    f.write("{} {} {} {} {} {} {} {} {}\n".format(
+      dp["nconns"],
+      dp["bare-tas"]["tp"], dp["bare-vtas"]["tp"], dp["virt-tas"]["tp"],
+      dp["ovs-linux"]["tp"],
+      dp["bare-tas"]["std"], dp["bare-vtas"]["std"], dp["virt-tas"]["std"],
+      dp["ovs-linux"]["std"]))
         
 def main():
   parsed_md = parse_metadata()
-  avg_tps = parse_data(parsed_md)
-  save_dat_file(avg_tps, "./tp.dat")
+  data = parse_data(parsed_md)
+  save_dat_file(data, "./tp.dat")
 
 if __name__ == '__main__':
   main()
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py b/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
index 017a3143..1c262dac 100644
--- a/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
+++ b/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
@@ -20,9 +20,9 @@
     ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n_c), name=exp_name)
     ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n_c), name=exp_name)
 
-    experiments.append(tas_bare_exp)
-    experiments.append(vtas_bare_exp)
-    experiments.append(tas_virt_exp)
+    # experiments.append(tas_bare_exp)
+    # experiments.append(vtas_bare_exp)
+    # experiments.append(tas_virt_exp)
     experiments.append(ovs_tas_exp)
-    experiments.append(ovs_linux_exp)
+    # experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/perf_iso_tpconn/plot_script.plt b/experiments/exps/perf_iso_tpconn/plot_script.plt
index 0f2321a6..19e6486f 100644
--- a/experiments/exps/perf_iso_tpconn/plot_script.plt
+++ b/experiments/exps/perf_iso_tpconn/plot_script.plt
@@ -12,8 +12,8 @@ set label 1 "Aggressor Client # Connections" at screen 0.5, 0.03 center
 set label 2 "Victim Client Throughput (Mbps)" at screen 0.01, 0.5 rotate by 90 center
 
 set yrange [0:2000]
-plot 'tp.dat' using 1:2:xtic(1) title 'tas' linetype 2 w lp, \
-     'tp.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 w lp, \
-     'tp.dat' using 1:4:xtic(1) title 'virtuoso' linetype 4 w lp, \
-     'tp.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 w lp, \
-     'tp.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 w lp, \
+plot 'tp.dat' using 1:2:6 with yerrorlines title 'tas' linetype 2 ps 0.7, \
+     'tp.dat' using 1:3:7 with yerrorlines title 'bare-virtuoso' linetype 3 ps 0.7, \
+     'tp.dat' using 1:4:8 with yerrorlines title 'virtuoso' linetype 4 ps 0.7, \
+     'tp.dat' using 1:5:9 with yerrorlines title 'ovs-linux' linetype 5 ps 0.7, \
+     # 'tp.dat' using 1:6:11 with yerrorlines title 'ovs-tas' linetype 6 ps 0.7, \
diff --git a/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py b/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
index e209c033..bf391ba9 100644
--- a/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
+++ b/experiments/exps/perf_iso_tpmsize/perf_iso_tpmsize.py
@@ -20,9 +20,9 @@
     ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n_m), name=exp_name)
     ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n_m), name=exp_name)
 
-    experiments.append(tas_bare_exp)
-    experiments.append(vtas_bare_exp)
-    experiments.append(tas_virt_exp)
+    # experiments.append(tas_bare_exp)
+    # experiments.append(vtas_bare_exp)
+    # experiments.append(tas_virt_exp)
     experiments.append(ovs_tas_exp)
-    experiments.append(ovs_linux_exp)
+    # experiments.append(ovs_linux_exp)
   

From c82866262a56045405220c799b3d590b1604ff41 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Tue, 18 Apr 2023 17:17:59 +0200
Subject: [PATCH 49/50] do a per VM round robin in congestion control to
 precent tail latency from going up

---
 tas/fast/fast_flows.c |  2 +-
 tas/slow/cc.c         | 98 ++++++++++++++++++++++++++++++-------------
 2 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/tas/fast/fast_flows.c b/tas/fast/fast_flows.c
index 1bf4dea2..fc924d37 100644
--- a/tas/fast/fast_flows.c
+++ b/tas/fast/fast_flows.c
@@ -419,7 +419,7 @@ int fast_flows_packet(struct dataplane_context *ctx,
     }
   }
 
-#ifdef FLEXNIC_PL_OOO_RECV
+#ifdef FLEXNIC_PL_OOO_RECV  
   /* check if we should drop this segment */
   if (UNLIKELY(tcp_trim_rxbuf(fs, seq, payload_bytes, &trim_start, &trim_end) != 0)) {
     /* packet is completely outside of unused receive buffer */
diff --git a/tas/slow/cc.c b/tas/slow/cc.c
index 9c84b198..de37f918 100644
--- a/tas/slow/cc.c
+++ b/tas/slow/cc.c
@@ -29,13 +29,12 @@
 
 #include <tas.h>
 #include "internal.h"
+#include "appif.h"
 
 #define CONF_MSS 1400
 
-int cc_init(void)
-{
-  return 0;
-}
+static void cc_next_ts_vm(uint32_t cur_ts, int vmid, uint32_t *ts);
+static unsigned cc_poll_vm(int vmid, unsigned n, uint32_t diff_ts);
 
 static inline void issue_retransmits(struct connection *c,
     struct nicif_connection_stats *stats, uint32_t cur_ts);
@@ -59,50 +58,89 @@ static inline void const_rate_update(struct connection *c,
 static inline uint32_t window_to_rate(uint32_t window, uint32_t rtt);
 
 static uint32_t last_ts = 0;
-static struct connection *cc_conns = NULL;
-static struct connection *next_conn = NULL;
+int next_vm = 0;
+static struct connection *cc_conns[FLEXNIC_PL_VMST_NUM];
+static struct connection *next_conn[FLEXNIC_PL_VMST_NUM];
+
+int cc_init(void)
+{
+  int i;
+  
+  for (i = 0; i < FLEXNIC_PL_VMST_NUM; i++)
+  {
+    cc_conns[i] = NULL;
+    next_conn[i] = NULL;
+  }
+  
+  return 0;
+}
 
 uint32_t cc_next_ts(uint32_t cur_ts)
 {
-  struct connection *c;
+  int i;
   assert(cur_ts >= last_ts);
   uint32_t ts = -1U;
 
-  for (c = cc_conns; c != NULL; c = c->cc_next) {
+  for (i = 0; i < FLEXNIC_PL_VMST_NUM; i++)
+  {
+    cc_next_ts_vm(cur_ts, i, &ts);
+  }
+
+  return (ts == -1U ? -1U : MAX(ts, config.cc_control_granularity - (cur_ts - last_ts)));
+}
+
+static void cc_next_ts_vm(uint32_t cur_ts, int vmid, uint32_t *ts)
+{
+  struct connection *c;
+
+  for (c = cc_conns[vmid]; c != NULL; c = c->cc_next) {
     if (c->status != CONN_OPEN)
       continue;
 
     int32_t next_ts = (c->cc_rtt * config.cc_control_interval) - (cur_ts - c->cc_last_ts);
     if(next_ts >= 0) {
-      ts = MIN(ts, next_ts);
+      *ts = MIN(*ts, next_ts);
     } else {
-      ts = 0;
+      *ts = 0;
     }
   }
-
-  return (ts == -1U ? -1U : MAX(ts, config.cc_control_granularity - (cur_ts - last_ts)));
 }
 
 unsigned cc_poll(uint32_t cur_ts)
 {
-  struct connection *c, *c_first;
-  struct nicif_connection_stats stats;
-  uint32_t diff_ts;
-  uint32_t last;
+  int i, vmid; 
   unsigned n = 0;
+  uint32_t diff_ts;
 
   diff_ts = cur_ts - last_ts;
   if (0 && diff_ts < config.cc_control_granularity)
     return 0;
 
-  c = c_first = (next_conn != NULL ? next_conn : cc_conns);
+
+  for(i = 0; i < FLEXNIC_PL_VMST_NUM && n < 128; i++)
+  {
+    vmid = (next_vm + i) % FLEXNIC_PL_VMST_NUM;
+    n = cc_poll_vm(vmid, n, diff_ts);
+  }
+
+  last_ts = cur_ts;
+  next_vm = (vmid + 1) % FLEXNIC_PL_VMST_NUM;
+  return n;
+}
+
+static unsigned cc_poll_vm(int vmid, unsigned n, uint32_t diff_ts)
+{
+  struct connection *c, *c_first;
+  struct nicif_connection_stats stats;
+  uint32_t last;
+
+  c = c_first = (next_conn[vmid] != NULL ? next_conn[vmid] : cc_conns[vmid]);
   if (c == NULL) {
-    last_ts = cur_ts;
-    return 0;
+    return n;
   }
 
   for (; n < 128 && (n == 0 || c != c_first);
-      c = (c->cc_next != NULL ? c->cc_next : cc_conns), n++)
+      c = (c->cc_next != NULL ? c->cc_next : cc_conns[vmid]), n++)
   {
     if (c->status != CONN_OPEN)
       continue;
@@ -164,18 +202,17 @@ unsigned cc_poll(uint32_t cur_ts)
     nicif_connection_setrate(c->flow_id, c->cc_rate);
 
     c->cc_last_ts = cur_ts;
-
   }
 
-  next_conn = c;
-  last_ts = cur_ts;
+  next_conn[vmid] = c;
   return n;
 }
 
 void cc_conn_init(struct connection *conn)
 {
-  conn->cc_next = cc_conns;
-  cc_conns = conn;
+  int vmid = conn->ctx->app->vm_id;
+  conn->cc_next = cc_conns[vmid];
+  cc_conns[vmid] = conn;
 
   conn->cc_last_ts = cur_ts;
   conn->cc_rtt = config.tcp_rtt_init;
@@ -209,15 +246,16 @@ void cc_conn_init(struct connection *conn)
 void cc_conn_remove(struct connection *conn)
 {
   struct connection *cp = NULL;
+  int vmid = conn->ctx->app->vm_id;
 
-  if (next_conn == conn) {
-    next_conn = conn->cc_next;
+  if (next_conn[vmid] == conn) {
+    next_conn[vmid] = conn->cc_next;
   }
 
-  if (cc_conns == conn) {
-    cc_conns = conn->cc_next;
+  if (cc_conns[vmid] == conn) {
+    cc_conns[vmid] = conn->cc_next;
   } else {
-    for (cp = cc_conns; cp != NULL && cp->cc_next != conn;
+    for (cp = cc_conns[vmid]; cp != NULL && cp->cc_next != conn;
         cp = cp->cc_next);
     if (cp == NULL) {
       fprintf(stderr, "conn_unregister: connection not found\n");

From 16eb31236cdee6621b14de9d68844433aef21811 Mon Sep 17 00:00:00 2001
From: stolet <matheusstolet@hotmail.com>
Date: Wed, 19 Apr 2023 14:29:33 +0200
Subject: [PATCH 50/50] Make perf iso exps the same

---
 experiments/components/vm.py                  |  3 +
 .../exps/perf_iso_latconn/configs/bare_tas.py | 10 +--
 .../perf_iso_latconn/configs/bare_vtas.py     | 10 +--
 .../perf_iso_latconn/configs/ovs_linux.py     |  8 +--
 .../exps/perf_iso_latconn/configs/ovs_tas.py  | 12 ++--
 .../exps/perf_iso_latconn/configs/virt_tas.py | 10 +--
 .../exps/perf_iso_latconn/perf_iso_latconn.py | 10 +--
 .../perf_iso_latmsize/configs/bare_tas.py     | 10 +--
 .../perf_iso_latmsize/configs/bare_vtas.py    | 10 +--
 .../perf_iso_latmsize/configs/ovs_linux.py    |  8 +--
 .../exps/perf_iso_latmsize/configs/ovs_tas.py | 12 ++--
 .../perf_iso_latmsize/configs/virt_tas.py     | 10 +--
 experiments/exps/perf_iso_latmsize/parse.py   | 49 ++++++++------
 .../exps/perf_iso_latmsize/plot_script.plt    | 40 +++++------
 .../exps/perf_iso_tpconn/configs/bare_tas.py  | 10 +--
 .../exps/perf_iso_tpconn/configs/bare_vtas.py | 10 +--
 .../exps/perf_iso_tpconn/configs/ovs_linux.py |  8 +--
 .../exps/perf_iso_tpconn/configs/ovs_tas.py   | 12 ++--
 .../exps/perf_iso_tpconn/configs/virt_tas.py  | 10 +--
 experiments/exps/perf_iso_tpconn/parse.py     |  9 +--
 .../exps/perf_iso_tpconn/perf_iso_tpconn.py   | 10 +--
 .../exps/perf_iso_tpmsize/configs/bare_tas.py | 10 +--
 .../perf_iso_tpmsize/configs/bare_vtas.py     | 10 +--
 .../perf_iso_tpmsize/configs/ovs_linux.py     |  8 +--
 .../exps/perf_iso_tpmsize/configs/ovs_tas.py  | 12 ++--
 .../exps/perf_iso_tpmsize/configs/virt_tas.py | 10 +--
 experiments/exps/perf_iso_tpmsize/parse.py    | 48 ++++++++------
 .../exps/perf_iso_tpmsize/plot_script.plt     | 10 +--
 experiments/nodes/node.py                     |  6 +-
 experiments/plot_utils.py                     | 66 +++++++++++++------
 experiments/run.py                            |  3 +-
 images/start-vm.sh                            | 10 +--
 32 files changed, 255 insertions(+), 209 deletions(-)

diff --git a/experiments/components/vm.py b/experiments/components/vm.py
index 687d72d3..1005d4e3 100644
--- a/experiments/components/vm.py
+++ b/experiments/components/vm.py
@@ -31,8 +31,11 @@ def enable_hugepages(self):
 
     def enable_noiommu(self, vendor_id):
         self.pane.send_keys("sudo su -")
+        time.sleep(1)
         self.pane.send_keys("sudo echo 1 > /sys/module/vfio/parameters/enable_unsafe_noiommu_mode")
+        time.sleep(1)
         self.pane.send_keys("sudo echo {} > /sys/bus/pci/drivers/vfio-pci/new_id".format(vendor_id))
+        time.sleep(1)
         self.pane.send_keys("exit")
         time.sleep(1)
 
diff --git a/experiments/exps/perf_iso_latconn/configs/bare_tas.py b/experiments/exps/perf_iso_latconn/configs/bare_tas.py
index d69c2dfa..87142d0e 100644
--- a/experiments/exps/perf_iso_latconn/configs/bare_tas.py
+++ b/experiments/exps/perf_iso_latconn/configs/bare_tas.py
@@ -28,18 +28,18 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -65,7 +65,7 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.c_tas_configs.append(tas_config)
 
         client0_config = ClientConfig(exp_name=exp_name, 
diff --git a/experiments/exps/perf_iso_latconn/configs/bare_vtas.py b/experiments/exps/perf_iso_latconn/configs/bare_vtas.py
index da7570a4..084c9d98 100644
--- a/experiments/exps/perf_iso_latconn/configs/bare_vtas.py
+++ b/experiments/exps/perf_iso_latconn/configs/bare_vtas.py
@@ -28,18 +28,18 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -65,7 +65,7 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_vtas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
-        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
+        tas_config.args = tas_config.args + ' --vm-shm-len=8589934592'
         self.c_tas_configs.append(tas_config)
 
         client0_config = ClientConfig(exp_name=exp_name, 
diff --git a/experiments/exps/perf_iso_latconn/configs/ovs_linux.py b/experiments/exps/perf_iso_latconn/configs/ovs_linux.py
index 320c27c9..5ee30ea6 100644
--- a/experiments/exps/perf_iso_latconn/configs/ovs_linux.py
+++ b/experiments/exps/perf_iso_latconn/configs/ovs_linux.py
@@ -29,18 +29,18 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
diff --git a/experiments/exps/perf_iso_latconn/configs/ovs_tas.py b/experiments/exps/perf_iso_latconn/configs/ovs_tas.py
index 283e5243..3a79deab 100644
--- a/experiments/exps/perf_iso_latconn/configs/ovs_tas.py
+++ b/experiments/exps/perf_iso_latconn/configs/ovs_tas.py
@@ -29,18 +29,18 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -72,7 +72,7 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm0_config.tas_tap_ip,
                 n_cores=1, dpdk_extra="00:03.0")
-        tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
+        tas0_config.args = tas0_config.args + ' --shm-len=8589934592'
         
 
         vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
@@ -85,7 +85,7 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm1_config.tas_tap_ip,
                 n_cores=1, dpdk_extra="00:03.0")
-        tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
+        tas1_config.args = tas1_config.args + ' --shm-len=8589934592'
 
 
         self.c_tas_configs.append(tas0_config)
diff --git a/experiments/exps/perf_iso_latconn/configs/virt_tas.py b/experiments/exps/perf_iso_latconn/configs/virt_tas.py
index 0fcff46e..b09bf4dd 100644
--- a/experiments/exps/perf_iso_latconn/configs/virt_tas.py
+++ b/experiments/exps/perf_iso_latconn/configs/virt_tas.py
@@ -31,18 +31,18 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -68,7 +68,7 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_vtas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
-        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
+        tas_config.args = tas_config.args + ' --vm-shm-len=8589934592'
         self.c_tas_configs.append(tas_config)
 
         self.c_proxyh_config = HostProxyConfig(pane=self.defaults.c_proxyh_pane,
diff --git a/experiments/exps/perf_iso_latconn/perf_iso_latconn.py b/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
index f41e3679..ee153ada 100644
--- a/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
+++ b/experiments/exps/perf_iso_latconn/perf_iso_latconn.py
@@ -8,7 +8,7 @@
 
 experiments = []
 
-n_conns = [128, 256, 512, 1024, 2048, 4096, 8192]
+n_conns = [128, 256, 512, 1024, 2048, 4096, 8192, 16384]
 n_runs = 3
 
 for n_r in range(n_runs):
@@ -20,9 +20,9 @@
     ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n_c), name=exp_name)
     ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n_c), name=exp_name)
 
-    # experiments.append(tas_bare_exp)
-    # experiments.append(vtas_bare_exp)
-    # experiments.append(tas_virt_exp)
+    experiments.append(tas_bare_exp)
+    experiments.append(vtas_bare_exp)
+    experiments.append(tas_virt_exp)
     experiments.append(ovs_tas_exp)
-    # experiments.append(ovs_linux_exp)
+    experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/perf_iso_latmsize/configs/bare_tas.py b/experiments/exps/perf_iso_latmsize/configs/bare_tas.py
index b40c9f2f..c60422d4 100644
--- a/experiments/exps/perf_iso_latmsize/configs/bare_tas.py
+++ b/experiments/exps/perf_iso_latmsize/configs/bare_tas.py
@@ -28,18 +28,18 @@ def __init__(self, exp_name, msize):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -65,7 +65,7 @@ def __init__(self, exp_name, msize):
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.c_tas_configs.append(tas_config)
 
         client0_config = ClientConfig(exp_name=exp_name, 
diff --git a/experiments/exps/perf_iso_latmsize/configs/bare_vtas.py b/experiments/exps/perf_iso_latmsize/configs/bare_vtas.py
index 57754525..f346fb50 100644
--- a/experiments/exps/perf_iso_latmsize/configs/bare_vtas.py
+++ b/experiments/exps/perf_iso_latmsize/configs/bare_vtas.py
@@ -28,18 +28,18 @@ def __init__(self, exp_name, msize):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -65,7 +65,7 @@ def __init__(self, exp_name, msize):
                 project_dir=self.defaults.default_vtas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
-        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
+        tas_config.args = tas_config.args + ' --vm-shm-len=8589934592'
         self.c_tas_configs.append(tas_config)
 
         client0_config = ClientConfig(exp_name=exp_name, 
diff --git a/experiments/exps/perf_iso_latmsize/configs/ovs_linux.py b/experiments/exps/perf_iso_latmsize/configs/ovs_linux.py
index fbf948b3..fd0a8663 100644
--- a/experiments/exps/perf_iso_latmsize/configs/ovs_linux.py
+++ b/experiments/exps/perf_iso_latmsize/configs/ovs_linux.py
@@ -29,18 +29,18 @@ def __init__(self, exp_name, msize):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
diff --git a/experiments/exps/perf_iso_latmsize/configs/ovs_tas.py b/experiments/exps/perf_iso_latmsize/configs/ovs_tas.py
index cd985cd3..131c4221 100644
--- a/experiments/exps/perf_iso_latmsize/configs/ovs_tas.py
+++ b/experiments/exps/perf_iso_latmsize/configs/ovs_tas.py
@@ -29,18 +29,18 @@ def __init__(self, exp_name, msize):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -72,7 +72,7 @@ def __init__(self, exp_name, msize):
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm0_config.tas_tap_ip,
                 n_cores=1, dpdk_extra="00:03.0")
-        tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
+        tas0_config.args = tas0_config.args + ' --shm-len=8589934592'
         
 
         vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
@@ -85,7 +85,7 @@ def __init__(self, exp_name, msize):
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm1_config.tas_tap_ip,
                 n_cores=1, dpdk_extra="00:03.0")
-        tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
+        tas1_config.args = tas1_config.args + ' --shm-len=8589934592'
 
 
         self.c_tas_configs.append(tas0_config)
diff --git a/experiments/exps/perf_iso_latmsize/configs/virt_tas.py b/experiments/exps/perf_iso_latmsize/configs/virt_tas.py
index 65d653f8..38ca219d 100644
--- a/experiments/exps/perf_iso_latmsize/configs/virt_tas.py
+++ b/experiments/exps/perf_iso_latmsize/configs/virt_tas.py
@@ -31,18 +31,18 @@ def __init__(self, exp_name, msize):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -68,7 +68,7 @@ def __init__(self, exp_name, msize):
                 project_dir=self.defaults.default_vtas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
-        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
+        tas_config.args = tas_config.args + ' --vm-shm-len=8589934592'
         self.c_tas_configs.append(tas_config)
 
         self.c_proxyh_config = HostProxyConfig(pane=self.defaults.c_proxyh_pane,
diff --git a/experiments/exps/perf_iso_latmsize/parse.py b/experiments/exps/perf_iso_latmsize/parse.py
index edc29989..6370e2a1 100644
--- a/experiments/exps/perf_iso_latmsize/parse.py
+++ b/experiments/exps/perf_iso_latmsize/parse.py
@@ -2,6 +2,7 @@
 sys.path.append("../../../")
 
 import os
+import numpy as np
 import experiments.plot_utils as putils
 
 
@@ -52,7 +53,7 @@ def parse_metadata():
   return data
 
 def parse_data(parsed_md):
-  lat_list = {}
+  data = {}
   out_dir = "./out/"
   for msize in parsed_md:
     data_point = {}
@@ -60,22 +61,27 @@ def parse_data(parsed_md):
       latencies = putils.init_latencies()
       for run in parsed_md[msize][stack]:
         fname_c0 = out_dir + parsed_md[msize][stack][run]['0']['0']
-        putils.add_latencies(latencies, fname_c0)
-      
-      putils.divide_latencies(latencies, len(parsed_md[msize][stack]))
-      data_point[stack] = latencies
-  
-    lat_list[msize] = data_point
+        putils.append_latencies(latencies, fname_c0)
+
+      data_point[stack] = {
+        "lat": putils.get_latency_avg(latencies),
+        "std": putils.get_latency_std(latencies)
+      }
+    data[msize] = data_point
   
-  return lat_list
+  return data
 
-def save_dat_file(exp_lats):
-  header = "nconns bare-tas bare-vtas virt-tas ovs-linux ovs-tas\n"
+def save_dat_file(data):
+  header = "msize " + \
+      "bare-tas-avg bare-vtas-avg virt-tas-avg " + \
+      "ovs-linux-avg " + \
+      "bare-tas-std bare-vtas-std virt-tas-std " + \
+      "ovs-linux-std\n"
   
-  msizes = list(exp_lats.keys())
+  msizes = list(data.keys())
   msizes = list(map(str, sorted(map(int, msizes))))
-  stacks =  list(exp_lats[msizes[0]].keys())
-  percentiles =  list(exp_lats[msizes[0]][stacks[0]].keys())
+  stacks =  list(data[msizes[0]].keys())
+  percentiles =  list(data[msizes[0]][stacks[0]]['lat'].keys())
 
   for percentile in percentiles:
       fname = "./lat_{}.dat".format(percentile)
@@ -83,14 +89,17 @@ def save_dat_file(exp_lats):
       f.write(header)
 
       for msize in msizes:
-        f.write("{} {} {} {} {} {}\n".format(
+        f.write("{} {} {} {} {} {} {} {} {}\n".format(
           msize,
-          exp_lats[msize]['bare-tas'][percentile],
-          exp_lats[msize]['bare-vtas'][percentile],
-          exp_lats[msize]['virt-tas'][percentile],
-          exp_lats[msize]['ovs-linux'][percentile],
-          exp_lats[msize]['ovs-tas'][percentile])
-        )
+          data[msize]['bare-tas']['lat'][percentile],
+          data[msize]['bare-vtas']["lat"][percentile],
+          data[msize]['virt-tas']["lat"][percentile],
+          data[msize]['ovs-linux']["lat"][percentile],
+          data[msize]['bare-tas']["std"][percentile],
+          data[msize]['bare-vtas']["std"][percentile],
+          data[msize]['virt-tas']["std"][percentile],
+          data[msize]['ovs-linux']["std"][percentile]))
+
         
 def main():
   parsed_md = parse_metadata()
diff --git a/experiments/exps/perf_iso_latmsize/plot_script.plt b/experiments/exps/perf_iso_latmsize/plot_script.plt
index e7d6de98..cfa26593 100644
--- a/experiments/exps/perf_iso_latmsize/plot_script.plt
+++ b/experiments/exps/perf_iso_latmsize/plot_script.plt
@@ -25,22 +25,22 @@ unset xtics
 set key center left
 set yrange [0:]
 set title "50p Latency"
-plot 'lat_50p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
-     'lat_50p.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 ps 0.3 w lp, \
-     'lat_50p.dat' using 1:4:xtic(1) title 'virtuoso' linetype 4 ps 0.3 w lp, \
-     'lat_50p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
-     'lat_50p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
+plot 'lat_50p.dat' using 1:2:6 with yerrorlines title 'bare-tas' linetype 2 ps 0.3, \
+     'lat_50p.dat' using 1:3:7 with yerrorlines title 'bare-virtuoso' linetype 3 ps 0.3, \
+     'lat_50p.dat' using 1:4:8 with yerrorlines title 'virtuoso' linetype 4 ps 0.3, \
+     'lat_50p.dat' using 1:5:9 with yerrorlines title 'ovs-linux' linetype 5 ps 0.3, \
+     # 'lat_50p.dat' using 1:6: with yerrorlines title 'ovs-tas' linetype 6 ps 0.3, \
 
 # Plot 90p latency
 unset xtics
 set key top right
 set yrange [0:]
 set title "90p Latency"
-plot 'lat_90p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
-     'lat_90p.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 ps 0.3 w lp, \
-     'lat_90p.dat' using 1:4:xtic(1) title 'virtuoso' linetype 4 ps 0.3 w lp, \
-     'lat_90p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
-     'lat_90p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
+plot 'lat_90p.dat' using 1:2:6 with yerrorlines title 'bare-tas' linetype 2 ps 0.3, \
+     'lat_90p.dat' using 1:3:7 with yerrorlines title 'bare-virtuoso' linetype 3 ps 0.3, \
+     'lat_90p.dat' using 1:4:8 with yerrorlines title 'virtuoso' linetype 4 ps 0.3, \
+     'lat_90p.dat' using 1:5:9 with yerrorlines title 'ovs-linux' linetype 5 ps 0.3, \
+     # 'lat_90p.dat' using 1:6: with yerrorlines title 'ovs-tas' linetype 6 ps 0.3, \
 
 
 # Plot 99p latency
@@ -49,11 +49,11 @@ set xtics font "Computer Modern Roman,6"
 set key center left
 set yrange [0:]
 set title "99p Latency"
-plot 'lat_99p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
-     'lat_99p.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 ps 0.3 w lp, \
-     'lat_99p.dat' using 1:4:xtic(1) title 'virtuoso' linetype 4 ps 0.3 w lp, \
-     'lat_99p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
-     'lat_99p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
+plot 'lat_99p.dat' using 1:2:6 with yerrorlines title 'bare-tas' linetype 2 ps 0.3, \
+     'lat_99p.dat' using 1:3:7 with yerrorlines title 'bare-virtuoso' linetype 3 ps 0.3, \
+     'lat_99p.dat' using 1:4:8 with yerrorlines title 'virtuoso' linetype 4 ps 0.3, \
+     'lat_99p.dat' using 1:5:9 with yerrorlines title 'ovs-linux' linetype 5 ps 0.3, \
+     # 'lat_99p.dat' using 1:6: with yerrorlines title 'ovs-tas' linetype 6 ps 0.3, \
 
 # Plot 99.9p latency
 set xtics
@@ -61,8 +61,8 @@ set xtics font "Computer Modern Roman,6"
 set key center right
 set yrange [0:]
 set title "99.9p Latency"
-plot 'lat_99.9p.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 ps 0.3 w lp, \
-     'lat_99.9p.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 ps 0.3 w lp, \
-     'lat_99.9p.dat' using 1:4:xtic(1) title 'virtuoso' linetype 4 ps 0.3 w lp, \
-     'lat_99.9p.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 ps 0.3 w lp, \
-     'lat_99.9p.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 ps 0.3 w lp, \
+plot 'lat_99.9p.dat' using 1:2:6 with yerrorlines title 'bare-tas' linetype 2 ps 0.3, \
+     'lat_99.9p.dat' using 1:3:7 with yerrorlines title 'bare-virtuoso' linetype 3 ps 0.3, \
+     'lat_99.9p.dat' using 1:4:8 with yerrorlines title 'virtuoso' linetype 4 ps 0.3, \
+     'lat_99.9p.dat' using 1:5:9 with yerrorlines title 'ovs-linux' linetype 5 ps 0.3, \
+     # 'lat_99.9p.dat' using 1:6: with yerrorlines title 'ovs-tas' linetype 6 ps 0.3, \
diff --git a/experiments/exps/perf_iso_tpconn/configs/bare_tas.py b/experiments/exps/perf_iso_tpconn/configs/bare_tas.py
index 74a375f8..c5c95fc5 100644
--- a/experiments/exps/perf_iso_tpconn/configs/bare_tas.py
+++ b/experiments/exps/perf_iso_tpconn/configs/bare_tas.py
@@ -28,18 +28,18 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -65,7 +65,7 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.c_tas_configs.append(tas_config)
 
         client0_config = ClientConfig(exp_name=exp_name, 
diff --git a/experiments/exps/perf_iso_tpconn/configs/bare_vtas.py b/experiments/exps/perf_iso_tpconn/configs/bare_vtas.py
index 9d771734..9b9e5541 100644
--- a/experiments/exps/perf_iso_tpconn/configs/bare_vtas.py
+++ b/experiments/exps/perf_iso_tpconn/configs/bare_vtas.py
@@ -28,18 +28,18 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0, groupid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0, groupid=1,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
                 
@@ -66,7 +66,7 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_vtas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
-        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
+        tas_config.args = tas_config.args + ' --vm-shm-len=8589934592'
         self.c_tas_configs.append(tas_config)
 
         client0_config = ClientConfig(exp_name=exp_name, 
diff --git a/experiments/exps/perf_iso_tpconn/configs/ovs_linux.py b/experiments/exps/perf_iso_tpconn/configs/ovs_linux.py
index 19545cd7..838e5983 100644
--- a/experiments/exps/perf_iso_tpconn/configs/ovs_linux.py
+++ b/experiments/exps/perf_iso_tpconn/configs/ovs_linux.py
@@ -29,18 +29,18 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
diff --git a/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py b/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
index d7c95f24..4ada0270 100644
--- a/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
+++ b/experiments/exps/perf_iso_tpconn/configs/ovs_tas.py
@@ -29,18 +29,18 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -71,7 +71,7 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm0_config.vm_ip,
                 n_cores=1, dpdk_extra="00:03.0")
-        tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
+        tas0_config.args = tas0_config.args + ' --shm-len=8589934592'
         
 
         vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
@@ -84,7 +84,7 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm1_config.vm_ip,
                 n_cores=1, dpdk_extra="00:03.0")
-        tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
+        tas1_config.args = tas1_config.args + ' --shm-len=8589934592'
 
 
         self.c_tas_configs.append(tas0_config)
diff --git a/experiments/exps/perf_iso_tpconn/configs/virt_tas.py b/experiments/exps/perf_iso_tpconn/configs/virt_tas.py
index 53c0d125..f7cd6534 100644
--- a/experiments/exps/perf_iso_tpconn/configs/virt_tas.py
+++ b/experiments/exps/perf_iso_tpconn/configs/virt_tas.py
@@ -31,18 +31,18 @@ def __init__(self, exp_name, nconns):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -68,7 +68,7 @@ def __init__(self, exp_name, nconns):
                 project_dir=self.defaults.default_vtas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
-        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
+        tas_config.args = tas_config.args + ' --vm-shm-len=8589934592'
         self.c_tas_configs.append(tas_config)
 
         self.c_proxyh_config = HostProxyConfig(pane=self.defaults.c_proxyh_pane,
diff --git a/experiments/exps/perf_iso_tpconn/parse.py b/experiments/exps/perf_iso_tpconn/parse.py
index 60cc62f6..e139dba5 100644
--- a/experiments/exps/perf_iso_tpconn/parse.py
+++ b/experiments/exps/perf_iso_tpconn/parse.py
@@ -104,10 +104,11 @@ def parse_data(parsed_md):
 
 def save_dat_file(data, fname):
   f = open(fname, "w+")
-  header = "nconns bare-tas-avg bare-vtas-avg " + \
-      "virt-tas-avg ovs-linux-avg ovs-tas-avg " + \
-      "bare-tas-std " + \
-      "virt-tas-std ovs-linux-std\n"
+  header = "nconns " + \
+      "bare-tas-avg bare-vtas-avg virt-tas-avg " + \
+      "ovs-linux-avg " + \
+      "bare-tas-std bare-vtas-std virt-tas-std " + \
+      "ovs-linux-std\n"
   f.write(header)
   for dp in data:
     f.write("{} {} {} {} {} {} {} {} {}\n".format(
diff --git a/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py b/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
index 1c262dac..319040af 100644
--- a/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
+++ b/experiments/exps/perf_iso_tpconn/perf_iso_tpconn.py
@@ -8,7 +8,7 @@
 
 experiments = []
 
-n_conns = [128, 256, 512, 1024, 2048, 4096, 8192]
+n_conns = [128, 256, 512, 1024, 2048, 4096, 8192, 16384]
 n_runs = 3
 
 for n_r in range(n_runs):
@@ -20,9 +20,9 @@
     ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n_c), name=exp_name)
     ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n_c), name=exp_name)
 
-    # experiments.append(tas_bare_exp)
-    # experiments.append(vtas_bare_exp)
-    # experiments.append(tas_virt_exp)
+    experiments.append(tas_bare_exp)
+    experiments.append(vtas_bare_exp)
+    experiments.append(tas_virt_exp)
     experiments.append(ovs_tas_exp)
-    # experiments.append(ovs_linux_exp)
+    experiments.append(ovs_linux_exp)
   
diff --git a/experiments/exps/perf_iso_tpmsize/configs/bare_tas.py b/experiments/exps/perf_iso_tpmsize/configs/bare_tas.py
index 3ec57379..33275fbc 100644
--- a/experiments/exps/perf_iso_tpmsize/configs/bare_tas.py
+++ b/experiments/exps/perf_iso_tpmsize/configs/bare_tas.py
@@ -28,18 +28,18 @@ def __init__(self, exp_name, msize):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -65,7 +65,7 @@ def __init__(self, exp_name, msize):
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.c_tas_configs.append(tas_config)
 
         client0_config = ClientConfig(exp_name=exp_name, 
diff --git a/experiments/exps/perf_iso_tpmsize/configs/bare_vtas.py b/experiments/exps/perf_iso_tpmsize/configs/bare_vtas.py
index a9533f54..eeb52beb 100644
--- a/experiments/exps/perf_iso_tpmsize/configs/bare_vtas.py
+++ b/experiments/exps/perf_iso_tpmsize/configs/bare_vtas.py
@@ -28,18 +28,18 @@ def __init__(self, exp_name, msize):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0, groupid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0, groupid=1,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
                 
@@ -66,7 +66,7 @@ def __init__(self, exp_name, msize):
                 project_dir=self.defaults.default_vtas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
-        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
+        tas_config.args = tas_config.args + ' --vm-shm-len=8589934592'
         self.c_tas_configs.append(tas_config)
 
         client0_config = ClientConfig(exp_name=exp_name, 
diff --git a/experiments/exps/perf_iso_tpmsize/configs/ovs_linux.py b/experiments/exps/perf_iso_tpmsize/configs/ovs_linux.py
index eafeb4d1..92b0897a 100644
--- a/experiments/exps/perf_iso_tpmsize/configs/ovs_linux.py
+++ b/experiments/exps/perf_iso_tpmsize/configs/ovs_linux.py
@@ -29,18 +29,18 @@ def __init__(self, exp_name, msize):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
diff --git a/experiments/exps/perf_iso_tpmsize/configs/ovs_tas.py b/experiments/exps/perf_iso_tpmsize/configs/ovs_tas.py
index 3c5942ec..9a94a730 100644
--- a/experiments/exps/perf_iso_tpmsize/configs/ovs_tas.py
+++ b/experiments/exps/perf_iso_tpmsize/configs/ovs_tas.py
@@ -29,18 +29,18 @@ def __init__(self, exp_name, msize):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -72,7 +72,7 @@ def __init__(self, exp_name, msize):
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm0_config.tas_tap_ip,
                 n_cores=1, dpdk_extra="00:03.0")
-        tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
+        tas0_config.args = tas0_config.args + ' --shm-len=8589934592'
         
 
         vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
@@ -85,7 +85,7 @@ def __init__(self, exp_name, msize):
                 project_dir=self.defaults.default_otas_dir_virt,
                 ip=vm1_config.tas_tap_ip,
                 n_cores=1, dpdk_extra="00:03.0")
-        tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
+        tas1_config.args = tas1_config.args + ' --shm-len=8589934592'
 
 
         self.c_tas_configs.append(tas0_config)
diff --git a/experiments/exps/perf_iso_tpmsize/configs/virt_tas.py b/experiments/exps/perf_iso_tpmsize/configs/virt_tas.py
index fb0a7924..1f6e939c 100644
--- a/experiments/exps/perf_iso_tpmsize/configs/virt_tas.py
+++ b/experiments/exps/perf_iso_tpmsize/configs/virt_tas.py
@@ -31,18 +31,18 @@ def __init__(self, exp_name, msize):
                 machine_config=self.s_machine_config,
                 project_dir=self.defaults.default_otas_dir_bare,
                 ip=self.s_machine_config.ip,
-                n_cores=12)
-        tas_config.args = tas_config.args + ' --shm-len=4294967296'
+                n_cores=14)
+        tas_config.args = tas_config.args + ' --shm-len=8589934592'
         self.s_tas_configs.append(tas_config)
 
         server0_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=0, vmid=0,
-                port=1234, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1234, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         server1_config = ServerConfig(pane=self.defaults.s_server_pane,
                 idx=1, vmid=0,
-                port=1235, ncores=8, max_flows=4096, max_bytes=4096,
+                port=1235, ncores=12, max_flows=4096, max_bytes=4096,
                 bench_dir=self.defaults.default_obenchmark_dir_bare,
                 tas_dir=self.defaults.default_otas_dir_bare)
         self.server_configs.append(server0_config)
@@ -68,7 +68,7 @@ def __init__(self, exp_name, msize):
                 project_dir=self.defaults.default_vtas_dir_bare,
                 ip=self.c_machine_config.ip,
                 n_cores=1)
-        tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
+        tas_config.args = tas_config.args + ' --vm-shm-len=8589934592'
         self.c_tas_configs.append(tas_config)
 
         self.c_proxyh_config = HostProxyConfig(pane=self.defaults.c_proxyh_pane,
diff --git a/experiments/exps/perf_iso_tpmsize/parse.py b/experiments/exps/perf_iso_tpmsize/parse.py
index fba9b93b..5214b94d 100644
--- a/experiments/exps/perf_iso_tpmsize/parse.py
+++ b/experiments/exps/perf_iso_tpmsize/parse.py
@@ -2,6 +2,7 @@
 sys.path.append("../../../")
 
 import os
+import numpy as np
 import experiments.plot_utils as putils
 
 
@@ -72,12 +73,12 @@ def parse_metadata():
   return data
 
 def parse_data(parsed_md):
-  tp = []
+  data = []
   out_dir = "./out/"
   for msize in parsed_md:
     data_point = {"msize": msize}
     for stack in parsed_md[msize]:
-      avg_tp = 0
+      tp_x = np.array([])
       for run in parsed_md[msize][stack]:
         is_virt = stack == "virt-tas" or stack == "ovs-tas" or stack == "ovs-linux"
         if is_virt:
@@ -87,33 +88,40 @@ def parse_data(parsed_md):
           c0_fname = out_dir + parsed_md[msize][stack][run]["0"]["0"]
           c1_fname = out_dir + parsed_md[msize][stack][run]["0"]["1"]
 
-        avg_tp += get_avg_tp(c0_fname, c1_fname)
+        tp = get_avg_tp(c0_fname, c1_fname)
+        if tp > 0:
+          tp_x = np.append(tp_x, tp)
 
-      data_point[stack] = avg_tp / len(parsed_md[msize][stack])
+      data_point[stack] = {
+        "tp": tp_x.mean(),
+        "std": tp_x.std(),
+      }
   
-    tp.append(data_point)
+    data.append(data_point)
   
-  tp = sorted(tp, key=lambda d: int(d['msize']))
-  return tp
+  data = sorted(data, key=lambda d: int(d['msize']))
+  return data
 
-def save_dat_file(avg_tps, fname):
+def save_dat_file(data, fname):
   f = open(fname, "w+")
-  header = "msize bare-tas bare-vtas virt-tas ovs-linux ovs-tas\n"
+  header = "msize " + \
+      "bare-tas-avg bare-vtas-avg virt-tas-avg " + \
+      "ovs-linux-avg " + \
+      "bare-tas-std bare-vtas-std virt-tas-std " + \
+      "ovs-linux-std\n"
   f.write(header)
-  for tp in avg_tps:
-    f.write("{} {} {} {} {} {}\n".format(
-      tp["msize"],
-      tp["bare-tas"],
-      tp["bare-vtas"],
-      tp["virt-tas"],
-      tp["ovs-linux"],
-      tp["ovs-tas"]
-    ))
+  for dp in data:
+    f.write("{} {} {} {} {} {} {} {} {}\n".format(
+      dp["msize"],
+      dp["bare-tas"]["tp"], dp["bare-vtas"]["tp"], dp["virt-tas"]["tp"],
+      dp["ovs-linux"]["tp"],
+      dp["bare-tas"]["std"], dp["bare-vtas"]["std"], dp["virt-tas"]["std"],
+      dp["ovs-linux"]["std"]))
         
 def main():
   parsed_md = parse_metadata()
-  avg_tps = parse_data(parsed_md)
-  save_dat_file(avg_tps, "./tp.dat")
+  data = parse_data(parsed_md)
+  save_dat_file(data, "./tp.dat")
 
 if __name__ == '__main__':
   main()
\ No newline at end of file
diff --git a/experiments/exps/perf_iso_tpmsize/plot_script.plt b/experiments/exps/perf_iso_tpmsize/plot_script.plt
index 7d3d7445..584b0580 100644
--- a/experiments/exps/perf_iso_tpmsize/plot_script.plt
+++ b/experiments/exps/perf_iso_tpmsize/plot_script.plt
@@ -12,8 +12,8 @@ set label 1 "Aggressor Client Message Size" at screen 0.5, 0.03 center
 set label 2 "Victim Client Throughput (Mbps)" at screen 0.01, 0.5 rotate by 90 center
 
 set yrange [0:2000]
-plot 'tp.dat' using 1:2:xtic(1) title 'bare-tas' linetype 2 w lp, \
-     'tp.dat' using 1:3:xtic(1) title 'bare-virtuoso' linetype 3 w lp, \
-     'tp.dat' using 1:4:xtic(1) title 'virt-tas' linetype 4 w lp, \
-     'tp.dat' using 1:5:xtic(1) title 'ovs-linux' linetype 5 w lp, \
-     'tp.dat' using 1:6:xtic(1) title 'ovs-tas' linetype 6 w lp, \
+plot 'tp.dat' using 1:2:6 with yerrorlines title 'tas' linetype 2 ps 0.7, \
+     'tp.dat' using 1:3:7 with yerrorlines title 'bare-virtuoso' linetype 3 ps 0.7, \
+     'tp.dat' using 1:4:8 with yerrorlines title 'virtuoso' linetype 4 ps 0.7, \
+     'tp.dat' using 1:5:9 with yerrorlines title 'ovs-linux' linetype 5 ps 0.7, \
+     # 'tp.dat' using 1:6:11 with yerrorlines title 'ovs-tas' linetype 6 ps 0.7, \
diff --git a/experiments/nodes/node.py b/experiments/nodes/node.py
index c70f84bd..72fb704c 100644
--- a/experiments/nodes/node.py
+++ b/experiments/nodes/node.py
@@ -60,7 +60,7 @@ def start_ovs(self, script_dir):
       time.sleep(1)
       cmd = "sudo bash ovs-start.sh"
       self.setup_pane.send_keys(cmd)
-      time.sleep(2)
+      time.sleep(4)
 
   def stop_ovs(self, script_dir):
       cmd = "cd {}".format(script_dir)
@@ -76,7 +76,7 @@ def ovsbr_add(self, br_name, ip, interface, script_dir):
       time.sleep(1)
       cmd = "sudo bash ovsbr-add.sh {} {} {}".format(br_name, ip, interface)
       self.setup_pane.send_keys(cmd)
-      time.sleep(2)
+      time.sleep(4)
 
   def ovsbr_del(self, br_name):
       cmd = "sudo ovs-vsctl del-br {}".format(br_name)
@@ -90,7 +90,7 @@ def ovsvhost_add(self, br_name, vhost_name, script_dir):
       cmd = "sudo bash ovsvhost-add.sh {} {}".format(
           br_name, vhost_name)
       self.setup_pane.send_keys(cmd)
-      time.sleep(2)
+      time.sleep(4)
 
   def ovstap_add(self, br_name, tap_name, multi_queue, script_dir):
       cmd = "cd {}".format(script_dir)
diff --git a/experiments/plot_utils.py b/experiments/plot_utils.py
index 2d36b0e4..7e875644 100644
--- a/experiments/plot_utils.py
+++ b/experiments/plot_utils.py
@@ -1,38 +1,64 @@
-
+import numpy as np
 import re
 
 def init_latencies():
   latencies = {
-    "50p": 0,
-    "90p": 0,
-    "99p": 0,
-    "99.9p": 0,
-    "99.99p": 0
+    "50p": np.array([]),
+    "90p": np.array([]),
+    "99p": np.array([]),
+    "99.9p": np.array([]),
+    "99.99p": np.array([])
   }
 
   return latencies
 
-def divide_latencies(latencies, den):
-  latencies["50p"] /= den
-  latencies["90p"] /= den
-  latencies["99p"] /= den
-  latencies["99.9p"] /= den
-  latencies["99.99p"] /= den
-
-def add_latencies(latencies, fname_c0):
+def append_latencies(latencies, fname_c0):
   f = open(fname_c0)
   lines = f.readlines()
 
   # Latencies are already accumulated over all time
   # period in the logs
   line = lines[len(lines) - 1]
-  latencies["50p"] += int(get_50p_lat(line))
-  latencies["90p"] += int(get_90p_lat(line))
-  latencies["99p"] += int(get_99p_lat(line))
-  latencies["99.9p"] += int(get_99_9p_lat(line))
-  latencies["99.99p"] += int(get_99_99p_lat(line))
 
-  return latencies
+  lat = int(get_50p_lat(line))
+  if lat > 0:
+    latencies["50p"] = np.append(latencies["50p"], lat)
+
+  lat = int(get_90p_lat(line))
+  if lat > 0:
+    latencies["90p"] = np.append(latencies["90p"], lat)
+
+  lat = int(get_99p_lat(line))
+  if lat > 0:
+    latencies["99p"] = np.append(latencies["99p"], lat)
+
+  lat = int(get_99_9p_lat(line))
+  if lat > 0:
+    latencies["99.9p"] = np.append(latencies["99.9p"], lat)
+
+  lat = int(get_99_99p_lat(line))
+  if lat > 0:
+    latencies["99.99p"] = np.append(latencies["99.99p"], lat)
+
+def get_latency_avg(latencies):
+  avg_lats = {
+    "50p": latencies["50p"].mean(),
+    "90p": latencies["90p"].mean(),
+    "99p": latencies["99p"].mean(),
+    "99.9p": latencies["99.9p"].mean(),
+    "99.99p": latencies["99.99p"].mean()
+  }
+  
+  return avg_lats 
+
+def get_latency_std(latencies):
+  return {
+    "50p": latencies["50p"].std(),
+    "90p": latencies["90p"].std(),
+    "99p": latencies["99p"].std(),
+    "99.9p": latencies["99.9p"].std(),
+    "99.99p": latencies["99.99p"].std()
+  }
 
 def get_expname_msize(fname):
   regex = "(?<=-msize)[0-9]*"
diff --git a/experiments/run.py b/experiments/run.py
index bb749cb7..8cc8e279 100644
--- a/experiments/run.py
+++ b/experiments/run.py
@@ -52,7 +52,6 @@
             continue
     print('******' + e.get_name() + '********')
     e.run()
-    time.sleep(80)
+    time.sleep(120)
     e.save_logs()
-    time.sleep(15)
     e.reset()
\ No newline at end of file
diff --git a/images/start-vm.sh b/images/start-vm.sh
index 61aa80b8..583742ff 100755
--- a/images/start-vm.sh
+++ b/images/start-vm.sh
@@ -64,14 +64,14 @@ elif [[ "$stack" == 'ovs-linux' ]]; then
     -machine accel=kvm,type=q35 \
     -cpu host \
     -smp 12 \
-    -m 10G \
+    -m 25G \
     -snapshot \
     -netdev user,id=net0,hostfwd=tcp::222${vm_id}-:22 \
     -device virtio-net-pci,netdev=net0 \
     -chardev socket,id=char0,path=/usr/local/var/run/openvswitch/$vhost \
     -netdev type=vhost-user,chardev=char0,vhostforce=on,queues=12,id=net1 \
     -device virtio-net-pci,netdev=net1,mac=$alt_mac,mq=on,vectors=26 \
-    -object memory-backend-file,id=mem,size=10G,mem-path=/dev/hugepages,share=on \
+    -object memory-backend-file,id=mem,size=25G,mem-path=/dev/hugepages,share=on \
     -numa node,memdev=mem -mem-prealloc \
     -drive if=virtio,format=qcow2,file="base.snapshot.qcow2" \
     -drive if=virtio,format=raw,file="seed.img" \
@@ -82,14 +82,14 @@ elif [[ "$stack" == 'ovs-tas' ]]; then
     -machine accel=kvm,type=q35 \
     -cpu host \
     -smp 12 \
-    -m 10G \
+    -m 25G \
     -snapshot \
     -netdev user,id=net0,hostfwd=tcp::222${vm_id}-:22 \
     -device virtio-net-pci,netdev=net0 \
     -chardev socket,id=char0,path=/usr/local/var/run/openvswitch/$vhost \
     -netdev type=vhost-user,chardev=char0,vhostforce=on,queues=12,id=net1 \
     -device virtio-net-pci,netdev=net1,mac=$alt_mac,mq=on,vectors=26 \
-    -object memory-backend-file,id=mem,size=10G,mem-path=/dev/hugepages,share=on \
+    -object memory-backend-file,id=mem,size=25G,mem-path=/dev/hugepages,share=on \
     -numa node,memdev=mem -mem-prealloc \
     -drive if=virtio,format=qcow2,file="base.snapshot.qcow2" \
     -drive if=virtio,format=raw,file="seed.img" \
@@ -100,7 +100,7 @@ elif [[ "$stack" == 'tap-tas' ]]; then
     -machine accel=kvm,type=q35 \
     -cpu host \
     -smp 12 \
-    -m 6G \
+    -m 25G \
     -snapshot \
     -netdev user,id=net0 \
     -device virtio-net-pci,netdev=net0 \