diff options
| author |   Damjan Marion <damarion@cisco.com> | 2019-03-26 13:16:42 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-03-27 12:40:18 +0000 |
| commit | d709cbcb1ef80633af657c5427608831e5bbd919 (patch) | |
| tree | cb389257174014b546e32cb3a6ab15df781703d8 /src/vnet/ipsec/esp.h | |
| parent | fbf278adc2fa5ffd1671fb9f91eb03d6d0dc5a9e (diff) | |
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>
Diffstat (limited to 'src/vnet/ipsec/esp.h')
| -rw-r--r-- | src/vnet/ipsec/esp.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/vnet/ipsec/esp.h b/src/vnet/ipsec/esp.h index 063b74b7c5c..1f894ab09af 100644 --- a/src/vnet/ipsec/esp.h +++ b/src/vnet/ipsec/esp.h @@ -184,12 +184,12 @@ esp_replay_advance_esn (ipsec_sa_t * sa, u32 seq) always_inline int esp_seq_advance (ipsec_sa_t * sa) { - if (PREDICT_TRUE (sa->use_esn)) + if (PREDICT_TRUE (ipsec_sa_is_set_USE_EXTENDED_SEQ_NUM (sa))) { if (PREDICT_FALSE (sa->seq == ESP_SEQ_MAX)) { - if (PREDICT_FALSE - (sa->use_anti_replay && sa->seq_hi == ESP_SEQ_MAX)) + if (PREDICT_FALSE (ipsec_sa_is_set_USE_ANTI_REPLAY (sa) && + sa->seq_hi == ESP_SEQ_MAX)) return 1; sa->seq_hi++; } @@ -197,7 +197,8 @@ esp_seq_advance (ipsec_sa_t * sa) } else { - if (PREDICT_FALSE (sa->use_anti_replay && sa->seq == ESP_SEQ_MAX)) + if (PREDICT_FALSE (ipsec_sa_is_set_USE_ANTI_REPLAY (sa) && + sa->seq == ESP_SEQ_MAX)) return 1; sa->seq++; } @@ -223,7 +224,7 @@ hmac_calc (vlib_main_t * vm, ipsec_sa_t * sa, u8 * data, int data_len, op->dst = signature; op->hmac_trunc_len = sa->integ_trunc_size; - if (sa->use_esn) + if (ipsec_sa_is_set_USE_EXTENDED_SEQ_NUM (sa)) { u32 seq_hi = clib_host_to_net_u32 (sa->seq_hi); |