Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/127587/?format=api
{ "id": 127587, "url": "http://patchwork.dpdk.org/api/patches/127587/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230526210214.617-22-anoobj@marvell.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230526210214.617-22-anoobj@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230526210214.617-22-anoobj@marvell.com", "date": "2023-05-26T21:02:13", "name": "[v4,21/22] pdcp: add thread safe processing", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "5474dbc7b3b60e7c0bf73f725aa3b74ed7797ac2", "submitter": { "id": 1205, "url": "http://patchwork.dpdk.org/api/people/1205/?format=api", "name": "Anoob Joseph", "email": "anoobj@marvell.com" }, "delegate": { "id": 6690, "url": "http://patchwork.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230526210214.617-22-anoobj@marvell.com/mbox/", "series": [ { "id": 28214, "url": "http://patchwork.dpdk.org/api/series/28214/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=28214", "date": "2023-05-26T21:01:52", "name": "lib: add pdcp protocol", "version": 4, "mbox": "http://patchwork.dpdk.org/series/28214/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/127587/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/127587/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 613E142BAD;\n\tFri, 26 May 2023 23:05:13 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 6317D42D94;\n\tFri, 26 May 2023 23:04:29 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174])\n by mails.dpdk.org (Postfix) with ESMTP id 0BED742DA4\n for <dev@dpdk.org>; Fri, 26 May 2023 23:04:26 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 34QHdjAo018593; Fri, 26 May 2023 14:04:25 -0700", "from dc5-exch01.marvell.com ([199.233.59.181])\n by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3qu1c78nnj-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Fri, 26 May 2023 14:04:25 -0700", "from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48;\n Fri, 26 May 2023 14:04:23 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend\n Transport; Fri, 26 May 2023 14:04:23 -0700", "from BG-LT92004.corp.innovium.com (unknown [10.193.32.169])\n by maili.marvell.com (Postfix) with ESMTP id BBD143F7070;\n Fri, 26 May 2023 14:04:17 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0220;\n bh=wd5MS36vGsKuUJocAypCk2Q5givHuXSOn8X2M68Nc1Y=;\n b=LbZTWdkSXEwveI+HysD/p0FdKDYLSZyXTMdIsW2/l2de87hLj4eiSyXOzzUxX9cvPouW\n ywFW6VaeG3O0XfycMXwnvZEGw72hVuKTaGWQu4UO+IT0KRvo1qBAawslR1luTcBgBXy2\n GYmGL8NPJ4l3WgA/7HOoGlSMDizsRTwXFwRFmQxK9CW201ifbKVNB4BWGjbZ4s7/RU0u\n l50vesNmFgjZLseQsOKwJSRdJRAtWKYISZnutiZW9CoOB+eV6n7Yjau0o/GChFwphElh\n orEyI+UmWkkeiVqFMEuGtwD+2xLPg4cMKkp9OcHs69U3MYDi4CtvFRkJ7OZiQXJdAb2x 3Q==", "From": "Anoob Joseph <anoobj@marvell.com>", "To": "Thomas Monjalon <thomas@monjalon.net>, Akhil Goyal <gakhil@marvell.com>,\n Jerin Jacob <jerinj@marvell.com>, Konstantin Ananyev\n <konstantin.v.ananyev@yandex.ru>", "CC": "Volodymyr Fialko <vfialko@marvell.com>,\n Hemant Agrawal <hemant.agrawal@nxp.com>,\n =?utf-8?q?Mattias_R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>,\n Kiran Kumar K <kirankumark@marvell.com>, <dev@dpdk.org>,\n Olivier Matz <olivier.matz@6wind.com>,\n Stephen Hemminger <stephen@networkplumber.org>", "Subject": "[PATCH v4 21/22] pdcp: add thread safe processing", "Date": "Sat, 27 May 2023 02:32:13 +0530", "Message-ID": "<20230526210214.617-22-anoobj@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20230526210214.617-1-anoobj@marvell.com>", "References": "<20230524160116.304-1-anoobj@marvell.com>\n <20230526210214.617-1-anoobj@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-GUID": "h-Ihz7MJZg1SsXUVZ_OY-n8aWVqTiF7j", "X-Proofpoint-ORIG-GUID": "h-Ihz7MJZg1SsXUVZ_OY-n8aWVqTiF7j", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26\n definitions=2023-05-26_10,2023-05-25_03,2023-05-22_02", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "From: Volodymyr Fialko <vfialko@marvell.com>\n\nPDCP state has to be guarded for:\n\n- Uplink pre_process:\n - tx_next atomic increment\n\n- Downlink pre_process:\n - rx_deliv - read\n\n- Downlink post_process:\n - rx_deliv, rx_reorder, rx_next - read/write\n - bitmask/reorder buffer - read/write\n\nWhen application requires thread safe processing, the state variables\nneed to be updated atomically. Add config option to select this option\nper entity.\n\nSigned-off-by: Anoob Joseph <anoobj@marvell.com>\nSigned-off-by: Volodymyr Fialko <vfialko@marvell.com>\n---\n lib/pdcp/meson.build | 2 +\n lib/pdcp/pdcp_entity.h | 64 ++++++++++++++++++++++\n lib/pdcp/pdcp_process.c | 117 +++++++++++++++++++++++++++++++++-------\n lib/pdcp/rte_pdcp.c | 9 ++++\n lib/pdcp/rte_pdcp.h | 2 +\n 5 files changed, 175 insertions(+), 19 deletions(-)", "diff": "diff --git a/lib/pdcp/meson.build b/lib/pdcp/meson.build\nindex f4f9246bcb..c4f135778e 100644\n--- a/lib/pdcp/meson.build\n+++ b/lib/pdcp/meson.build\n@@ -19,3 +19,5 @@ headers = files('rte_pdcp.h')\n indirect_headers += files('rte_pdcp_group.h')\n \n deps += ['mbuf', 'net', 'cryptodev', 'security', 'reorder']\n+\n+annotate_locks = false\ndiff --git a/lib/pdcp/pdcp_entity.h b/lib/pdcp/pdcp_entity.h\nindex 9f74b5d0e5..e88af4c3b3 100644\n--- a/lib/pdcp/pdcp_entity.h\n+++ b/lib/pdcp/pdcp_entity.h\n@@ -9,6 +9,7 @@\n #include <rte_crypto_sym.h>\n #include <rte_mempool.h>\n #include <rte_pdcp.h>\n+#include <rte_rwlock.h>\n #include <rte_security.h>\n \n #include \"pdcp_reorder.h\"\n@@ -162,6 +163,8 @@ struct entity_priv {\n \t\tuint64_t is_status_report_required : 1;\n \t\t/** Is out-of-order delivery enabled */\n \t\tuint64_t is_out_of_order_delivery : 1;\n+\t\t/** Is thread safety enabled. */\n+\t\tuint64_t is_thread_safety_enabled : 1;\n \t} flags;\n \t/** Crypto op pool. */\n \tstruct rte_mempool *cop_pool;\n@@ -182,6 +185,8 @@ struct entity_priv_dl_part {\n \tstruct pdcp_t_reordering t_reorder;\n \t/** Reorder packet buffer */\n \tstruct pdcp_reorder reorder;\n+\t/* Lock to protect concurrent updates */\n+\trte_rwlock_t rwl;\n \t/** Bitmap memory region */\n \tuint8_t bitmap_mem[0];\n };\n@@ -257,4 +262,63 @@ pdcp_hfn_max(enum rte_security_pdcp_sn_size sn_size)\n \treturn (1 << (32 - sn_size)) - 1;\n }\n \n+static inline uint32_t\n+pdcp_atomic_inc(uint32_t *val, const bool mt_safe)\n+{\n+\tif (mt_safe)\n+\t\treturn __atomic_fetch_add(val, 1, __ATOMIC_RELAXED);\n+\telse\n+\t\treturn (*val)++;\n+}\n+\n+static inline void\n+pdcp_lock_init(const struct rte_pdcp_entity *entity)\n+{\n+\tstruct entity_priv_dl_part *dl = entity_dl_part_get(entity);\n+\tstruct entity_priv *en_priv = entity_priv_get(entity);\n+\n+\tif (en_priv->flags.is_thread_safety_enabled)\n+\t\trte_rwlock_init(&dl->rwl);\n+}\n+\n+static inline void\n+pdcp_read_lock(const struct rte_pdcp_entity *entity)\n+{\n+\tstruct entity_priv_dl_part *dl = entity_dl_part_get(entity);\n+\tstruct entity_priv *en_priv = entity_priv_get(entity);\n+\n+\tif (en_priv->flags.is_thread_safety_enabled)\n+\t\trte_rwlock_read_lock(&dl->rwl);\n+}\n+\n+static inline void\n+pdcp_read_unlock(const struct rte_pdcp_entity *entity)\n+{\n+\tstruct entity_priv_dl_part *dl = entity_dl_part_get(entity);\n+\tstruct entity_priv *en_priv = entity_priv_get(entity);\n+\n+\tif (en_priv->flags.is_thread_safety_enabled)\n+\t\trte_rwlock_read_unlock(&dl->rwl);\n+}\n+\n+static inline void\n+pdcp_write_lock(const struct rte_pdcp_entity *entity)\n+{\n+\tstruct entity_priv_dl_part *dl = entity_dl_part_get(entity);\n+\tstruct entity_priv *en_priv = entity_priv_get(entity);\n+\n+\tif (en_priv->flags.is_thread_safety_enabled)\n+\t\trte_rwlock_write_lock(&dl->rwl);\n+}\n+\n+static inline void\n+pdcp_write_unlock(const struct rte_pdcp_entity *entity)\n+{\n+\tstruct entity_priv_dl_part *dl = entity_dl_part_get(entity);\n+\tstruct entity_priv *en_priv = entity_priv_get(entity);\n+\n+\tif (en_priv->flags.is_thread_safety_enabled)\n+\t\trte_rwlock_write_unlock(&dl->rwl);\n+}\n+\n #endif /* PDCP_ENTITY_H */\ndiff --git a/lib/pdcp/pdcp_process.c b/lib/pdcp/pdcp_process.c\nindex c093b78e10..aa13801d5d 100644\n--- a/lib/pdcp/pdcp_process.c\n+++ b/lib/pdcp/pdcp_process.c\n@@ -357,7 +357,7 @@ cop_prepare(const struct entity_priv *en_priv, struct rte_mbuf *mb, struct rte_c\n \n static inline bool\n pdcp_pre_process_uplane_sn_12_ul_set_sn(struct entity_priv *en_priv, struct rte_mbuf *mb,\n-\t\t\t\t\tuint32_t *count)\n+\t\t\t\t\tuint32_t *count, const bool mt_safe)\n {\n \tstruct rte_pdcp_up_data_pdu_sn_12_hdr *pdu_hdr;\n \tconst uint8_t hdr_sz = en_priv->hdr_sz;\n@@ -369,7 +369,7 @@ pdcp_pre_process_uplane_sn_12_ul_set_sn(struct entity_priv *en_priv, struct rte_\n \t\treturn false;\n \n \t/* Update sequence num in the PDU header */\n-\t*count = en_priv->state.tx_next++;\n+\t*count = pdcp_atomic_inc(&en_priv->state.tx_next, mt_safe);\n \tsn = pdcp_sn_from_count_get(*count, RTE_SECURITY_PDCP_SN_SIZE_12);\n \n \tpdu_hdr->d_c = RTE_PDCP_PDU_TYPE_DATA;\n@@ -379,9 +379,11 @@ pdcp_pre_process_uplane_sn_12_ul_set_sn(struct entity_priv *en_priv, struct rte_\n \treturn true;\n }\n \n-static uint16_t\n-pdcp_pre_process_uplane_sn_12_ul(const struct rte_pdcp_entity *entity, struct rte_mbuf *in_mb[],\n-\t\t\t\t struct rte_crypto_op *cop[], uint16_t num, uint16_t *nb_err_ret)\n+static inline uint16_t\n+pdcp_pre_process_uplane_sn_12_ul_flags(const struct rte_pdcp_entity *entity,\n+\t\t\t\t struct rte_mbuf *in_mb[], struct rte_crypto_op *cop[],\n+\t\t\t\t uint16_t num, uint16_t *nb_err_ret,\n+\t\t\t\t const bool mt_safe)\n {\n \tstruct entity_priv *en_priv = entity_priv_get(entity);\n \tuint16_t nb_cop, nb_prep = 0, nb_err = 0;\n@@ -410,7 +412,7 @@ pdcp_pre_process_uplane_sn_12_ul(const struct rte_pdcp_entity *entity, struct rt\n \t\t\t\tmemset(mac_i, 0, RTE_PDCP_MAC_I_LEN);\n \n \t\t\tif (unlikely(!pdcp_pre_process_uplane_sn_12_ul_set_sn(en_priv, mb,\n-\t\t\t\t\t\t\t\t\t &count))) {\n+\t\t\t\t\t\t\t\t\t &count, mt_safe))) {\n \t\t\t\tin_mb[nb_err++] = mb;\n \t\t\t\tcontinue;\n \t\t\t}\n@@ -421,7 +423,7 @@ pdcp_pre_process_uplane_sn_12_ul(const struct rte_pdcp_entity *entity, struct rt\n \t\tfor (i = 0; i < nb_cop; i++) {\n \t\t\tmb = in_mb[i];\n \t\t\tif (unlikely(!pdcp_pre_process_uplane_sn_12_ul_set_sn(en_priv, mb,\n-\t\t\t\t\t\t\t\t\t &count))) {\n+\t\t\t\t\t\t\t\t\t &count, mt_safe))) {\n \t\t\t\tin_mb[nb_err++] = mb;\n \t\t\t\tcontinue;\n \t\t\t}\n@@ -439,9 +441,25 @@ pdcp_pre_process_uplane_sn_12_ul(const struct rte_pdcp_entity *entity, struct rt\n \treturn nb_prep;\n }\n \n+static uint16_t\n+pdcp_pre_process_uplane_sn_12_ul_st(const struct rte_pdcp_entity *entity,\n+\t\t\t\t struct rte_mbuf *in_mb[], struct rte_crypto_op *cop[],\n+\t\t\t\t uint16_t num, uint16_t *nb_err_ret)\n+{\n+\treturn pdcp_pre_process_uplane_sn_12_ul_flags(entity, in_mb, cop, num, nb_err_ret, false);\n+}\n+\n+static uint16_t\n+pdcp_pre_process_uplane_sn_12_ul_mt(const struct rte_pdcp_entity *entity,\n+\t\t\t\t struct rte_mbuf *in_mb[], struct rte_crypto_op *cop[],\n+\t\t\t\t uint16_t num, uint16_t *nb_err_ret)\n+{\n+\treturn pdcp_pre_process_uplane_sn_12_ul_flags(entity, in_mb, cop, num, nb_err_ret, true);\n+}\n+\n static inline bool\n pdcp_pre_process_uplane_sn_18_ul_set_sn(struct entity_priv *en_priv, struct rte_mbuf *mb,\n-\t\t\t\t\tuint32_t *count)\n+\t\t\t\t\tuint32_t *count, const bool mt_safe)\n {\n \tstruct rte_pdcp_up_data_pdu_sn_18_hdr *pdu_hdr;\n \tconst uint8_t hdr_sz = en_priv->hdr_sz;\n@@ -453,7 +471,7 @@ pdcp_pre_process_uplane_sn_18_ul_set_sn(struct entity_priv *en_priv, struct rte_\n \t\treturn false;\n \n \t/* Update sequence num in the PDU header */\n-\t*count = en_priv->state.tx_next++;\n+\t*count = pdcp_atomic_inc(&en_priv->state.tx_next, mt_safe);\n \tsn = pdcp_sn_from_count_get(*count, RTE_SECURITY_PDCP_SN_SIZE_18);\n \n \tpdu_hdr->d_c = RTE_PDCP_PDU_TYPE_DATA;\n@@ -466,8 +484,9 @@ pdcp_pre_process_uplane_sn_18_ul_set_sn(struct entity_priv *en_priv, struct rte_\n }\n \n static inline uint16_t\n-pdcp_pre_process_uplane_sn_18_ul(const struct rte_pdcp_entity *entity, struct rte_mbuf *in_mb[],\n-\t\t\t\t struct rte_crypto_op *cop[], uint16_t num, uint16_t *nb_err_ret)\n+pdcp_pre_process_uplane_sn_18_ul_flags(const struct rte_pdcp_entity *entity,\n+\t\t\t\t struct rte_mbuf *in_mb[], struct rte_crypto_op *cop[],\n+\t\t\t\t uint16_t num, uint16_t *nb_err_ret, const bool mt_safe)\n {\n \tstruct entity_priv *en_priv = entity_priv_get(entity);\n \tuint16_t nb_cop, nb_prep = 0, nb_err = 0;\n@@ -496,7 +515,7 @@ pdcp_pre_process_uplane_sn_18_ul(const struct rte_pdcp_entity *entity, struct rt\n \t\t\t\tmemset(mac_i, 0, RTE_PDCP_MAC_I_LEN);\n \n \t\t\tif (unlikely(!pdcp_pre_process_uplane_sn_18_ul_set_sn(en_priv, mb,\n-\t\t\t\t\t\t\t\t\t &count))) {\n+\t\t\t\t\t\t\t\t\t &count, mt_safe))) {\n \t\t\t\tin_mb[nb_err++] = mb;\n \t\t\t\tcontinue;\n \t\t\t}\n@@ -507,7 +526,7 @@ pdcp_pre_process_uplane_sn_18_ul(const struct rte_pdcp_entity *entity, struct rt\n \t\tfor (i = 0; i < nb_cop; i++) {\n \t\t\tmb = in_mb[i];\n \t\t\tif (unlikely(!pdcp_pre_process_uplane_sn_18_ul_set_sn(en_priv, mb,\n-\t\t\t\t\t\t\t\t\t &count))) {\n+\t\t\t\t\t\t\t\t\t &count, mt_safe))) {\n \n \t\t\t\tin_mb[nb_err++] = mb;\n \t\t\t\tcontinue;\n@@ -527,8 +546,23 @@ pdcp_pre_process_uplane_sn_18_ul(const struct rte_pdcp_entity *entity, struct rt\n }\n \n static uint16_t\n-pdcp_pre_process_cplane_sn_12_ul(const struct rte_pdcp_entity *entity, struct rte_mbuf *in_mb[],\n-\t\t\t\t struct rte_crypto_op *cop[], uint16_t num, uint16_t *nb_err_ret)\n+pdcp_pre_process_uplane_sn_18_ul_st(const struct rte_pdcp_entity *entity, struct rte_mbuf *in_mb[],\n+\t\t\t\t struct rte_crypto_op *cop[], uint16_t num, uint16_t *nb_err_ret)\n+{\n+\treturn pdcp_pre_process_uplane_sn_18_ul_flags(entity, in_mb, cop, num, nb_err_ret, false);\n+}\n+\n+static uint16_t\n+pdcp_pre_process_uplane_sn_18_ul_mt(const struct rte_pdcp_entity *entity, struct rte_mbuf *in_mb[],\n+\t\t\t\t struct rte_crypto_op *cop[], uint16_t num, uint16_t *nb_err_ret)\n+{\n+\treturn pdcp_pre_process_uplane_sn_18_ul_flags(entity, in_mb, cop, num, nb_err_ret, true);\n+}\n+\n+static inline uint16_t\n+pdcp_pre_process_cplane_sn_12_ul_flags(const struct rte_pdcp_entity *entity,\n+\t\t\t\t struct rte_mbuf *in_mb[], struct rte_crypto_op *cop[],\n+\t\t\t\t uint16_t num, uint16_t *nb_err_ret, const bool mt_safe)\n {\n \tstruct entity_priv *en_priv = entity_priv_get(entity);\n \tstruct rte_pdcp_cp_data_pdu_sn_12_hdr *pdu_hdr;\n@@ -565,7 +599,7 @@ pdcp_pre_process_cplane_sn_12_ul(const struct rte_pdcp_entity *entity, struct rt\n \t\t\tmemset(mac_i, 0, RTE_PDCP_MAC_I_LEN);\n \n \t\t/* Update sequence number in the PDU header */\n-\t\tcount = en_priv->state.tx_next++;\n+\t\tcount = pdcp_atomic_inc(&en_priv->state.tx_next, mt_safe);\n \t\tsn = pdcp_sn_from_count_get(count, RTE_SECURITY_PDCP_SN_SIZE_12);\n \n \t\tpdu_hdr->sn_11_8 = ((sn & 0xf00) >> 8);\n@@ -584,6 +618,21 @@ pdcp_pre_process_cplane_sn_12_ul(const struct rte_pdcp_entity *entity, struct rt\n \treturn nb_prep;\n }\n \n+static uint16_t\n+pdcp_pre_process_cplane_sn_12_ul_st(const struct rte_pdcp_entity *entity, struct rte_mbuf *in_mb[],\n+\t\t\t\t struct rte_crypto_op *cop[], uint16_t num, uint16_t *nb_err_ret)\n+{\n+\treturn pdcp_pre_process_cplane_sn_12_ul_flags(entity, in_mb, cop, num, nb_err_ret, false);\n+}\n+\n+static uint16_t\n+pdcp_pre_process_cplane_sn_12_ul_mt(const struct rte_pdcp_entity *entity, struct rte_mbuf *in_mb[],\n+\t\t\t\t struct rte_crypto_op *cop[], uint16_t num, uint16_t *nb_err_ret)\n+{\n+\treturn pdcp_pre_process_cplane_sn_12_ul_flags(entity, in_mb, cop, num, nb_err_ret, true);\n+}\n+\n+\n static uint16_t\n pdcp_post_process_ul(const struct rte_pdcp_entity *entity,\n \t\t struct rte_mbuf *in_mb[], struct rte_mbuf *out_mb[],\n@@ -659,7 +708,9 @@ pdcp_pre_process_uplane_sn_12_dl_flags(const struct rte_pdcp_entity *entity,\n \tnb_cop = rte_crypto_op_bulk_alloc(en_priv->cop_pool, RTE_CRYPTO_OP_TYPE_SYMMETRIC, cop,\n \t\t\t\t\t num);\n \n+\tpdcp_read_lock(entity);\n \tconst uint32_t rx_deliv = en_priv->state.rx_deliv;\n+\tpdcp_read_unlock(entity);\n \n \tfor (i = 0; i < nb_cop; i++) {\n \t\tmb = in_mb[i];\n@@ -727,7 +778,9 @@ pdcp_pre_process_uplane_sn_18_dl_flags(const struct rte_pdcp_entity *entity,\n \tnb_cop = rte_crypto_op_bulk_alloc(en_priv->cop_pool, RTE_CRYPTO_OP_TYPE_SYMMETRIC, cop,\n \t\t\t\t\t num);\n \n+\tpdcp_read_lock(entity);\n \tconst uint32_t rx_deliv = en_priv->state.rx_deliv;\n+\tpdcp_read_unlock(entity);\n \n \tfor (i = 0; i < nb_cop; i++) {\n \t\tmb = in_mb[i];\n@@ -796,7 +849,9 @@ pdcp_pre_process_cplane_sn_12_dl(const struct rte_pdcp_entity *entity, struct rt\n \tnb_cop = rte_crypto_op_bulk_alloc(en_priv->cop_pool, RTE_CRYPTO_OP_TYPE_SYMMETRIC, cop,\n \t\t\t\t\t num);\n \n+\tpdcp_read_lock(entity);\n \tconst uint32_t rx_deliv = en_priv->state.rx_deliv;\n+\tpdcp_read_unlock(entity);\n \n \tfor (i = 0; i < nb_cop; i++) {\n \t\tmb = in_mb[i];\n@@ -938,6 +993,8 @@ pdcp_post_process_uplane_dl_flags(const struct rte_pdcp_entity *entity, struct r\n \tstruct rte_mbuf *mb;\n \tuint32_t count;\n \n+\tpdcp_write_lock(entity);\n+\n \tfor (i = 0; i < num; i++) {\n \t\tmb = in_mb[i];\n \t\tif (unlikely(mb->ol_flags & RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED))\n@@ -958,6 +1015,8 @@ pdcp_post_process_uplane_dl_flags(const struct rte_pdcp_entity *entity, struct r\n \t\terr_mb[nb_err++] = mb;\n \t}\n \n+\tpdcp_write_unlock(entity);\n+\n \tif (unlikely(nb_err != 0))\n \t\trte_memcpy(&out_mb[nb_success], err_mb, nb_err * sizeof(struct rte_mbuf *));\n \n@@ -991,6 +1050,8 @@ pdcp_post_process_cplane_sn_12_dl(const struct rte_pdcp_entity *entity,\n \tstruct rte_mbuf *mb;\n \tuint32_t count;\n \n+\tpdcp_write_lock(entity);\n+\n \tfor (i = 0; i < num; i++) {\n \t\tmb = in_mb[i];\n \t\tif (unlikely(mb->ol_flags & RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED))\n@@ -1011,6 +1072,8 @@ pdcp_post_process_cplane_sn_12_dl(const struct rte_pdcp_entity *entity,\n \t\terr_mb[nb_err++] = mb;\n \t}\n \n+\tpdcp_write_unlock(entity);\n+\n \tif (unlikely(nb_err != 0))\n \t\trte_memcpy(&out_mb[nb_success], err_mb, nb_err * sizeof(struct rte_mbuf *));\n \n@@ -1029,7 +1092,10 @@ pdcp_pre_post_func_set(struct rte_pdcp_entity *entity, const struct rte_pdcp_ent\n \tif ((conf->pdcp_xfrm.domain == RTE_SECURITY_PDCP_MODE_CONTROL) &&\n \t (conf->pdcp_xfrm.sn_size == RTE_SECURITY_PDCP_SN_SIZE_12) &&\n \t (conf->pdcp_xfrm.pkt_dir == RTE_SECURITY_PDCP_UPLINK)) {\n-\t\tentity->pre_process = pdcp_pre_process_cplane_sn_12_ul;\n+\t\tif (conf->enable_thread_safety)\n+\t\t\tentity->pre_process = pdcp_pre_process_cplane_sn_12_ul_mt;\n+\t\telse\n+\t\t\tentity->pre_process = pdcp_pre_process_cplane_sn_12_ul_st;\n \t\tentity->post_process = pdcp_post_process_ul;\n \t}\n \n@@ -1043,14 +1109,20 @@ pdcp_pre_post_func_set(struct rte_pdcp_entity *entity, const struct rte_pdcp_ent\n \tif ((conf->pdcp_xfrm.domain == RTE_SECURITY_PDCP_MODE_DATA) &&\n \t (conf->pdcp_xfrm.sn_size == RTE_SECURITY_PDCP_SN_SIZE_12) &&\n \t (conf->pdcp_xfrm.pkt_dir == RTE_SECURITY_PDCP_UPLINK)) {\n-\t\tentity->pre_process = pdcp_pre_process_uplane_sn_12_ul;\n+\t\tif (conf->enable_thread_safety)\n+\t\t\tentity->pre_process = pdcp_pre_process_uplane_sn_12_ul_mt;\n+\t\telse\n+\t\t\tentity->pre_process = pdcp_pre_process_uplane_sn_12_ul_st;\n \t\tentity->post_process = pdcp_post_process_ul;\n \t}\n \n \tif ((conf->pdcp_xfrm.domain == RTE_SECURITY_PDCP_MODE_DATA) &&\n \t (conf->pdcp_xfrm.sn_size == RTE_SECURITY_PDCP_SN_SIZE_18) &&\n \t (conf->pdcp_xfrm.pkt_dir == RTE_SECURITY_PDCP_UPLINK)) {\n-\t\tentity->pre_process = pdcp_pre_process_uplane_sn_18_ul;\n+\t\tif (conf->enable_thread_safety)\n+\t\t\tentity->pre_process = pdcp_pre_process_uplane_sn_18_ul_mt;\n+\t\telse\n+\t\t\tentity->pre_process = pdcp_pre_process_uplane_sn_18_ul_st;\n \t\tentity->post_process = pdcp_post_process_ul;\n \t}\n \n@@ -1174,6 +1246,13 @@ pdcp_entity_priv_populate(struct entity_priv *en_priv, const struct rte_pdcp_ent\n \t */\n \ten_priv->flags.is_out_of_order_delivery = conf->out_of_order_delivery;\n \n+\t/**\n+\t * flags.enable_thread_safety\n+\t *\n+\t * Indicate whether the thread safety is enabled for PDCP entity.\n+\t */\n+\ten_priv->flags.is_thread_safety_enabled = conf->enable_thread_safety;\n+\n \t/**\n \t * hdr_sz\n \t *\ndiff --git a/lib/pdcp/rte_pdcp.c b/lib/pdcp/rte_pdcp.c\nindex 1c6d2466b2..7431345d3f 100644\n--- a/lib/pdcp/rte_pdcp.c\n+++ b/lib/pdcp/rte_pdcp.c\n@@ -92,6 +92,8 @@ pdcp_dl_establish(struct rte_pdcp_entity *entity, const struct rte_pdcp_entity_c\n \tif (ret)\n \t\treturn ret;\n \n+\tpdcp_lock_init(entity);\n+\n \treturn 0;\n }\n \n@@ -237,8 +239,11 @@ rte_pdcp_entity_suspend(struct rte_pdcp_entity *pdcp_entity,\n \t\tnb_out = pdcp_reorder_up_to_get(&dl->reorder, out_mb, pdcp_entity->max_pkt_cache,\n \t\t\t\ten_priv->state.rx_next);\n \t\tpdcp_reorder_stop(&dl->reorder);\n+\n+\t\tpdcp_write_lock(pdcp_entity);\n \t\ten_priv->state.rx_next = 0;\n \t\ten_priv->state.rx_deliv = 0;\n+\t\tpdcp_write_unlock(pdcp_entity);\n \t}\n \n \treturn nb_out;\n@@ -299,6 +304,8 @@ rte_pdcp_t_reordering_expiry_handle(const struct rte_pdcp_entity *entity, struct\n \t * performing header decompression, if not decompressed before:\n \t */\n \n+\tpdcp_write_lock(entity);\n+\n \t/* - all stored PDCP SDU(s) with associated COUNT value(s) < RX_REORD; */\n \tnb_out = pdcp_reorder_up_to_get(&dl->reorder, out_mb, capacity, en_priv->state.rx_reord);\n \tcapacity -= nb_out;\n@@ -330,5 +337,7 @@ rte_pdcp_t_reordering_expiry_handle(const struct rte_pdcp_entity *entity, struct\n \t\tdl->t_reorder.state = TIMER_EXPIRED;\n \t}\n \n+\tpdcp_write_unlock(entity);\n+\n \treturn nb_out;\n }\ndiff --git a/lib/pdcp/rte_pdcp.h b/lib/pdcp/rte_pdcp.h\nindex b926b0df29..88700e3737 100644\n--- a/lib/pdcp/rte_pdcp.h\n+++ b/lib/pdcp/rte_pdcp.h\n@@ -141,6 +141,8 @@ struct rte_pdcp_entity_conf {\n \tbool is_slrb;\n \t/** Enable security offload on the device specified. */\n \tbool en_sec_offload;\n+\t/** Enable usage of synchronization primitives for entity. */\n+\tbool enable_thread_safety;\n \t/** Device on which security/crypto session need to be created. */\n \tuint8_t dev_id;\n \t/**\n", "prefixes": [ "v4", "21/22" ] }