crypto/octeontx2: make anti-replay routine generic

Adding changes to make anti-replay routine common to both inline and
lookaside IPsec.

Signed-off-by: Tejasree Kondoj <ktejasree@marvell.com>
Acked-by: Anoob Joseph <anoobj@marvell.com>

diff --git a/drivers/crypto/octeontx2/otx2_ipsec_anti_replay.h b/drivers/crypto/octeontx2/otx2_ipsec_anti_replay.h
index 858ce5b..d599692 100644 (file)
--- a/drivers/crypto/octeontx2/otx2_ipsec_anti_replay.h
+++ b/drivers/crypto/octeontx2/otx2_ipsec_anti_replay.h
@@ -16,11 +16,10 @@
 #define IPSEC_ANTI_REPLAY_FAILED       (-1)
 
 static inline int
-anti_replay_check(uint64_t seq, struct otx2_ipsec_fp_in_sa *sa)
+anti_replay_check(struct otx2_ipsec_replay *replay, uint64_t seq,
+                       uint64_t winsz)
 {
-       struct otx2_ipsec_replay *replay = sa->replay;
        uint64_t *window = &replay->window[0];
-       uint64_t winsz = sa->replay_win_sz;
        uint64_t ex_winsz = winsz + WORD_SIZE;
        uint64_t winwords = ex_winsz >> WORD_SHIFT;
        uint64_t base = replay->base;
@@ -166,8 +165,8 @@ winupdate:
        return 0;
 }
 
-static int
-cpt_ipsec_antireplay_check(struct otx2_ipsec_fp_in_sa *sa, char *data)
+static inline int
+cpt_ipsec_ip_antireplay_check(struct otx2_ipsec_fp_in_sa *sa, char *data)
 {
        uint64_t seq_in_sa;
        uint32_t seqh = 0;
@@ -192,7 +191,7 @@ cpt_ipsec_antireplay_check(struct otx2_ipsec_fp_in_sa *sa, char *data)
                return IPSEC_ANTI_REPLAY_FAILED;
 
        rte_spinlock_lock(&sa->replay->lock);
-       ret = anti_replay_check(seq, sa);
+       ret = anti_replay_check(sa->replay, seq, sa->replay_win_sz);
        if (esn && (ret == 0)) {
                seq_in_sa = ((uint64_t)rte_be_to_cpu_32(sa->esn_hi) << 32) |
                                rte_be_to_cpu_32(sa->esn_low);

diff --git a/drivers/net/octeontx2/otx2_rx.h b/drivers/net/octeontx2/otx2_rx.h
index 0ba3d3d..257492a 100644 (file)
--- a/drivers/net/octeontx2/otx2_rx.h
+++ b/drivers/net/octeontx2/otx2_rx.h
@@ -260,7 +260,7 @@ nix_rx_sec_mbuf_update(const struct nix_cqe_hdr_s *cq, struct rte_mbuf *m,
        data = rte_pktmbuf_mtod(m, char *);
 
        if (sa->replay_win_sz) {
-               if (cpt_ipsec_antireplay_check(sa, data) < 0)
+               if (cpt_ipsec_ip_antireplay_check(sa, data) < 0)
                        return PKT_RX_SEC_OFFLOAD | PKT_RX_SEC_OFFLOAD_FAILED;
        }