From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7B599A09FD; Fri, 18 Dec 2020 14:18:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DF131CAF8; Fri, 18 Dec 2020 14:17:58 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 0B554CAE2 for ; Fri, 18 Dec 2020 14:17:57 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0BIDFpC6012834; Fri, 18 Dec 2020 05:17:56 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=aT6evRyd5O2hf6phqATvmsYqOAyo8XvcmUHvpon9eZw=; b=gTj3z1XHBDZ828hQUODtfdnJV+v6Qls/2RrGoet++eHB8dBXzG9iAm/6ANDBokkqk1mB MxNCE8Ad/mCMx/RYTO+MmTWFFppjGlNIQbL3JZIo27HlfastwXaeOCOJAhNBVk6ZJDXP AVxkBtnJm2mNVqu9c1EMjL8BzYDFJw/JXjnNjwfixBCcEyt/CkaAJJD+2gnzDt0caXu+ vB3oNJwQ86861WHW9+K2Bm/3uNye26vkPKFYAy86Ne801ZBHMUeEeHRBww7H8ESAo2RW 6kI5HFnoizKuP7qVZ9RoWVxM/KB+N9ZcM2M+o1/QFK/QSy+oaJuj5Vui6EItM6fSA4tz Yg== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 35g4rp40ej-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 18 Dec 2020 05:17:56 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 18 Dec 2020 05:17:54 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 18 Dec 2020 05:17:55 -0800 Received: from hyd1554T5810.caveonetworks.com.com (unknown [10.29.57.11]) by maili.marvell.com (Postfix) with ESMTP id 35EA83F703F; Fri, 18 Dec 2020 05:17:52 -0800 (PST) From: Tejasree Kondoj To: Akhil Goyal , Radu Nicolau CC: Tejasree Kondoj , Anoob Joseph , Ankur Dwivedi , Date: Fri, 18 Dec 2020 19:44:09 +0530 Message-ID: <20201218141410.1918-2-ktejasree@marvell.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201218141410.1918-1-ktejasree@marvell.com> References: <20201218141410.1918-1-ktejasree@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343, 18.0.737 definitions=2020-12-18_09:2020-12-18, 2020-12-18 signatures=0 Subject: [dpdk-dev] [PATCH 1/2] crypto/octeontx2: make anti-replay routine generic X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Adding changes to make anti-replay routine common to both inline and lookaside IPsec. Signed-off-by: Tejasree Kondoj --- drivers/crypto/octeontx2/otx2_ipsec_anti_replay.h | 11 +++++------ drivers/net/octeontx2/otx2_rx.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/octeontx2/otx2_ipsec_anti_replay.h b/drivers/crypto/octeontx2/otx2_ipsec_anti_replay.h index 858ce5b15f..d599692a75 100644 --- 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 @@ anti_replay_check(uint64_t seq, struct otx2_ipsec_fp_in_sa *sa) 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 926f614a4e..523f36e9f1 100644 --- a/drivers/net/octeontx2/otx2_rx.h +++ b/drivers/net/octeontx2/otx2_rx.h @@ -259,7 +259,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; } -- 2.27.0