Process packets in bursts.HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ycm-13.0

Add a "packet_burst" config option that will cause clatd to read
(and write) in bursts of up to that number of packets, instead of
always only reading one packet at a time. This reduces poll
overhead and improves performance.

The variable is initially set to 10.

Bug: 24113287
Change-Id: I7feba4127538c5a89f92e0ebea1fb75971d6b901

1 files changed, 3 insertions, 1 deletions

diff --git a/ring.c b/ring.c
index 17f8026..dcf4310 100644
--- a/ring.c
+++ b/ring.c
@@ -24,6 +24,7 @@
 #include <linux/if.h>
 #include <linux/if_packet.h>
 
+#include "config.h"
 #include "logging.h"
 #include "ring.h"
 #include "translate.h"
@@ -116,9 +117,10 @@ static struct tpacket2_hdr* ring_advance(struct packet_ring *ring) {
  * to_ipv6  - whether the packet is to be translated to ipv6 or ipv4
  */
 void ring_read(struct packet_ring *ring, int write_fd, int to_ipv6) {
+  int numread = 0;
   struct tpacket2_hdr *tp = ring->next;
   uint16_t val = TP_CSUM_NONE;
-  if (tp->tp_status & TP_STATUS_USER) {
+  while (tp->tp_status & TP_STATUS_USER && numread++ < Global_Clatd_Config.packet_burst) {
     //We expect only GRO coalesced packets to have TP_STATUS_CSUMNOTREADY
     //(ip_summed = CHECKSUM_PARTIAL) in this path. Note that these packets have already gone
     //through checksum validation in GRO engine. CHECKSUM_PARTIAL is defined to be 3 while