commit d709cbcb1ef80633af657c5427608831e5bbd919
author Damjan Marion <damarion@cisco.com> Tue Mar 26 13:16:42 2019 +0100
committer Damjan Marion <dmarion@me.com> Wed Mar 27 12:40:18 2019 +0000
tree cb389257174014b546e32cb3a6ab15df781703d8
parent fbf278adc2fa5ffd1671fb9f91eb03d6d0dc5a9e

ipsec: compress ipsec_sa_t so data used by dataplane code fits in cacheline

Change-Id: I81ecdf9fdcfcb017117b47dc031f93208e004d7c
Signed-off-by: Damjan Marion <damarion@cisco.com>
Signed-off-by: Neale Ranns <nranns@cisco.com>

src/vnet/ipsec/ah_decrypt.c

diff --git a/src/vnet/ipsec/ah_decrypt.c b/src/vnet/ipsec/ah_decrypt.c
index b0916f9..87e1de1 100644
--- a/src/vnet/ipsec/ah_decrypt.c
+++ b/src/vnet/ipsec/ah_decrypt.c
@@ -151,11 +151,11 @@
 	  seq = clib_host_to_net_u32 (ah0->seq_no);
 
 	  /* anti-replay check */
-	  if (sa0->use_anti_replay)
+	  if (ipsec_sa_is_set_USE_ANTI_REPLAY (sa0))
 	    {
 	      int rv = 0;
 
-	      if (PREDICT_TRUE (sa0->use_esn))
+	      if (PREDICT_TRUE (ipsec_sa_is_set_USE_EXTENDED_SEQ_NUM (sa0)))
 		rv = esp_replay_check_esn (sa0, seq);
 	      else
 		rv = esp_replay_check (sa0, seq);
@@ -210,9 +210,10 @@
 		  goto trace;
 		}
 
-	      if (PREDICT_TRUE (sa0->use_anti_replay))
+	      if (PREDICT_TRUE (ipsec_sa_is_set_USE_ANTI_REPLAY (sa0)))
 		{
-		  if (PREDICT_TRUE (sa0->use_esn))
+		  if (PREDICT_TRUE
+		      (ipsec_sa_is_set_USE_EXTENDED_SEQ_NUM (sa0)))
 		    esp_replay_advance_esn (sa0, seq);
 		  else
 		    esp_replay_advance (sa0, seq);
@@ -225,7 +226,7 @@
 			       icv_padding_len);
 	  i_b0->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
 
-	  if (PREDICT_TRUE (sa0->is_tunnel))
+	  if (PREDICT_TRUE (ipsec_sa_is_set_IS_TUNNEL (sa0)))
 	    {			/* tunnel mode */
 	      if (PREDICT_TRUE (ah0->nexthdr == IP_PROTOCOL_IP_IN_IP))
 		next0 = AH_DECRYPT_NEXT_IP4_INPUT;