Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/117267 _apply patch failure_ Submitter: Michael Savisko Date: Monday, October 03 2022 16:34:49 Applied on: CommitID:e5d0e3c759e1048c51ee85c463a4de509d382c49 Apply patch set 117267 failed: Checking patch app/test-pmd/cmdline_flow.c... Hunk #1 succeeded at 610 (offset -12 lines). Hunk #2 succeeded at 1865 (offset -24 lines). Hunk #3 succeeded at 5967 (offset -133 lines). Checking patch doc/guides/rel_notes/release_22_11.rst... error: while searching for: * Added ``rte_event_eth_tx_adapter_queue_stop`` to stop the Tx Adapter from enqueueing any packets to the Tx queue. Removed Items ------------- error: patch failed: doc/guides/rel_notes/release_22_11.rst:114 Checking patch doc/guides/testpmd_app_ug/testpmd_funcs.rst... error: while searching for: - ``color {value}``: Meter color value(green/yellow/red). Actions list ^^^^^^^^^^^^ error: patch failed: doc/guides/testpmd_app_ug/testpmd_funcs.rst:3691 Checking patch lib/ethdev/rte_flow.c... error: while searching for: MK_FLOW_ACTION(PORT_REPRESENTOR, sizeof(struct rte_flow_action_ethdev)), MK_FLOW_ACTION(REPRESENTED_PORT, sizeof(struct rte_flow_action_ethdev)), MK_FLOW_ACTION(METER_MARK, sizeof(struct rte_flow_action_meter_mark)), }; int error: patch failed: lib/ethdev/rte_flow.c:257 Checking patch lib/ethdev/rte_flow.h... error: while searching for: * See file rte_mtr.h for MTR profile object configuration. */ RTE_FLOW_ACTION_TYPE_METER_MARK, }; /** error: patch failed: lib/ethdev/rte_flow.h:2797 Applied patch app/test-pmd/cmdline_flow.c cleanly. Applying patch doc/guides/rel_notes/release_22_11.rst with 1 reject... Rejected hunk #1. Applying patch doc/guides/testpmd_app_ug/testpmd_funcs.rst with 1 reject... Rejected hunk #1. Applying patch lib/ethdev/rte_flow.c with 1 reject... Rejected hunk #1. Applying patch lib/ethdev/rte_flow.h with 1 reject... Rejected hunk #1. diff a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst (rejected hunks) @@ -114,6 +114,11 @@ New Features * Added ``rte_event_eth_tx_adapter_queue_stop`` to stop the Tx Adapter from enqueueing any packets to the Tx queue. +* **Added new rte_flow action SEND_TO_KERNEL.** + + Added new rte_flow action which allows application to re-route packets + directly to the kernel without software involvement. + Removed Items ------------- diff a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst (rejected hunks) @@ -3691,6 +3691,9 @@ This section lists supported pattern items and their attributes, if any. - ``color {value}``: Meter color value(green/yellow/red). +- ``send_to_kernel``: send packets to kernel. + + Actions list ^^^^^^^^^^^^ diff a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c (rejected hunks) @@ -257,6 +257,7 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { MK_FLOW_ACTION(PORT_REPRESENTOR, sizeof(struct rte_flow_action_ethdev)), MK_FLOW_ACTION(REPRESENTED_PORT, sizeof(struct rte_flow_action_ethdev)), MK_FLOW_ACTION(METER_MARK, sizeof(struct rte_flow_action_meter_mark)), + MK_FLOW_ACTION(SEND_TO_KERNEL, 0), }; int diff a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h (rejected hunks) @@ -2797,6 +2797,18 @@ enum rte_flow_action_type { * See file rte_mtr.h for MTR profile object configuration. */ RTE_FLOW_ACTION_TYPE_METER_MARK, + + /** + * Send packets to the kernel, without going to userspace at all. + * The packets will be received by the kernel driver sharing + * the same device as the DPDK port on which this action is + * configured. This action is mostly suits bifurcated driver + * model. + * This is an ingress non-transfer action only. + * + * No associated configuration structure. + */ + RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL, }; /** https://lab.dpdk.org/results/dashboard/patchsets/23747/ UNH-IOL DPDK Community Lab