From patchwork Fri Aug 11 11:45:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anoob Joseph X-Patchwork-Id: 130159 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id EF6F342FBE; Fri, 11 Aug 2023 13:45:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CBA5D40F16; Fri, 11 Aug 2023 13:45:19 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 96DFD40E03 for ; Fri, 11 Aug 2023 13:45:18 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37BBSTVC001539; Fri, 11 Aug 2023 04:45:17 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=1LMkf37dmWrevq/T5YLUvkGNNPBNk/0IiwqN6qIA4ys=; b=cDAs3CkK5/ksWvEgjT4NVpVCMDMEoZGXUwn2UR8yg6mCoCuCQS7KUnhN1H+qIGNHltTx Az1m8Xhs4R/sh1DZ0PvgxRikX9rG9TArPjR6e8STxpf0XfUy8hIZC8/z7YGbhgMSUi7J puXMvgyyPtnfahm1sanHhVCSbNgyRNfvesJPZeChzF86v+vSWRwxKkxUFkJotEmmQtPK hYCRFQgMFFh+b9KDvE7jS7gBe+DN8XI8BHUHzzx6WA1dJGB8AGyIAfvbadLq0QyFZXqD iXPrZeRcnVOfIzF5yItTIigTT6rkDjrGrWM1pAWfzX0mUTLEMT0Vi05xneIjiVbd1+aM Kw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3sd8ypa7ms-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 11 Aug 2023 04:45:17 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Fri, 11 Aug 2023 04:45:15 -0700 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.48 via Frontend Transport; Fri, 11 Aug 2023 04:45:15 -0700 Received: from BG-LT92004.corp.innovium.com (unknown [10.28.163.189]) by maili.marvell.com (Postfix) with ESMTP id 0F6633F705D; Fri, 11 Aug 2023 04:45:11 -0700 (PDT) From: Anoob Joseph To: Akhil Goyal , Jerin Jacob , Konstantin Ananyev CC: Hemant Agrawal , , "Vidya Sagar Velumuri" , , , , Ciara Power Subject: [RFC PATCH 1/2] security: add fallback security processing and Rx inject Date: Fri, 11 Aug 2023 17:15:08 +0530 Message-ID: <20230811114510.576-1-anoobj@marvell.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: IGLkxuifE38CwHJq4EGpxfAXlkPdLJ5D X-Proofpoint-GUID: IGLkxuifE38CwHJq4EGpxfAXlkPdLJ5D X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-11_03,2023-08-10_01,2023-05-22_02 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add alternate datapath API for security processing which would do Rx injection (similar to loopback) after successful security processing. With inline protocol offload, variable part of the session context (AR windows, lifetime etc in case of IPsec), is not accessible to the application. If packets are not getting processed in the inline path due to non security reasons (such as outer fragmentation or rte_flow packet steering limitations), then the packet cannot be security processed as the session context is private to the PMD and security library doesn't provide alternate APIs to make use of the same session. Introduce new API and Rx injection as fallback mechanism to security processing failures due to non-security reasons. For example, when there is outer fragmentation and PMD doesn't support reassembly of outer fragments, application would receive fragments which it can then reassemble. Post successful reassembly, packet can be submitted for security processing and Rx inject. The packets can be then received in the application as normal inline protocol processed packets. Same API can be leveraged in lookaside protocol offload mode to inject packet to Rx. This would help in using rte_flow based packet parsing after security processing. For example, with IPsec, this will help in flow splitting after IPsec processing is done. In both inline protocol capable ethdevs and lookaside protocol capable cryptodevs, the packet would be received back in eth port & queue based on rte_flow rules and packet parsing after security processing. The API would behave like a loopback but with the additional security processing. Signed-off-by: Anoob Joseph Signed-off-by: Vidya Sagar Velumuri --- doc/guides/cryptodevs/features/default.ini | 1 + doc/guides/nics/features.rst | 18 +++++ doc/guides/nics/features/default.ini | 1 + lib/cryptodev/rte_cryptodev.h | 2 + lib/ethdev/rte_ethdev.c | 1 + lib/ethdev/rte_ethdev.h | 2 + lib/security/rte_security.h | 87 ++++++++++++++++++++++ lib/security/version.map | 1 + 8 files changed, 113 insertions(+) diff --git a/doc/guides/cryptodevs/features/default.ini b/doc/guides/cryptodevs/features/default.ini index 6f637fa7e2..f411d4bab7 100644 --- a/doc/guides/cryptodevs/features/default.ini +++ b/doc/guides/cryptodevs/features/default.ini @@ -34,6 +34,7 @@ Sym raw data path API = Cipher multiple data units = Cipher wrapped key = Inner checksum = +Rx inject = ; ; Supported crypto algorithms of a default crypto driver. diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index 1a1dc16c1e..48e3184ad8 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -443,6 +443,24 @@ protocol operations. See security library and PMD documentation for more details * **[provides] rte_security_ops, capabilities_get**: ``action: RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL`` +.. _nic_features_rx_inject_doc: + +Rx inject +--------- + +Supports Rx inject to handle packets that failed inline protocol offload +processing but need to be handled with same security session. The NIC is +capable of processing the packet same way as regular inline protocol processed +packets and would be received on ethdev queue based on rte_flow rules +configured. + +* **[uses] rte_eth_rxconf,rte_eth_rxmode**: ``offloads:RTE_ETH_RX_OFFLOAD_SEC_RX_INJECT``, +* **[uses] mbuf**: ``mbuf.l2_len``. +* **[implements] rte_security_ctx**: ``inb_pkt_rx_inject``. +* **[provides] rte_eth_dev_info**: ``rx_offload_capa,rx_queue_offload_capa:RTE_ETH_RX_OFFLOAD_SEC_RX_INJECT``. +* **[related] API**: ``rte_security_inb_pkt_rx_inject``. + + .. _nic_features_crc_offload: CRC offload diff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini index 2011e97127..0a1f8dc54b 100644 --- a/doc/guides/nics/features/default.ini +++ b/doc/guides/nics/features/default.ini @@ -44,6 +44,7 @@ Rate limitation = Congestion management = Inline crypto = Inline protocol = +Rx inject = CRC offload = VLAN offload = QinQ offload = diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h index ba730373fb..c3306b12b4 100644 --- a/lib/cryptodev/rte_cryptodev.h +++ b/lib/cryptodev/rte_cryptodev.h @@ -536,6 +536,8 @@ rte_cryptodev_asym_get_xform_string(enum rte_crypto_asym_xform_type xform_enum); /**< Support wrapped key in cipher xform */ #define RTE_CRYPTODEV_FF_SECURITY_INNER_CSUM (1ULL << 27) /**< Support inner checksum computation/verification */ +#define RTE_CRYPTODEV_FF_SECURITY_RX_INJECT (1ULL << 28) +/**< Support Rx injection after security processing */ /** * Get the name of a crypto device feature flag diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 0840d2b594..ae1c7619d1 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -106,6 +106,7 @@ static const struct { RTE_RX_OFFLOAD_BIT2STR(OUTER_UDP_CKSUM), RTE_RX_OFFLOAD_BIT2STR(RSS_HASH), RTE_RX_OFFLOAD_BIT2STR(BUFFER_SPLIT), + RTE_RX_OFFLOAD_BIT2STR(SEC_RX_INJECT), }; #undef RTE_RX_OFFLOAD_BIT2STR diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 04a2564f22..7054323c86 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -1517,6 +1517,8 @@ struct rte_eth_conf { #define RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM RTE_BIT64(18) #define RTE_ETH_RX_OFFLOAD_RSS_HASH RTE_BIT64(19) #define RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT RTE_BIT64(20) +#define RTE_ETH_RX_OFFLOAD_SEC_RX_INJECT RTE_BIT64(21) +#define DEV_RX_OFFLOAD_SEC_RX_INJECT RTE_ETH_RX_OFFLOAD_SEC_RX_INJECT #define RTE_ETH_RX_OFFLOAD_CHECKSUM (RTE_ETH_RX_OFFLOAD_IPV4_CKSUM | \ RTE_ETH_RX_OFFLOAD_UDP_CKSUM | \ diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h index 3b2df526ba..9c1b89cc3a 100644 --- a/lib/security/rte_security.h +++ b/lib/security/rte_security.h @@ -55,6 +55,31 @@ enum rte_security_ipsec_tunnel_type { */ #define RTE_SECURITY_IPSEC_TUNNEL_VERIFY_DST_ADDR 0x1 #define RTE_SECURITY_IPSEC_TUNNEL_VERIFY_SRC_DST_ADDR 0x2 +extern struct rte_security_session **sess; + +/** + * Perform security processing of the packet and do an Rx inject after the + * packet is processed. + * + * Rx inject would behave similarly to ethdev loopback but with the additional + * security processing. + * + * @param device Crypto/eth device pointer + * @param pkts The address of an array of *nb_pkts* pointers to + * *rte_mbuf* structures which contain the packets. + * @param sess The address of an array of *nb_pkts* pointers to + * *rte_security_session* structures corresponding + * to each packet. + * @param nb_pkts The maximum number of packets to process. + * + * @return + * The number of packets successfully injected to ethdev Rx. The return + * value can be less than the value of the *nb_pkts* parameter when the + * PMD internal queues have been filled up. + */ +typedef uint16_t (*security_inb_pkt_rx_inject)(void *device, + struct rte_mbuf **pkts, struct rte_security_session **sess, + uint16_t nb_pkts); /** * Security context for crypto/eth devices @@ -78,6 +103,8 @@ struct rte_security_ctx { /**< Number of MACsec SA attached to this context */ uint32_t flags; /**< Flags for security context */ + security_inb_pkt_rx_inject inb_pkt_rx_inject; + /**< Perform security processing and do Rx inject */ }; #define RTE_SEC_CTX_F_FAST_SET_MDATA 0x00000001 @@ -969,6 +996,66 @@ rte_security_attach_session(struct rte_crypto_op *op, return __rte_security_attach_session(op->sym, sess); } +/** + * Perform security processing of packets and do Rx inject after processing. + * + * Rx inject would behave similarly to ethdev loopback but with the additional + * security processing. In case of ethdev loopback, application would be + * submitting packets to ethdev Tx queues and would be received as is from + * ethdev Rx queues. With Rx inject, packets would be received after security + * processing from ethdev Rx queues. + * + * With inline protocol offload capable ethdevs, Rx injection can be used to + * handle packets which failed the regular security Rx path. This can be due to + * cases such as outer fragmentation, in which case applications can reassemble + * the fragments and then subsequently submit for inbound processing and Rx + * injection, so that packets are received as regular security processed + * packets. + * + * With lookaside protocol offload capable cryptodevs, Rx injection can be used + * to perform packet parsing after security processing. This would allow for + * re-classification after security protocol processing is done. The ethdev port + * on which the packet would be received would be based on rte_flow rules + * matching the packet after security processing. Also, since the packet would + * be identical to an inline protocol processed packet, eth devices should have + * security enabled (`RTE_ETHDEV_RX_SECURITY_F`). + * + * Since the packet would be received back from ethdev Rx queues, it is expected + * that application retains/adds L2 header with the mbuf field 'l2_len' + * reflecting the size of L2 header in the packet. + * + * If `hash.fdir.h` field is set in mbuf, it would be treated as the value for + * `MARK` pattern for the subsequent rte_flow parsing. + * + * @param ctx Security ctx + * @param pkts The address of an array of *nb_pkts* pointers to + * *rte_mbuf* structures which contain the packets. + * @param sess The address of an array of *nb_pkts* pointers to + * *rte_security_session* structures corresponding + * to each packet. + * @param nb_pkts The maximum number of packets to process. + * + * @return + * The number of packets successfully injected to ethdev Rx. The return + * value can be less than the value of the *nb_pkts* parameter when the + * PMD internal queues have been filled up. + */ +__rte_experimental +static inline uint16_t +rte_security_inb_pkt_rx_inject(struct rte_security_ctx *ctx, + struct rte_mbuf **pkts, + struct rte_security_session **sess, + uint16_t nb_pkts) +{ +#ifdef RTE_DEBUG + RTE_PTR_OR_ERR_RET(ctx, 0); + RTE_PTR_OR_ERR_RET(ctx->ops, 0); + RTE_FUNC_PTR_OR_ERR_RET(ctx->inb_pkt_rx_inject, 0); +#endif + return ctx->inb_pkt_rx_inject(ctx->device, pkts, sess, nb_pkts); +} + + struct rte_security_macsec_secy_stats { uint64_t ctl_pkt_bcast_cnt; uint64_t ctl_pkt_mcast_cnt; diff --git a/lib/security/version.map b/lib/security/version.map index b2097a969d..99d43dbeef 100644 --- a/lib/security/version.map +++ b/lib/security/version.map @@ -15,6 +15,7 @@ EXPERIMENTAL { __rte_security_set_pkt_metadata; rte_security_dynfield_offset; + rte_security_inb_pkt_rx_inject; rte_security_macsec_sa_create; rte_security_macsec_sa_destroy; rte_security_macsec_sa_stats_get; From patchwork Fri Aug 11 11:45:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anoob Joseph X-Patchwork-Id: 130160 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id A53C942FBE; Fri, 11 Aug 2023 13:45:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C73342D3F; Fri, 11 Aug 2023 13:45:25 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 55A0D43247 for ; Fri, 11 Aug 2023 13:45:23 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37AMk3rA002130; Fri, 11 Aug 2023 04:45:22 -0700 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=a0GyMF1NMUvFEhj4X+yTGhteXoVP3i8za4t1WKYbbDI=; b=YcGll3AMJJIoQPYg6vbFY6yssEF18AaelFG0thf9pNIGaj0PRLCg247LTuqlihMkxfay RBhjUqT5+9clP2iWe38YvBgtFVYBDgBkF3+A6AoePM92V0x6wpxsbj97ri06bInn6TFI Bdp+rKCZPDt7zZWeFauMWw0crNGxj6jrS4vd5qpz6M3zp5dtDL8rrLpcmoo/CYG2nCK7 /V4lsPQ3DUEO46Ox+KSqUrmIKE/HyU1tEi/pzvnBdhDqhVbEQUZK9B0KX7tBxHGLkEvt zUY2BbYgEksf1A9IuVyZTews7EBN7mTH35zWxq9f8hjyaUQqpU+4RyFUQMM+Mr102JI/ 1w== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3sd8ypa7n1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 11 Aug 2023 04:45:22 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Fri, 11 Aug 2023 04:45:20 -0700 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.48 via Frontend Transport; Fri, 11 Aug 2023 04:45:20 -0700 Received: from BG-LT92004.corp.innovium.com (unknown [10.28.163.189]) by maili.marvell.com (Postfix) with ESMTP id 41D9C5B693E; Fri, 11 Aug 2023 04:45:15 -0700 (PDT) From: Anoob Joseph To: Akhil Goyal , Jerin Jacob , Konstantin Ananyev CC: Vidya Sagar Velumuri , Hemant Agrawal , , , , , Ciara Power Subject: [RFC PATCH 2/2] test/cryptodev: add Rx inject test Date: Fri, 11 Aug 2023 17:15:09 +0530 Message-ID: <20230811114510.576-2-anoobj@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230811114510.576-1-anoobj@marvell.com> References: <20230811114510.576-1-anoobj@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: FPKCo7bsFrrLgPmmKcsgIuhbf3VKmGEd X-Proofpoint-GUID: FPKCo7bsFrrLgPmmKcsgIuhbf3VKmGEd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-11_03,2023-08-10_01,2023-05-22_02 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Vidya Sagar Velumuri Add test to verify Rx inject. Signed-off-by: Anoob Joseph Signed-off-by: Vidya Sagar Velumuri --- app/test/test_cryptodev.c | 326 +++++++++++++++++++---- app/test/test_cryptodev_security_ipsec.h | 1 + 2 files changed, 274 insertions(+), 53 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index fb2af40b99..b74bbb1348 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -1426,6 +1427,81 @@ ut_setup_security(void) return dev_configure_and_start(0); } +static int +ut_setup_security_rx_inject(void) +{ + struct rte_mempool *mbuf_pool = rte_mempool_lookup("CRYPTO_MBUFPOOL"); + struct crypto_testsuite_params *ts_params = &testsuite_params; + struct rte_eth_conf port_conf = { + .rxmode = { + .offloads = RTE_ETH_RX_OFFLOAD_CHECKSUM | + RTE_ETH_RX_OFFLOAD_SECURITY, + }, + .txmode = { + .offloads = RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE, + }, + .lpbk_mode = 1, /* Enable loopback */ + }; + struct rte_cryptodev_info dev_info; + struct rte_eth_rxconf rx_conf = { + .rx_thresh = { + .pthresh = 8, + .hthresh = 8, + .wthresh = 8, + }, + .rx_free_thresh = 32, + }; + uint16_t nb_ports; + int ret; + + rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info); + if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SECURITY_RX_INJECT)) { + RTE_LOG(INFO, USER1, "Feature requirements for IPsec Rx inject test case not met\n" + ); + return TEST_SKIPPED; + } + + nb_ports = rte_eth_dev_count_avail(); + if (nb_ports == 0) + return TEST_SKIPPED; + + ret = rte_eth_dev_configure(0 /* port_id */, + 1 /* nb_rx_queue */, + 0 /* nb_tx_queue */, + &port_conf); + if (ret) { + printf("Could not configure ethdev port 0 [err=%d]\n", ret); + return TEST_SKIPPED; + } + + /* Rx queue setup */ + ret = rte_eth_rx_queue_setup(0 /* port_id */, + 0 /* rx_queue_id */, + 1024 /* nb_rx_desc */, + SOCKET_ID_ANY, + &rx_conf, + mbuf_pool); + if (ret) { + printf("Could not setup eth port 0 queue 0\n"); + return TEST_SKIPPED; + } + + ret = rte_eth_dev_start(0); + if (ret) { + printf("Could not start ethdev"); + return TEST_SKIPPED; + } + + ret = rte_eth_promiscuous_enable(0); + if (ret) { + printf("Could not enable promiscuous mode"); + return TEST_SKIPPED; + } + + /* Configure and start cryptodev with no features disabled */ + return dev_configure_and_start(0); +} + void ut_teardown(void) { @@ -1478,6 +1554,21 @@ ut_teardown(void) rte_cryptodev_stop(ts_params->valid_devs[0]); } +static void +ut_teardown_rx_inject(void) +{ + int ret; + + if (rte_eth_dev_count_avail() != 0) { + ret = rte_eth_dev_reset(0); + if (ret) + printf("Could not reset eth port 0"); + + } + + ut_teardown(); +} + static int test_device_configure_invalid_dev_id(void) { @@ -9748,6 +9839,145 @@ test_PDCP_SDAP_PROTO_decap_all(void) return (all_err == TEST_SUCCESS) ? TEST_SUCCESS : TEST_FAILED; } +static int +test_ipsec_proto_crypto_op_enq(struct crypto_testsuite_params *ts_params, + struct crypto_unittest_params *ut_params, + struct rte_security_ipsec_xform *ipsec_xform, + const struct ipsec_test_data *td, + const struct ipsec_test_flags *flags, + int pkt_num) +{ + uint8_t dev_id = ts_params->valid_devs[0]; + enum rte_security_ipsec_sa_direction dir; + int ret; + + dir = ipsec_xform->direction; + + /* Generate crypto op data structure */ + ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool, + RTE_CRYPTO_OP_TYPE_SYMMETRIC); + if (!ut_params->op) { + printf("Could not allocate crypto op"); + return TEST_FAILED; + } + + /* Attach session to operation */ + rte_security_attach_session(ut_params->op, ut_params->sec_session); + + /* Set crypto operation mbufs */ + ut_params->op->sym->m_src = ut_params->ibuf; + ut_params->op->sym->m_dst = NULL; + + /* Copy IV in crypto operation when IV generation is disabled */ + if (dir == RTE_SECURITY_IPSEC_SA_DIR_EGRESS && + ipsec_xform->options.iv_gen_disable == 1) { + uint8_t *iv = rte_crypto_op_ctod_offset(ut_params->op, + uint8_t *, + IV_OFFSET); + int len; + + if (td->aead) + len = td->xform.aead.aead.iv.length; + else if (td->aes_gmac) + len = td->xform.chain.auth.auth.iv.length; + else + len = td->xform.chain.cipher.cipher.iv.length; + + memcpy(iv, td->iv.data, len); + } + + /* Process crypto operation */ + process_crypto_request(dev_id, ut_params->op); + + ret = test_ipsec_status_check(td, ut_params->op, flags, dir, pkt_num); + + rte_crypto_op_free(ut_params->op); + ut_params->op = NULL; + + return ret; +} + +static int +test_ipsec_proto_mbuf_enq(struct crypto_testsuite_params *ts_params, + struct crypto_unittest_params *ut_params, + struct rte_security_ctx *ctx) +{ + struct rte_security_session **sec_sess; + struct rte_security_ctx *eth_sec_ctx; + struct rte_ether_hdr *hdr; + struct rte_mbuf *m; + uint64_t timeout; + void *userdata; + int ret; + + RTE_SET_USED(ts_params); + + hdr = (void *)rte_pktmbuf_prepend(ut_params->ibuf, sizeof(struct rte_ether_hdr)); + hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); + + ut_params->ibuf->l2_len = sizeof(struct rte_ether_hdr); + + sec_sess = (struct rte_security_session **)&ut_params->sec_session; + ret = rte_security_inb_pkt_rx_inject(ctx, &ut_params->ibuf, sec_sess, 1); + + if (ret != 1) + return TEST_FAILED; + + ut_params->ibuf = NULL; + + /* Add a timeout for 1 s */ + timeout = rte_get_tsc_cycles() + rte_get_tsc_hz(); + + do { + /* Get packet from port 0, queue 0 */ + ret = rte_eth_rx_burst(0, 0, &m, 1); + } while ((ret == 0) && (rte_get_tsc_cycles() > timeout)); + + if (ret == 0) { + printf("Could not receive packets from ethdev\n"); + return TEST_FAILED; + } + + if (m == NULL) { + printf("Received mbuf is NULL\n"); + return TEST_FAILED; + } + + ut_params->ibuf = m; + + if (!(m->ol_flags & RTE_MBUF_F_RX_SEC_OFFLOAD)) { + printf("Received packet is not Rx security processed\n"); + return TEST_FAILED; + } + + if (m->ol_flags & RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED) { + printf("Received packet has failed Rx security processing\n"); + return TEST_FAILED; + } + + eth_sec_ctx = rte_eth_dev_get_sec_ctx(0); + if (eth_sec_ctx == NULL) { + printf("Could not fetch ethdev sec ctx\n"); + return TEST_FAILED; + } + + /* + * 'ut_params' is set as userdata. Verify that the field is returned + * correctly. + */ + + userdata = rte_security_dynfield(m); + if (userdata != ut_params) { + printf("Userdata retrieved not matching expected\n"); + return TEST_FAILED; + } + + /* Trim L2 header */ + rte_pktmbuf_adj(m, sizeof(struct rte_ether_hdr)); + + return TEST_SUCCESS; +} + static int test_ipsec_proto_process(const struct ipsec_test_data td[], struct ipsec_test_data res_d[], @@ -9937,6 +10167,9 @@ test_ipsec_proto_process(const struct ipsec_test_data td[], } } + if (dir == RTE_SECURITY_IPSEC_SA_DIR_INGRESS && flags->rx_inject) + sess_conf.userdata = ut_params; + /* Create security session */ ut_params->sec_session = rte_security_session_create(ctx, &sess_conf, ts_params->session_mpool); @@ -9959,58 +10192,29 @@ test_ipsec_proto_process(const struct ipsec_test_data td[], /* Copy test data before modification */ memcpy(input_text, td[i].input_text.data, td[i].input_text.len); - if (test_ipsec_pkt_update(input_text, flags)) - return TEST_FAILED; + if (test_ipsec_pkt_update(input_text, flags)) { + ret = TEST_FAILED; + goto mbuf_free; + } /* Setup source mbuf payload */ ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool, td[i].input_text.len, nb_segs, 0); pktmbuf_write(ut_params->ibuf, 0, td[i].input_text.len, input_text); - /* Generate crypto op data structure */ - ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool, - RTE_CRYPTO_OP_TYPE_SYMMETRIC); - if (!ut_params->op) { - printf("TestCase %s line %d: %s\n", - __func__, __LINE__, - "failed to allocate crypto op"); - ret = TEST_FAILED; - goto crypto_op_free; - } - - /* Attach session to operation */ - rte_security_attach_session(ut_params->op, - ut_params->sec_session); - - /* Set crypto operation mbufs */ - ut_params->op->sym->m_src = ut_params->ibuf; - ut_params->op->sym->m_dst = NULL; - - /* Copy IV in crypto operation when IV generation is disabled */ - if (dir == RTE_SECURITY_IPSEC_SA_DIR_EGRESS && - ipsec_xform.options.iv_gen_disable == 1) { - uint8_t *iv = rte_crypto_op_ctod_offset(ut_params->op, - uint8_t *, - IV_OFFSET); - int len; - - if (td[i].aead) - len = td[i].xform.aead.aead.iv.length; - else if (td[i].aes_gmac) - len = td[i].xform.chain.auth.auth.iv.length; - else - len = td[i].xform.chain.cipher.cipher.iv.length; - - memcpy(iv, td[i].iv.data, len); - } - - /* Process crypto operation */ - process_crypto_request(dev_id, ut_params->op); + if (dir == RTE_SECURITY_IPSEC_SA_DIR_INGRESS && + flags->rx_inject) + ret = test_ipsec_proto_mbuf_enq(ts_params, ut_params, + ctx); + else + ret = test_ipsec_proto_crypto_op_enq(ts_params, + ut_params, + &ipsec_xform, + &td[i], flags, + i + 1); - ret = test_ipsec_status_check(&td[i], ut_params->op, flags, dir, - i + 1); if (ret != TEST_SUCCESS) - goto crypto_op_free; + goto mbuf_free; if (res_d != NULL) res_d_tmp = &res_d[i]; @@ -10018,24 +10222,18 @@ test_ipsec_proto_process(const struct ipsec_test_data td[], ret = test_ipsec_post_process(ut_params->ibuf, &td[i], res_d_tmp, silent, flags); if (ret != TEST_SUCCESS) - goto crypto_op_free; + goto mbuf_free; ret = test_ipsec_stats_verify(ctx, ut_params->sec_session, flags, dir); if (ret != TEST_SUCCESS) - goto crypto_op_free; - - rte_crypto_op_free(ut_params->op); - ut_params->op = NULL; + goto mbuf_free; rte_pktmbuf_free(ut_params->ibuf); ut_params->ibuf = NULL; } -crypto_op_free: - rte_crypto_op_free(ut_params->op); - ut_params->op = NULL; - +mbuf_free: rte_pktmbuf_free(ut_params->ibuf); ut_params->ibuf = NULL; @@ -10100,6 +10298,24 @@ test_ipsec_proto_known_vec_fragmented(const void *test_data) return test_ipsec_proto_process(&td_outb, NULL, 1, false, &flags); } +static int +test_ipsec_proto_known_vec_inb_rx_inject(const void *test_data) +{ + const struct ipsec_test_data *td = test_data; + struct ipsec_test_flags flags; + struct ipsec_test_data td_inb; + + memset(&flags, 0, sizeof(flags)); + flags.rx_inject = true; + + if (td->ipsec_xform.direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS) + test_ipsec_td_in_from_out(td, &td_inb); + else + memcpy(&td_inb, td, sizeof(td_inb)); + + return test_ipsec_proto_process(&td_inb, NULL, 1, false, &flags); +} + static int test_ipsec_proto_all(const struct ipsec_test_flags *flags) { @@ -16133,6 +16349,10 @@ static struct unit_test_suite ipsec_proto_testsuite = { "Tunnel header IPv6 decrement inner hop limit", ut_setup_security, ut_teardown, test_ipsec_proto_ipv6_hop_limit_decrement), + TEST_CASE_NAMED_WITH_DATA( + "Inbound known vector (ESP tunnel mode IPv4 AES-GCM 128) Rx inject", + ut_setup_security_rx_inject, ut_teardown_rx_inject, + test_ipsec_proto_known_vec_inb_rx_inject, &pkt_aes_128_gcm), TEST_CASE_NAMED_ST( "Multi-segmented mode", ut_setup_security, ut_teardown, diff --git a/app/test/test_cryptodev_security_ipsec.h b/app/test/test_cryptodev_security_ipsec.h index 92e641ba0b..29fe0af6c6 100644 --- a/app/test/test_cryptodev_security_ipsec.h +++ b/app/test/test_cryptodev_security_ipsec.h @@ -110,6 +110,7 @@ struct ipsec_test_flags { bool ah; uint32_t plaintext_len; int nb_segs_in_mbuf; + bool rx_inject; }; struct crypto_param {