Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/102075 _apply patch failure_ Submitter: Radu Nicolau Date: Monday, October 18 2021 14:58:24 Applied on: CommitID:9942ebb9c698a53b86e2bbd450f3e24238771fe5 Apply patch set 102075-102073 failed: Checking patch doc/guides/prog_guide/ipsec_lib.rst... error: while searching for: * NAT-T / UDP encapsulated ESP. * algorithms: 3DES-CBC, AES-CBC, AES-CTR, AES-GCM, AES_CCM, CHACHA20_POLY1305, AES_GMAC, HMAC-SHA1, NULL. error: patch failed: doc/guides/prog_guide/ipsec_lib.rst:315 Checking patch doc/guides/rel_notes/release_21_11.rst... error: while searching for: * Added support for NAT-T / UDP encapsulated ESP * Added support for SA telemetry. * Added support for setting a non default starting ESN value. Removed Items error: patch failed: doc/guides/rel_notes/release_21_11.rst:201 Checking patch lib/ipsec/esp_outb.c... Hunk #1 succeeded at 17 (offset -1 lines). Hunk #2 succeeded at 107 (offset -32 lines). Hunk #3 succeeded at 125 (offset -32 lines). Hunk #4 succeeded at 256 (offset -62 lines). Hunk #5 succeeded at 283 (offset -62 lines). Hunk #6 succeeded at 305 (offset -62 lines). Hunk #7 succeeded at 407 (offset -62 lines). Hunk #8 succeeded at 493 (offset -73 lines). error: while searching for: ss->sa->statistics.bytes += bytes; } /* * process group of ESP outbound tunnel packets destined for * INLINE_CRYPTO type of device. error: patch failed: lib/ipsec/esp_outb.c:668 Hunk #10 succeeded at 613 (offset -95 lines). Hunk #11 succeeded at 719 (offset -45 lines). Hunk #12 succeeded at 685 (offset -95 lines). Hunk #13 succeeded at 669 (offset -167 lines). Applying patch doc/guides/prog_guide/ipsec_lib.rst with 1 reject... Rejected hunk #1. Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject... Rejected hunk #1. Applying patch lib/ipsec/esp_outb.c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. Hunk #7 applied cleanly. Hunk #8 applied cleanly. Rejected hunk #9. Hunk #10 applied cleanly. Hunk #11 applied cleanly. Hunk #12 applied cleanly. Hunk #13 applied cleanly. diff a/doc/guides/prog_guide/ipsec_lib.rst b/doc/guides/prog_guide/ipsec_lib.rst (rejected hunks) @@ -315,6 +315,8 @@ Supported features * NAT-T / UDP encapsulated ESP. +* TSO support (only for inline crypto mode) + * algorithms: 3DES-CBC, AES-CBC, AES-CTR, AES-GCM, AES_CCM, CHACHA20_POLY1305, AES_GMAC, HMAC-SHA1, NULL. diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst (rejected hunks) @@ -201,6 +201,7 @@ New Features * Added support for NAT-T / UDP encapsulated ESP * Added support for SA telemetry. * Added support for setting a non default starting ESN value. + * Added support TSO offload support; only supported for inline crypto mode. Removed Items diff a/lib/ipsec/esp_outb.c b/lib/ipsec/esp_outb.c (rejected hunks) @@ -668,6 +685,20 @@ inline_outb_mbuf_prepare(const struct rte_ipsec_session *ss, ss->sa->statistics.bytes += bytes; } + +static inline int +esn_outb_nb_segments(struct rte_mbuf *m) +{ + if (m->ol_flags & (PKT_TX_TCP_SEG | PKT_TX_UDP_SEG)) { + uint16_t pkt_l3len = m->pkt_len - m->l2_len; + uint16_t segments = + (m->tso_segsz > 0 && pkt_l3len > m->tso_segsz) ? + (pkt_l3len + m->tso_segsz - 1) / m->tso_segsz : 1; + return segments; + } + return 1; /* no TSO */ +} + /* * process group of ESP outbound tunnel packets destined for * INLINE_CRYPTO type of device. Checking patch doc/guides/rel_notes/release_21_11.rst... error: while searching for: * Added support for setting a non default starting ESN value. * Added support TSO offload support; only supported for inline crypto mode. Removed Items ------------- error: patch failed: doc/guides/rel_notes/release_21_11.rst:203 Checking patch doc/guides/sample_app_ug/ipsec_secgw.rst... error: while searching for: * *esn N* N is the initial ESN value Example SA rules: .. code-block:: console error: patch failed: doc/guides/sample_app_ug/ipsec_secgw.rst:748 Checking patch examples/ipsec-secgw/ipsec-secgw.c... Checking patch examples/ipsec-secgw/ipsec.h... error: while searching for: enum rte_security_ipsec_sa_direction direction; uint8_t udp_encap; uint16_t portid; uint64_t esn; uint8_t fdir_qid; uint8_t fdir_flag; error: patch failed: examples/ipsec-secgw/ipsec.h:142 Checking patch examples/ipsec-secgw/ipsec_process.c... Checking patch examples/ipsec-secgw/sa.c... Hunk #1 succeeded at 677 (offset -101 lines). Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject... Rejected hunk #1. Applying patch doc/guides/sample_app_ug/ipsec_secgw.rst with 1 reject... Rejected hunk #1. Applied patch examples/ipsec-secgw/ipsec-secgw.c cleanly. Applying patch examples/ipsec-secgw/ipsec.h with 1 reject... Rejected hunk #1. Applied patch examples/ipsec-secgw/ipsec_process.c cleanly. Applied patch examples/ipsec-secgw/sa.c cleanly. diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst (rejected hunks) @@ -203,6 +203,10 @@ New Features * Added support for setting a non default starting ESN value. * Added support TSO offload support; only supported for inline crypto mode. +* **IPsec Security Gateway sample application new features.** + + * Added support for TSO + Removed Items ------------- diff a/doc/guides/sample_app_ug/ipsec_secgw.rst b/doc/guides/sample_app_ug/ipsec_secgw.rst (rejected hunks) @@ -748,6 +748,17 @@ where each options means: * *esn N* N is the initial ESN value + ```` + + * Maximum segment size for TSO offload, available for egress SAs only. + + * Optional: Yes, TSO offload not set by default + + * Syntax: + + * *mss N* N is the segment size in bytes + + Example SA rules: .. code-block:: console diff a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h (rejected hunks) @@ -142,6 +142,7 @@ struct ipsec_sa { enum rte_security_ipsec_sa_direction direction; uint8_t udp_encap; uint16_t portid; + uint16_t mss; uint64_t esn; uint8_t fdir_qid; uint8_t fdir_flag; https://lab.dpdk.org/results/dashboard/patchsets/19513/ UNH-IOL DPDK Community Lab