summaryrefslogtreecommitdiffstats
path: root/VNFs/DPPD-PROX
diff options
context:
space:
mode:
authorDanielMartinBuckley <daniel.m.buckley@intel.com>2017-09-08 12:45:13 +0100
committerDanielMartinBuckley <daniel.m.buckley@intel.com>2017-09-11 17:34:59 +0100
commit9e4d303ca87c498ec5aef9d37f3c6f556eeddaae (patch)
treee458149af316df616720618ffc277e6956c45989 /VNFs/DPPD-PROX
parent612f4187759b6e768d9ee817ca7a779e5c657ce1 (diff)
Support 5 tuple load balancing for IP addresses other than 0.0.0.X
Currently packets generated with IP addresses 10.1.1.x when handled by 5 Tuple Load Balancer are discarded/dropped. These addresses are outhside the range of the hash algorithm. Change-Id: Idf2cea0ff299a3fa75554f0d103e13391eae02fa Signed-off-by: Daniel Martin Buckley <daniel.m.buckley@intel.com>
Diffstat (limited to 'VNFs/DPPD-PROX')
-rw-r--r--VNFs/DPPD-PROX/handle_lb_5tuple.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/VNFs/DPPD-PROX/handle_lb_5tuple.c b/VNFs/DPPD-PROX/handle_lb_5tuple.c
index ae973f1c..7aadf49a 100644
--- a/VNFs/DPPD-PROX/handle_lb_5tuple.c
+++ b/VNFs/DPPD-PROX/handle_lb_5tuple.c
@@ -39,8 +39,9 @@
#include "quit.h"
#define BYTE_VALUE_MAX 256
-#define ALL_32_BITS 0xffffffff
-#define BIT_8_TO_15 0x0000ff00
+#define BIT_8_TO_10 0x0000e000 // for protocol field
+#define BIT_27_TO_31 0x1f000000 // for IP addresses
+#define BIT_12_TO_16_27_TO_31 0x1f001f00 // for ports
#define HASH_MAX_SIZE 4*8*1024*1024
@@ -60,7 +61,7 @@ static inline uint8_t get_ipv4_dst_port(struct task_lb_5tuple *task, void *ipv4_
ipv4_hdr = (uint8_t *)ipv4_hdr + offsetof(struct ipv4_hdr, time_to_live);
__m128i data = _mm_loadu_si128((__m128i*)(ipv4_hdr));
/* Get 5 tuple: dst port, src port, dst IP address, src IP address and protocol */
- key.xmm = _mm_and_si128(data, mask0);
+ key.xmm = _mm_and_si128(data, mask0);
/* Get 5 tuple: dst port, src port, dst IP address, src IP address and protocol */
/*
@@ -120,8 +121,7 @@ static void init_task_lb_5tuple(struct task_base *tbase, struct task_args *targ)
struct task_lb_5tuple *task = (struct task_lb_5tuple *)tbase;
const int socket_id = rte_lcore_to_socket_id(targ->lconf->id);
- mask0 = _mm_set_epi32(ALL_32_BITS, ALL_32_BITS, ALL_32_BITS, BIT_8_TO_15);
-
+ mask0 = _mm_set_epi32(BIT_12_TO_16_27_TO_31, BIT_27_TO_31, BIT_27_TO_31, BIT_8_TO_10);
uint8_t *out_table = task->out_if;
int ret = lua_to_tuples(prox_lua(), GLOBAL, "tuples", socket_id, &task->lookup_hash, &out_table);
PROX_PANIC(ret, "Failed to read tuples from config\n");