Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/85439/?format=api
{ "id": 85439, "url": "https://patches.dpdk.org/api/patches/85439/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20201218093702.3651867-32-jiawenwu@trustnetic.com/", "project": { "id": 1, "url": "https://patches.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": "<20201218093702.3651867-32-jiawenwu@trustnetic.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201218093702.3651867-32-jiawenwu@trustnetic.com", "date": "2020-12-18T09:37:00", "name": "[v3,31/33] net/txgbe: destroy security session", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "69393c706aa3b6b5f48cb324d04be23ed1566d5c", "submitter": { "id": 1932, "url": "https://patches.dpdk.org/api/people/1932/?format=api", "name": "Jiawen Wu", "email": "jiawenwu@trustnetic.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20201218093702.3651867-32-jiawenwu@trustnetic.com/mbox/", "series": [ { "id": 14363, "url": "https://patches.dpdk.org/api/series/14363/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14363", "date": "2020-12-18T09:36:30", "name": "net: add txgbe PMD part 2", "version": 3, "mbox": "https://patches.dpdk.org/series/14363/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/85439/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/85439/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 5A03EA09F6;\n\tFri, 18 Dec 2020 10:44:50 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id F1A91CD0C;\n\tFri, 18 Dec 2020 10:35:28 +0100 (CET)", "from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56])\n by dpdk.org (Postfix) with ESMTP id C16F3CC83\n for <dev@dpdk.org>; Fri, 18 Dec 2020 10:35:18 +0100 (CET)", "from localhost.localdomain.com (unknown [183.129.236.74])\n by esmtp10.qq.com (ESMTP) with\n id ; Fri, 18 Dec 2020 17:35:12 +0800 (CST)" ], "X-QQ-mid": "bizesmtp28t1608284113teusfc90", "X-QQ-SSF": "01400000002000C0D000B00A0000000", "X-QQ-FEAT": "yx8uyLBbwpzCBAAoAtfL6PAHIyq3fwS95JN+bq2cR+GMsWq48SDdsvxS7Gj3e\n QSIj4HVQZLF7rDa3lbk84CYxTgauMkWuaSBPQ8OGXPFend9ljpv7xz8yucIkeXNqndMwfbT\n b3MD3ZH8PFq2tsaJho4V1aCXzz8X0w1dJ5lIRSZ1Z/U7iHTUGr4LtSUDP8r1rREsY0a3etf\n sbP+9ceBl+c7odc8YcFaPak1kwwuKTaQ3YZ7N9aRjvjEtfJ3yHjmoXa83IWZZTbnREbFEHz\n Mh/iet09qHC47W95HQwC9uXgrCzoMrONYQBfMTwgJ+B/+v2UJZ1uZL1UQentOp1lY8zx/e4\n z0ITMTjtD7Fo9Z5HxZwMtjNN9kV7g==", "X-QQ-GoodBg": "2", "From": "Jiawen Wu <jiawenwu@trustnetic.com>", "To": "dev@dpdk.org", "Cc": "Jiawen Wu <jiawenwu@trustnetic.com>", "Date": "Fri, 18 Dec 2020 17:37:00 +0800", "Message-Id": "<20201218093702.3651867-32-jiawenwu@trustnetic.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20201218093702.3651867-1-jiawenwu@trustnetic.com>", "References": "<20201218093702.3651867-1-jiawenwu@trustnetic.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-QQ-SENDSIZE": "520", "Feedback-ID": "bizesmtp:trustnetic.com:qybgforeign:qybgforeign7", "X-QQ-Bgrelay": "1", "Subject": "[dpdk-dev] [PATCH v3 31/33] net/txgbe: destroy security session", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add support to clear a security session's private data,\nget the size of a security session,\nadd update the mbuf with provided metadata.\n\nSigned-off-by: Jiawen Wu <jiawenwu@trustnetic.com>\n---\n drivers/net/txgbe/txgbe_ipsec.c | 167 ++++++++++++++++++++++++++++++++\n drivers/net/txgbe/txgbe_ipsec.h | 15 +++\n 2 files changed, 182 insertions(+)", "diff": "diff --git a/drivers/net/txgbe/txgbe_ipsec.c b/drivers/net/txgbe/txgbe_ipsec.c\nindex 24dd09191..ebf23493e 100644\n--- a/drivers/net/txgbe/txgbe_ipsec.c\n+++ b/drivers/net/txgbe/txgbe_ipsec.c\n@@ -196,6 +196,106 @@ txgbe_crypto_add_sa(struct txgbe_crypto_session *ic_session)\n \treturn 0;\n }\n \n+static int\n+txgbe_crypto_remove_sa(struct rte_eth_dev *dev,\n+\t\t struct txgbe_crypto_session *ic_session)\n+{\n+\tstruct txgbe_hw *hw = TXGBE_DEV_HW(dev);\n+\tstruct txgbe_ipsec *priv = TXGBE_DEV_IPSEC(dev);\n+\tuint32_t reg_val;\n+\tint sa_index = -1;\n+\n+\tif (ic_session->op == TXGBE_OP_AUTHENTICATED_DECRYPTION) {\n+\t\tint i, ip_index = -1;\n+\n+\t\t/* Find a match in the IP table*/\n+\t\tfor (i = 0; i < IPSEC_MAX_RX_IP_COUNT; i++) {\n+\t\t\tif (CMP_IP(priv->rx_ip_tbl[i].ip, ic_session->dst_ip)) {\n+\t\t\t\tip_index = i;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\n+\t\t/* Fail if no match*/\n+\t\tif (ip_index < 0) {\n+\t\t\tPMD_DRV_LOG(ERR,\n+\t\t\t\t \"Entry not found in the Rx IP table\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\t/* Find a free entry in the SA table*/\n+\t\tfor (i = 0; i < IPSEC_MAX_SA_COUNT; i++) {\n+\t\t\tif (priv->rx_sa_tbl[i].spi ==\n+\t\t\t\t rte_cpu_to_be_32(ic_session->spi)) {\n+\t\t\t\tsa_index = i;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\t\t/* Fail if no match*/\n+\t\tif (sa_index < 0) {\n+\t\t\tPMD_DRV_LOG(ERR,\n+\t\t\t\t \"Entry not found in the Rx SA table\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\t/* Disable and clear Rx SPI and key table entryes*/\n+\t\treg_val = TXGBE_IPSRXIDX_WRITE |\n+\t\t\tTXGBE_IPSRXIDX_TB_SPI | (sa_index << 3);\n+\t\twr32(hw, TXGBE_IPSRXSPI, 0);\n+\t\twr32(hw, TXGBE_IPSRXADDRIDX, 0);\n+\t\twr32w(hw, TXGBE_IPSRXIDX, reg_val, TXGBE_IPSRXIDX_WRITE, 1000);\n+\t\treg_val = TXGBE_IPSRXIDX_WRITE |\n+\t\t\tTXGBE_IPSRXIDX_TB_KEY | (sa_index << 3);\n+\t\twr32(hw, TXGBE_IPSRXKEY(0), 0);\n+\t\twr32(hw, TXGBE_IPSRXKEY(1), 0);\n+\t\twr32(hw, TXGBE_IPSRXKEY(2), 0);\n+\t\twr32(hw, TXGBE_IPSRXKEY(3), 0);\n+\t\twr32(hw, TXGBE_IPSRXSALT, 0);\n+\t\twr32(hw, TXGBE_IPSRXMODE, 0);\n+\t\twr32w(hw, TXGBE_IPSRXIDX, reg_val, TXGBE_IPSRXIDX_WRITE, 1000);\n+\t\tpriv->rx_sa_tbl[sa_index].used = 0;\n+\n+\t\t/* If last used then clear the IP table entry*/\n+\t\tpriv->rx_ip_tbl[ip_index].ref_count--;\n+\t\tif (priv->rx_ip_tbl[ip_index].ref_count == 0) {\n+\t\t\treg_val = TXGBE_IPSRXIDX_WRITE | TXGBE_IPSRXIDX_TB_IP |\n+\t\t\t\t\t(ip_index << 3);\n+\t\t\twr32(hw, TXGBE_IPSRXADDR(0), 0);\n+\t\t\twr32(hw, TXGBE_IPSRXADDR(1), 0);\n+\t\t\twr32(hw, TXGBE_IPSRXADDR(2), 0);\n+\t\t\twr32(hw, TXGBE_IPSRXADDR(3), 0);\n+\t\t}\n+\t} else { /* session->dir == RTE_CRYPTO_OUTBOUND */\n+\t\tint i;\n+\n+\t\t/* Find a match in the SA table*/\n+\t\tfor (i = 0; i < IPSEC_MAX_SA_COUNT; i++) {\n+\t\t\tif (priv->tx_sa_tbl[i].spi ==\n+\t\t\t\t rte_cpu_to_be_32(ic_session->spi)) {\n+\t\t\t\tsa_index = i;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\t\t/* Fail if no match entries*/\n+\t\tif (sa_index < 0) {\n+\t\t\tPMD_DRV_LOG(ERR,\n+\t\t\t\t \"Entry not found in the Tx SA table\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\t\treg_val = TXGBE_IPSRXIDX_WRITE | (sa_index << 3);\n+\t\twr32(hw, TXGBE_IPSTXKEY(0), 0);\n+\t\twr32(hw, TXGBE_IPSTXKEY(1), 0);\n+\t\twr32(hw, TXGBE_IPSTXKEY(2), 0);\n+\t\twr32(hw, TXGBE_IPSTXKEY(3), 0);\n+\t\twr32(hw, TXGBE_IPSTXSALT, 0);\n+\t\twr32w(hw, TXGBE_IPSTXIDX, reg_val, TXGBE_IPSTXIDX_WRITE, 1000);\n+\n+\t\tpriv->tx_sa_tbl[sa_index].used = 0;\n+\t}\n+\n+\treturn 0;\n+}\n+\n static int\n txgbe_crypto_create_session(void *device,\n \t\tstruct rte_security_session_conf *conf,\n@@ -259,6 +359,70 @@ txgbe_crypto_create_session(void *device,\n \treturn 0;\n }\n \n+static unsigned int\n+txgbe_crypto_session_get_size(__rte_unused void *device)\n+{\n+\treturn sizeof(struct txgbe_crypto_session);\n+}\n+\n+static int\n+txgbe_crypto_remove_session(void *device,\n+\t\tstruct rte_security_session *session)\n+{\n+\tstruct rte_eth_dev *eth_dev = device;\n+\tstruct txgbe_crypto_session *ic_session =\n+\t\t(struct txgbe_crypto_session *)\n+\t\tget_sec_session_private_data(session);\n+\tstruct rte_mempool *mempool = rte_mempool_from_obj(ic_session);\n+\n+\tif (eth_dev != ic_session->dev) {\n+\t\tPMD_DRV_LOG(ERR, \"Session not bound to this device\\n\");\n+\t\treturn -ENODEV;\n+\t}\n+\n+\tif (txgbe_crypto_remove_sa(eth_dev, ic_session)) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to remove session\\n\");\n+\t\treturn -EFAULT;\n+\t}\n+\n+\trte_mempool_put(mempool, (void *)ic_session);\n+\n+\treturn 0;\n+}\n+\n+static inline uint8_t\n+txgbe_crypto_compute_pad_len(struct rte_mbuf *m)\n+{\n+\tif (m->nb_segs == 1) {\n+\t\t/* 16 bytes ICV + 2 bytes ESP trailer + payload padding size\n+\t\t * payload padding size is stored at <pkt_len - 18>\n+\t\t */\n+\t\tuint8_t *esp_pad_len = rte_pktmbuf_mtod_offset(m, uint8_t *,\n+\t\t\t\t\trte_pktmbuf_pkt_len(m) -\n+\t\t\t\t\t(ESP_TRAILER_SIZE + ESP_ICV_SIZE));\n+\t\treturn *esp_pad_len + ESP_TRAILER_SIZE + ESP_ICV_SIZE;\n+\t}\n+\treturn 0;\n+}\n+\n+static int\n+txgbe_crypto_update_mb(void *device __rte_unused,\n+\t\tstruct rte_security_session *session,\n+\t\t struct rte_mbuf *m, void *params __rte_unused)\n+{\n+\tstruct txgbe_crypto_session *ic_session =\n+\t\t\tget_sec_session_private_data(session);\n+\tif (ic_session->op == TXGBE_OP_AUTHENTICATED_ENCRYPTION) {\n+\t\tunion txgbe_crypto_tx_desc_md *mdata =\n+\t\t\t(union txgbe_crypto_tx_desc_md *)\n+\t\t\t\trte_security_dynfield(m);\n+\t\tmdata->enc = 1;\n+\t\tmdata->sa_idx = ic_session->sa_index;\n+\t\tmdata->pad_len = txgbe_crypto_compute_pad_len(m);\n+\t}\n+\treturn 0;\n+}\n+\n static const struct rte_security_capability *\n txgbe_crypto_capabilities_get(void *device __rte_unused)\n {\n@@ -387,6 +551,9 @@ txgbe_crypto_capabilities_get(void *device __rte_unused)\n \n static struct rte_security_ops txgbe_security_ops = {\n \t.session_create = txgbe_crypto_create_session,\n+\t.session_get_size = txgbe_crypto_session_get_size,\n+\t.session_destroy = txgbe_crypto_remove_session,\n+\t.set_pkt_metadata = txgbe_crypto_update_mb,\n \t.capabilities_get = txgbe_crypto_capabilities_get\n };\n \ndiff --git a/drivers/net/txgbe/txgbe_ipsec.h b/drivers/net/txgbe/txgbe_ipsec.h\nindex 2f0d813bc..9b88defbf 100644\n--- a/drivers/net/txgbe/txgbe_ipsec.h\n+++ b/drivers/net/txgbe/txgbe_ipsec.h\n@@ -17,6 +17,9 @@\n #define IPSEC_MAX_RX_IP_COUNT 128\n #define IPSEC_MAX_SA_COUNT 1024\n \n+#define ESP_ICV_SIZE 16\n+#define ESP_TRAILER_SIZE 2\n+\n enum txgbe_operation {\n \tTXGBE_OP_AUTHENTICATED_ENCRYPTION,\n \tTXGBE_OP_AUTHENTICATED_DECRYPTION\n@@ -68,6 +71,18 @@ struct txgbe_crypto_tx_sa_table {\n \tuint8_t used;\n };\n \n+union txgbe_crypto_tx_desc_md {\n+\tuint64_t data;\n+\tstruct {\n+\t\t/**< SA table index */\n+\t\tuint32_t sa_idx;\n+\t\t/**< ICV and ESP trailer length */\n+\t\tuint8_t pad_len;\n+\t\t/**< enable encryption */\n+\t\tuint8_t enc;\n+\t};\n+};\n+\n struct txgbe_ipsec {\n \tstruct txgbe_crypto_rx_ip_table rx_ip_tbl[IPSEC_MAX_RX_IP_COUNT];\n \tstruct txgbe_crypto_rx_sa_table rx_sa_tbl[IPSEC_MAX_SA_COUNT];\n", "prefixes": [ "v3", "31/33" ] }