Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/117070 _apply patch failure_ Submitter: Akhil Goyal Date: Wednesday, September 28 2022 18:24:10 Applied on: CommitID:3fe71706abc1f13294c82477a0538047f8e4ebbf Apply patch set 117070-117072 failed: Checking patch doc/guides/prog_guide/rte_security.rst... Hunk #3 succeeded at 741 (offset 5 lines). Hunk #4 succeeded at 764 (offset 5 lines). Hunk #5 succeeded at 774 (offset 5 lines). Hunk #6 succeeded at 794 (offset 5 lines). Hunk #7 succeeded at 811 (offset 5 lines). Checking patch doc/guides/rel_notes/deprecation.rst... Checking patch doc/guides/rel_notes/release_22_11.rst... Hunk #2 succeeded at 221 (offset 7 lines). Checking patch lib/security/rte_security.c... Checking patch lib/security/rte_security.h... Hunk #2 succeeded at 358 (offset 3 lines). Hunk #3 succeeded at 671 (offset 3 lines). Hunk #4 succeeded at 746 (offset 3 lines). Hunk #5 succeeded at 979 (offset 37 lines). Hunk #6 succeeded at 1062 (offset 37 lines). Hunk #7 succeeded at 1088 (offset 37 lines). Hunk #8 succeeded at 1152 (offset 37 lines). Checking patch lib/security/rte_security_driver.h... error: while searching for: /**< Update mbuf metadata. */ security_capabilities_get_t capabilities_get; /**< Get security capabilities. */ }; #ifdef __cplusplus error: patch failed: lib/security/rte_security_driver.h:136 Checking patch lib/security/version.map... error: while searching for: __rte_security_set_pkt_metadata; rte_security_dynfield_offset; rte_security_session_stats_get; rte_security_session_update; }; error: patch failed: lib/security/version.map:15 Applied patch doc/guides/prog_guide/rte_security.rst cleanly. Applied patch doc/guides/rel_notes/deprecation.rst cleanly. Applied patch doc/guides/rel_notes/release_22_11.rst cleanly. Applied patch lib/security/rte_security.c cleanly. Applied patch lib/security/rte_security.h cleanly. Applying patch lib/security/rte_security_driver.h with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Rejected hunk #3. Applying patch lib/security/version.map with 1 reject... Rejected hunk #1. diff a/lib/security/rte_security_driver.h b/lib/security/rte_security_driver.h (rejected hunks) @@ -136,6 +210,18 @@ struct rte_security_ops { /**< Update mbuf metadata. */ security_capabilities_get_t capabilities_get; /**< Get security capabilities. */ + security_macsec_sc_create_t macsec_sc_create; + /**< Configure a MACsec security channel(SC). */ + security_macsec_sc_destroy_t macsec_sc_destroy; + /**< Free a MACsec security channel(SC). */ + security_macsec_sa_create_t macsec_sa_create; + /**< Configure a MACsec security association(SA). */ + security_macsec_sa_destroy_t macsec_sa_destroy; + /**< Free a MACsec security association(SA). */ + security_macsec_sc_stats_get_t macsec_sc_stats_get; + /**< Get MACsec SC statistics. */ + security_macsec_sa_stats_get_t macsec_sa_stats_get; + /**< Get MACsec SA statistics. */ }; #ifdef __cplusplus diff a/lib/security/version.map b/lib/security/version.map (rejected hunks) @@ -15,6 +15,12 @@ EXPERIMENTAL { __rte_security_set_pkt_metadata; rte_security_dynfield_offset; + rte_security_macsec_sa_create; + rte_security_macsec_sa_destroy; + rte_security_macsec_sa_stats_get; + rte_security_macsec_sc_create; + rte_security_macsec_sc_destroy; + rte_security_macsec_sc_stats_get; rte_security_session_stats_get; rte_security_session_update; }; https://lab.dpdk.org/results/dashboard/patchsets/23684/ UNH-IOL DPDK Community Lab