Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/106546 _apply patch failure_ Submitter: Jie Wang Date: Wednesday, January 26 2022 06:30:16 Applied on: CommitID:8a5a91401dc23ddab1ddea3667a17a615a25077f Apply patch set 106546-106551 failed: Checking patch app/test-pmd/cmdline.c... Checking patch app/test-pmd/config.c... Checking patch doc/guides/rel_notes/release_22_03.rst... error: while searching for: Also, make sure to start the actual text at the margin. ======================================================= * **Updated Cisco enic driver.** * Added rte_flow support for matching GENEVE packets. error: patch failed: doc/guides/rel_notes/release_22_03.rst:55 Checking patch lib/ethdev/rte_ethdev.h... error: while searching for: #define RTE_ETH_RSS_L4_CHKSUM RTE_BIT64(35) #define ETH_RSS_L4_CHKSUM RTE_DEPRECATED(ETH_RSS_L4_CHKSUM) RTE_ETH_RSS_L4_CHKSUM /* * We use the following macros to combine with above RTE_ETH_RSS_* for * more specific input set selection. These bits are defined starting error: patch failed: lib/ethdev/rte_ethdev.h:651 Applied patch app/test-pmd/cmdline.c cleanly. Applied patch app/test-pmd/config.c cleanly. Applying patch doc/guides/rel_notes/release_22_03.rst with 1 reject... Rejected hunk #1. Applying patch lib/ethdev/rte_ethdev.h with 1 reject... Rejected hunk #1. diff a/doc/guides/rel_notes/release_22_03.rst b/doc/guides/rel_notes/release_22_03.rst (rejected hunks) @@ -55,6 +55,11 @@ New Features Also, make sure to start the actual text at the margin. ======================================================= +* **Added new RSS offload types for L2TPv2 in RSS flow.** + + Added macro RTE_ETH_RSS_L2TPV2, now L2TPv2 session ID field can be used as + input set for RSS. + * **Updated Cisco enic driver.** * Added rte_flow support for matching GENEVE packets. diff a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h (rejected hunks) @@ -651,6 +651,13 @@ struct rte_eth_rss_conf { #define RTE_ETH_RSS_L4_CHKSUM RTE_BIT64(35) #define ETH_RSS_L4_CHKSUM RTE_DEPRECATED(ETH_RSS_L4_CHKSUM) RTE_ETH_RSS_L4_CHKSUM +/* + * Below macro is defined for RSS offload type, it can be used to + * fill rte_eth_rss_conf.rss_hf or rte_flow_action_rss.types. + */ +#define RTE_ETH_RSS_L2TPV2 RTE_BIT64(36) +#define ETH_RSS_L2TPV2 RTE_DEPRECATED(ETH_RSS_L2TPV2) RTE_ETH_RSS_L2TPV2 + /* * We use the following macros to combine with above RTE_ETH_RSS_* for * more specific input set selection. These bits are defined starting Checking patch doc/guides/rel_notes/release_22_03.rst... error: while searching for: * Added rte_flow support for matching GENEVE packets. Removed Items ------------- error: patch failed: doc/guides/rel_notes/release_22_03.rst:64 Checking patch drivers/net/iavf/iavf.h... Checking patch drivers/net/iavf/iavf_generic_flow.c... Checking patch drivers/net/iavf/iavf_generic_flow.h... Checking patch drivers/net/iavf/iavf_hash.c... Applying patch doc/guides/rel_notes/release_22_03.rst with 1 reject... Rejected hunk #1. Applied patch drivers/net/iavf/iavf.h cleanly. Applied patch drivers/net/iavf/iavf_generic_flow.c cleanly. Applied patch drivers/net/iavf/iavf_generic_flow.h cleanly. Applied patch drivers/net/iavf/iavf_hash.c cleanly. diff a/doc/guides/rel_notes/release_22_03.rst b/doc/guides/rel_notes/release_22_03.rst (rejected hunks) @@ -64,6 +64,12 @@ New Features * Added rte_flow support for matching GENEVE packets. +* **Updated Intel iavf driver.** + + Added L2TPv2(include PPP over L2TPv2) RSS hash distribute packets + based on outer MAC src address and L2TPv2 session ID. + + Removed Items ------------- Checking patch doc/guides/rel_notes/release_22_03.rst... error: while searching for: * **Updated Intel iavf driver.** Added L2TPv2(include PPP over L2TPv2) RSS hash distribute packets based on outer MAC src address and L2TPv2 session ID. Removed Items error: patch failed: doc/guides/rel_notes/release_22_03.rst:66 Checking patch drivers/net/iavf/iavf_fdir.c... Checking patch drivers/net/iavf/iavf_generic_flow.h... error: drivers/net/iavf/iavf_generic_flow.h: does not match index Applying patch doc/guides/rel_notes/release_22_03.rst with 1 reject... Rejected hunk #1. Applied patch drivers/net/iavf/iavf_fdir.c cleanly. diff a/doc/guides/rel_notes/release_22_03.rst b/doc/guides/rel_notes/release_22_03.rst (rejected hunks) @@ -66,8 +66,12 @@ New Features * **Updated Intel iavf driver.** - Added L2TPv2(include PPP over L2TPv2) RSS hash distribute packets - based on outer MAC src address and L2TPv2 session ID. + * Added L2TPv2(include PPP over L2TPv2) RSS hash distribute packets + based on outer MAC src address and L2TPv2 session ID. + * Added L2TPv2(include PPP over L2TPv2) FDIR distribute packets + based on outer MAC src address and L2TPv2 session ID. + * Added PPPoL2TPv2oUDP FDIR distribute packets based on inner IP + src/dst address and UDP/TCP src/dst port. Removed Items https://lab.dpdk.org/results/dashboard/patchsets/20823/ UNH-IOL DPDK Community Lab