Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/38506 _apply issues_ Submitter: Adrien Mazarguil Date: 2018-04-19 10:16:39 DPDK git baseline: Repo:dpdk-master, CommitID: e62f3a8a04768352bc78389d499be50c923bf6aa Repo:dpdk-next-eventdev, CommitID: fe5abd3150bc1caa8369e743c395c39f53265597 Repo:dpdk-next-net, CommitID: 9f44b612637c29752d1585e8d1af2e299756cd60 Repo:dpdk-next-crypto, CommitID: b1af489e6482a2247ef36418cee803e32bc84b2e Repo:dpdk-next-virtio, CommitID: 8adbe7e4847060d091c46abcbecd3dfea8362b7a *Repo: dpdk-master Checking patch app/test-pmd/cmdline_flow.c... error: while searching for: /** Storage for struct rte_flow_action_rss including external data. */ struct action_rss_data { struct rte_flow_action_rss conf; uint16_t queue[ACTION_RSS_QUEUE_NUM]; struct rte_eth_rss_conf rss_conf; uint8_t rss_key[RSS_HASH_KEY_LENGTH]; }; /** Maximum number of subsequent tokens and arguments on the stack. */ error: patch failed: app/test-pmd/cmdline_flow.c:192 error: app/test-pmd/cmdline_flow.c: patch does not apply Checking patch app/test-pmd/config.c... error: while searching for: off = 0; if (dst.rss) *dst.rss = (struct rte_flow_action_rss){ .num = src.rss->num, }; -- } off += size; } size = off; error: patch failed: app/test-pmd/config.c:1100 error: app/test-pmd/config.c: patch does not apply Checking patch doc/guides/prog_guide/rte_flow.rst... Hunk #1 succeeded at 1325 (offset 24 lines). error: while searching for: .. table:: RSS +--------------+--------------------------------+ | Field | Value | -- +--------------+--------------------------------+ Action: ``PF`` ^^^^^^^^^^^^^^ error: patch failed: doc/guides/prog_guide/rte_flow.rst:1309 error: doc/guides/prog_guide/rte_flow.rst: patch does not apply Checking patch doc/guides/testpmd_app_ug/testpmd_funcs.rst... error: while searching for: - ``rss``: spread packets among several queues. - ``types [{RSS hash type} [...]] end``: RSS hash types, allowed tokens are the same as `set_hash_input_set`_, an empty list means none (0). - ``key {string}``: RSS hash key, overrides ``key_len``. error: patch failed: doc/guides/testpmd_app_ug/testpmd_funcs.rst:3398 error: doc/guides/testpmd_app_ug/testpmd_funcs.rst: patch does not apply Checking patch drivers/net/e1000/e1000_ethdev.h... Checking patch drivers/net/e1000/igb_ethdev.c... Checking patch drivers/net/e1000/igb_flow.c... Checking patch drivers/net/e1000/igb_rxtx.c... Checking patch drivers/net/i40e/i40e_ethdev.c... -- Hunk #4 succeeded at 5739 (offset -1 lines). Hunk #5 succeeded at 5749 (offset -1 lines). Hunk #6 succeeded at 5768 (offset -1 lines). Checking patch drivers/net/mlx4/mlx4.c... Checking patch drivers/net/mlx4/mlx4_flow.c... error: while searching for: switch (action->type) { const struct rte_flow_action_queue *queue; const struct rte_flow_action_rss *rss; const struct rte_eth_rss_conf *rss_conf; uint64_t fields; unsigned int i; error: patch failed: drivers/net/mlx4/mlx4_flow.c:717 error: drivers/net/mlx4/mlx4_flow.c: patch does not apply Checking patch drivers/net/mlx4/mlx4_flow.h... Checking patch drivers/net/mlx4/mlx4_rxq.c... Checking patch drivers/net/mlx4/mlx4_rxtx.h... Checking patch drivers/net/mlx5/mlx5_flow.c... Hunk #1 succeeded at 212 (offset -2 lines). Hunk #2 succeeded at 403 (offset -2 lines). Hunk #3 succeeded at 528 (offset -2 lines). error: while searching for: enum { FATE = 1, MARK = 2, COUNT = 4, }; uint32_t overlap = 0; struct priv *priv = dev->data->dev_private; int ret; -- return ret; for (; actions->type != RTE_FLOW_ACTION_TYPE_END; ++actions) { if (actions->type == RTE_FLOW_ACTION_TYPE_VOID) { continue; error: patch failed: drivers/net/mlx5/mlx5_flow.c:642 error: drivers/net/mlx5/mlx5_flow.c: patch does not apply Checking patch drivers/net/mlx5/mlx5_rxq.c... Checking patch drivers/net/mlx5/mlx5_rxtx.h... Checking patch drivers/net/sfc/sfc_flow.c... Checking patch drivers/net/tap/tap_flow.c... Hunk #1 succeeded at 1214 (offset -1 lines). Hunk #2 succeeded at 2039 (offset -11 lines). Hunk #3 succeeded at 2055 (offset -11 lines). Checking patch examples/ipsec-secgw/ipsec.c... error: while searching for: i < eth_dev->data->nb_rx_queues; ++i) if (eth_dev->data->rx_queues[i]) queue[j++] = i; action_rss.rss_conf = &rss_conf; action_rss.num = j; action_rss.queue = queue; ret = rte_flow_validate(sa->portid, &sa->attr, sa->pattern, sa->action, &err); error: patch failed: examples/ipsec-secgw/ipsec.c:202 error: examples/ipsec-secgw/ipsec.c: patch does not apply Checking patch lib/librte_ether/rte_flow.c... error: while searching for: off = 0; if (dst.rss) *dst.rss = (struct rte_flow_action_rss){ .num = src.rss->num, }; -- } off += size; } size = off; error: patch failed: lib/librte_ether/rte_flow.c:330 error: lib/librte_ether/rte_flow.c: patch does not apply Checking patch lib/librte_ether/rte_flow.h... error: while searching for: * Similar to QUEUE, except RSS is additionally performed on packets to * spread them among several queues according to the provided parameters. * * Note: RSS hash result is stored in the hash.rss mbuf field which overlaps * hash.fdir.lo. Since the MARK action sets the hash.fdir.hi field only, -- uint16_t num; /**< Number of entries in @p queue. */ const uint16_t *queue; /**< Queue indices to use. */ }; error: patch failed: lib/librte_ether/rte_flow.h:1033 error: lib/librte_ether/rte_flow.h: patch does not apply *Repo: dpdk-next-eventdev Checking patch app/test-pmd/cmdline_flow.c... error: while searching for: /** Storage for struct rte_flow_action_rss including external data. */ struct action_rss_data { struct rte_flow_action_rss conf; uint16_t queue[ACTION_RSS_QUEUE_NUM]; struct rte_eth_rss_conf rss_conf; uint8_t rss_key[RSS_HASH_KEY_LENGTH]; }; /** Maximum number of subsequent tokens and arguments on the stack. */ error: patch failed: app/test-pmd/cmdline_flow.c:192 error: app/test-pmd/cmdline_flow.c: patch does not apply Checking patch app/test-pmd/config.c... error: while searching for: off = 0; if (dst.rss) *dst.rss = (struct rte_flow_action_rss){ .num = src.rss->num, }; -- } off += size; } size = off; error: patch failed: app/test-pmd/config.c:1100 error: app/test-pmd/config.c: patch does not apply Checking patch doc/guides/prog_guide/rte_flow.rst... Hunk #1 succeeded at 1325 (offset 24 lines). error: while searching for: .. table:: RSS +--------------+--------------------------------+ | Field | Value | -- +--------------+--------------------------------+ Action: ``PF`` ^^^^^^^^^^^^^^ error: patch failed: doc/guides/prog_guide/rte_flow.rst:1309 error: doc/guides/prog_guide/rte_flow.rst: patch does not apply Checking patch doc/guides/testpmd_app_ug/testpmd_funcs.rst... error: while searching for: - ``rss``: spread packets among several queues. - ``types [{RSS hash type} [...]] end``: RSS hash types, allowed tokens are the same as `set_hash_input_set`_, an empty list means none (0). - ``key {string}``: RSS hash key, overrides ``key_len``. error: patch failed: doc/guides/testpmd_app_ug/testpmd_funcs.rst:3398 error: doc/guides/testpmd_app_ug/testpmd_funcs.rst: patch does not apply Checking patch drivers/net/e1000/e1000_ethdev.h... Hunk #4 succeeded at 492 (offset -14 lines). Checking patch drivers/net/e1000/igb_ethdev.c... Hunk #2 succeeded at 5568 (offset -6 lines). Checking patch drivers/net/e1000/igb_flow.c... -- Hunk #4 succeeded at 12009 (offset -77 lines). Hunk #5 succeeded at 12020 (offset -77 lines). Hunk #6 succeeded at 12033 (offset -77 lines). Hunk #7 succeeded at 12058 (offset -77 lines). Checking patch drivers/net/i40e/i40e_ethdev.h... error: while searching for: #ifndef _I40E_ETHDEV_H_ #define _I40E_ETHDEV_H_ #include #include -- #define I40E_VLAN_TAG_SIZE 4 #define I40E_AQ_LEN 32 error: patch failed: drivers/net/i40e/i40e_ethdev.h:5 error: drivers/net/i40e/i40e_ethdev.h: patch does not apply Checking patch drivers/net/i40e/i40e_flow.c... Hunk #1 succeeded at 4205 (offset -15 lines). error: while searching for: * queue index for this port. */ if (conf_info->queue_region_number) { for (i = 0; i < rss->num; i++) { for (j = 0; j < rss_info->num; j++) { if (rss->queue[i] == rss_info->queue[j]) break; } if (j == rss_info->num) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, act, error: patch failed: drivers/net/i40e/i40e_flow.c:4236 error: drivers/net/i40e/i40e_flow.c: patch does not apply Checking patch drivers/net/ixgbe/ixgbe_ethdev.c... Hunk #2 succeeded at 8282 (offset -8 lines). Checking patch drivers/net/ixgbe/ixgbe_ethdev.h... Hunk #5 succeeded at 703 (offset 2 lines). Checking patch drivers/net/ixgbe/ixgbe_flow.c... -- Hunk #4 succeeded at 5586 (offset -154 lines). Hunk #5 succeeded at 5596 (offset -154 lines). Hunk #6 succeeded at 5615 (offset -154 lines). Checking patch drivers/net/mlx4/mlx4.c... Checking patch drivers/net/mlx4/mlx4_flow.c... error: while searching for: switch (action->type) { const struct rte_flow_action_queue *queue; const struct rte_flow_action_rss *rss; const struct rte_eth_rss_conf *rss_conf; uint64_t fields; unsigned int i; error: patch failed: drivers/net/mlx4/mlx4_flow.c:717 error: drivers/net/mlx4/mlx4_flow.c: patch does not apply Checking patch drivers/net/mlx4/mlx4_flow.h... Checking patch drivers/net/mlx4/mlx4_rxq.c... Checking patch drivers/net/mlx4/mlx4_rxtx.h... Hunk #1 succeeded at 126 (offset -1 lines). Checking patch drivers/net/mlx5/mlx5_flow.c... Hunk #1 succeeded at 212 (offset -2 lines). Hunk #2 succeeded at 403 (offset -2 lines). Hunk #3 succeeded at 528 (offset -2 lines). error: while searching for: enum { FATE = 1, MARK = 2, COUNT = 4, }; uint32_t overlap = 0; struct priv *priv = dev->data->dev_private; int ret; -- return ret; for (; actions->type != RTE_FLOW_ACTION_TYPE_END; ++actions) { if (actions->type == RTE_FLOW_ACTION_TYPE_VOID) { continue; error: patch failed: drivers/net/mlx5/mlx5_flow.c:642 error: drivers/net/mlx5/mlx5_flow.c: patch does not apply Checking patch drivers/net/mlx5/mlx5_rxq.c... Checking patch drivers/net/mlx5/mlx5_rxtx.h... Checking patch drivers/net/sfc/sfc_flow.c... Checking patch drivers/net/tap/tap_flow.c... Hunk #1 succeeded at 1214 (offset -1 lines). Hunk #2 succeeded at 2039 (offset -11 lines). Hunk #3 succeeded at 2055 (offset -11 lines). Checking patch examples/ipsec-secgw/ipsec.c... error: while searching for: i < eth_dev->data->nb_rx_queues; ++i) if (eth_dev->data->rx_queues[i]) queue[j++] = i; action_rss.rss_conf = &rss_conf; action_rss.num = j; action_rss.queue = queue; ret = rte_flow_validate(sa->portid, &sa->attr, sa->pattern, sa->action, &err); error: patch failed: examples/ipsec-secgw/ipsec.c:202 error: examples/ipsec-secgw/ipsec.c: patch does not apply Checking patch lib/librte_ether/rte_flow.c... error: while searching for: off = 0; if (dst.rss) *dst.rss = (struct rte_flow_action_rss){ .num = src.rss->num, }; -- } off += size; } size = off; error: patch failed: lib/librte_ether/rte_flow.c:330 error: lib/librte_ether/rte_flow.c: patch does not apply Checking patch lib/librte_ether/rte_flow.h... error: while searching for: * Similar to QUEUE, except RSS is additionally performed on packets to * spread them among several queues according to the provided parameters. * * Note: RSS hash result is stored in the hash.rss mbuf field which overlaps * hash.fdir.lo. Since the MARK action sets the hash.fdir.hi field only, -- uint16_t num; /**< Number of entries in @p queue. */ const uint16_t *queue; /**< Queue indices to use. */ }; error: patch failed: lib/librte_ether/rte_flow.h:1033 error: lib/librte_ether/rte_flow.h: patch does not apply *Repo: dpdk-next-net Checking patch app/test-pmd/cmdline_flow.c... error: while searching for: /** Storage for struct rte_flow_action_rss including external data. */ struct action_rss_data { struct rte_flow_action_rss conf; uint16_t queue[ACTION_RSS_QUEUE_NUM]; struct rte_eth_rss_conf rss_conf; uint8_t rss_key[RSS_HASH_KEY_LENGTH]; }; /** Maximum number of subsequent tokens and arguments on the stack. */ error: patch failed: app/test-pmd/cmdline_flow.c:192 error: app/test-pmd/cmdline_flow.c: patch does not apply Checking patch app/test-pmd/config.c... error: while searching for: off = 0; if (dst.rss) *dst.rss = (struct rte_flow_action_rss){ .num = src.rss->num, }; -- } off += size; } size = off; error: patch failed: app/test-pmd/config.c:1100 error: app/test-pmd/config.c: patch does not apply Checking patch doc/guides/prog_guide/rte_flow.rst... Hunk #1 succeeded at 1325 (offset 24 lines). error: while searching for: .. table:: RSS +--------------+--------------------------------+ | Field | Value | -- +--------------+--------------------------------+ Action: ``PF`` ^^^^^^^^^^^^^^ error: patch failed: doc/guides/prog_guide/rte_flow.rst:1309 error: doc/guides/prog_guide/rte_flow.rst: patch does not apply Checking patch doc/guides/testpmd_app_ug/testpmd_funcs.rst... error: while searching for: - ``rss``: spread packets among several queues. - ``types [{RSS hash type} [...]] end``: RSS hash types, allowed tokens are the same as `set_hash_input_set`_, an empty list means none (0). - ``key {string}``: RSS hash key, overrides ``key_len``. error: patch failed: doc/guides/testpmd_app_ug/testpmd_funcs.rst:3398 error: doc/guides/testpmd_app_ug/testpmd_funcs.rst: patch does not apply Checking patch drivers/net/e1000/e1000_ethdev.h... Checking patch drivers/net/e1000/igb_ethdev.c... Checking patch drivers/net/e1000/igb_flow.c... Checking patch drivers/net/e1000/igb_rxtx.c... Checking patch drivers/net/i40e/i40e_ethdev.c... -- Checking patch drivers/net/ixgbe/ixgbe_ethdev.h... Checking patch drivers/net/ixgbe/ixgbe_flow.c... Checking patch drivers/net/ixgbe/ixgbe_rxtx.c... Checking patch drivers/net/mlx4/mlx4.c... Checking patch drivers/net/mlx4/mlx4_flow.c... error: while searching for: switch (action->type) { const struct rte_flow_action_queue *queue; const struct rte_flow_action_rss *rss; const struct rte_eth_rss_conf *rss_conf; uint64_t fields; unsigned int i; error: patch failed: drivers/net/mlx4/mlx4_flow.c:717 error: drivers/net/mlx4/mlx4_flow.c: patch does not apply Checking patch drivers/net/mlx4/mlx4_flow.h... Checking patch drivers/net/mlx4/mlx4_rxq.c... Checking patch drivers/net/mlx4/mlx4_rxtx.h... Checking patch drivers/net/mlx5/mlx5_flow.c... Hunk #1 succeeded at 212 (offset -2 lines). Hunk #2 succeeded at 403 (offset -2 lines). Hunk #3 succeeded at 528 (offset -2 lines). error: while searching for: enum { FATE = 1, MARK = 2, COUNT = 4, }; uint32_t overlap = 0; struct priv *priv = dev->data->dev_private; int ret; -- return ret; for (; actions->type != RTE_FLOW_ACTION_TYPE_END; ++actions) { if (actions->type == RTE_FLOW_ACTION_TYPE_VOID) { continue; error: patch failed: drivers/net/mlx5/mlx5_flow.c:642 error: drivers/net/mlx5/mlx5_flow.c: patch does not apply Checking patch drivers/net/mlx5/mlx5_rxq.c... Checking patch drivers/net/mlx5/mlx5_rxtx.h... Checking patch drivers/net/sfc/sfc_flow.c... Checking patch drivers/net/tap/tap_flow.c... Hunk #1 succeeded at 1214 (offset -1 lines). Hunk #2 succeeded at 2039 (offset -11 lines). Hunk #3 succeeded at 2055 (offset -11 lines). Checking patch examples/ipsec-secgw/ipsec.c... error: while searching for: i < eth_dev->data->nb_rx_queues; ++i) if (eth_dev->data->rx_queues[i]) queue[j++] = i; action_rss.rss_conf = &rss_conf; action_rss.num = j; action_rss.queue = queue; ret = rte_flow_validate(sa->portid, &sa->attr, sa->pattern, sa->action, &err); error: patch failed: examples/ipsec-secgw/ipsec.c:202 error: examples/ipsec-secgw/ipsec.c: patch does not apply Checking patch lib/librte_ether/rte_flow.c... error: while searching for: off = 0; if (dst.rss) *dst.rss = (struct rte_flow_action_rss){ .num = src.rss->num, }; -- } off += size; } size = off; error: patch failed: lib/librte_ether/rte_flow.c:330 error: lib/librte_ether/rte_flow.c: patch does not apply Checking patch lib/librte_ether/rte_flow.h... error: while searching for: * Similar to QUEUE, except RSS is additionally performed on packets to * spread them among several queues according to the provided parameters. * * Note: RSS hash result is stored in the hash.rss mbuf field which overlaps * hash.fdir.lo. Since the MARK action sets the hash.fdir.hi field only, -- uint16_t num; /**< Number of entries in @p queue. */ const uint16_t *queue; /**< Queue indices to use. */ }; error: patch failed: lib/librte_ether/rte_flow.h:1033 error: lib/librte_ether/rte_flow.h: patch does not apply *Repo: dpdk-next-crypto Checking patch app/test-pmd/cmdline_flow.c... error: while searching for: /** Storage for struct rte_flow_action_rss including external data. */ struct action_rss_data { struct rte_flow_action_rss conf; uint16_t queue[ACTION_RSS_QUEUE_NUM]; struct rte_eth_rss_conf rss_conf; uint8_t rss_key[RSS_HASH_KEY_LENGTH]; }; /** Maximum number of subsequent tokens and arguments on the stack. */ error: patch failed: app/test-pmd/cmdline_flow.c:192 error: app/test-pmd/cmdline_flow.c: patch does not apply Checking patch app/test-pmd/config.c... error: while searching for: off = 0; if (dst.rss) *dst.rss = (struct rte_flow_action_rss){ .num = src.rss->num, }; -- } off += size; } size = off; error: patch failed: app/test-pmd/config.c:1100 error: app/test-pmd/config.c: patch does not apply Checking patch doc/guides/prog_guide/rte_flow.rst... Hunk #1 succeeded at 1325 (offset 24 lines). error: while searching for: .. table:: RSS +--------------+--------------------------------+ | Field | Value | -- +--------------+--------------------------------+ Action: ``PF`` ^^^^^^^^^^^^^^ error: patch failed: doc/guides/prog_guide/rte_flow.rst:1309 error: doc/guides/prog_guide/rte_flow.rst: patch does not apply Checking patch doc/guides/testpmd_app_ug/testpmd_funcs.rst... error: while searching for: - ``rss``: spread packets among several queues. - ``types [{RSS hash type} [...]] end``: RSS hash types, allowed tokens are the same as `set_hash_input_set`_, an empty list means none (0). - ``key {string}``: RSS hash key, overrides ``key_len``. error: patch failed: doc/guides/testpmd_app_ug/testpmd_funcs.rst:3398 error: doc/guides/testpmd_app_ug/testpmd_funcs.rst: patch does not apply Checking patch drivers/net/e1000/e1000_ethdev.h... Checking patch drivers/net/e1000/igb_ethdev.c... Checking patch drivers/net/e1000/igb_flow.c... Checking patch drivers/net/e1000/igb_rxtx.c... Checking patch drivers/net/i40e/i40e_ethdev.c... -- Hunk #4 succeeded at 5739 (offset -1 lines). Hunk #5 succeeded at 5749 (offset -1 lines). Hunk #6 succeeded at 5768 (offset -1 lines). Checking patch drivers/net/mlx4/mlx4.c... Checking patch drivers/net/mlx4/mlx4_flow.c... error: while searching for: switch (action->type) { const struct rte_flow_action_queue *queue; const struct rte_flow_action_rss *rss; const struct rte_eth_rss_conf *rss_conf; uint64_t fields; unsigned int i; error: patch failed: drivers/net/mlx4/mlx4_flow.c:717 error: drivers/net/mlx4/mlx4_flow.c: patch does not apply Checking patch drivers/net/mlx4/mlx4_flow.h... Checking patch drivers/net/mlx4/mlx4_rxq.c... Checking patch drivers/net/mlx4/mlx4_rxtx.h... Checking patch drivers/net/mlx5/mlx5_flow.c... Hunk #1 succeeded at 212 (offset -2 lines). Hunk #2 succeeded at 403 (offset -2 lines). Hunk #3 succeeded at 528 (offset -2 lines). error: while searching for: enum { FATE = 1, MARK = 2, COUNT = 4, }; uint32_t overlap = 0; struct priv *priv = dev->data->dev_private; int ret; -- return ret; for (; actions->type != RTE_FLOW_ACTION_TYPE_END; ++actions) { if (actions->type == RTE_FLOW_ACTION_TYPE_VOID) { continue; error: patch failed: drivers/net/mlx5/mlx5_flow.c:642 error: drivers/net/mlx5/mlx5_flow.c: patch does not apply Checking patch drivers/net/mlx5/mlx5_rxq.c... Checking patch drivers/net/mlx5/mlx5_rxtx.h... Checking patch drivers/net/sfc/sfc_flow.c... Checking patch drivers/net/tap/tap_flow.c... Hunk #1 succeeded at 1214 (offset -1 lines). Hunk #2 succeeded at 2039 (offset -11 lines). Hunk #3 succeeded at 2055 (offset -11 lines). Checking patch examples/ipsec-secgw/ipsec.c... error: while searching for: i < eth_dev->data->nb_rx_queues; ++i) if (eth_dev->data->rx_queues[i]) queue[j++] = i; action_rss.rss_conf = &rss_conf; action_rss.num = j; action_rss.queue = queue; ret = rte_flow_validate(sa->portid, &sa->attr, sa->pattern, sa->action, &err); error: patch failed: examples/ipsec-secgw/ipsec.c:202 error: examples/ipsec-secgw/ipsec.c: patch does not apply Checking patch lib/librte_ether/rte_flow.c... error: while searching for: off = 0; if (dst.rss) *dst.rss = (struct rte_flow_action_rss){ .num = src.rss->num, }; -- } off += size; } size = off; error: patch failed: lib/librte_ether/rte_flow.c:330 error: lib/librte_ether/rte_flow.c: patch does not apply Checking patch lib/librte_ether/rte_flow.h... error: while searching for: * Similar to QUEUE, except RSS is additionally performed on packets to * spread them among several queues according to the provided parameters. * * Note: RSS hash result is stored in the hash.rss mbuf field which overlaps * hash.fdir.lo. Since the MARK action sets the hash.fdir.hi field only, -- uint16_t num; /**< Number of entries in @p queue. */ const uint16_t *queue; /**< Queue indices to use. */ }; error: patch failed: lib/librte_ether/rte_flow.h:1033 error: lib/librte_ether/rte_flow.h: patch does not apply *Repo: dpdk-next-virtio Checking patch app/test-pmd/cmdline_flow.c... error: while searching for: /** Storage for struct rte_flow_action_rss including external data. */ struct action_rss_data { struct rte_flow_action_rss conf; uint16_t queue[ACTION_RSS_QUEUE_NUM]; struct rte_eth_rss_conf rss_conf; uint8_t rss_key[RSS_HASH_KEY_LENGTH]; }; /** Maximum number of subsequent tokens and arguments on the stack. */ error: patch failed: app/test-pmd/cmdline_flow.c:192 error: app/test-pmd/cmdline_flow.c: patch does not apply Checking patch app/test-pmd/config.c... error: while searching for: off = 0; if (dst.rss) *dst.rss = (struct rte_flow_action_rss){ .num = src.rss->num, }; -- } off += size; } size = off; error: patch failed: app/test-pmd/config.c:1100 error: app/test-pmd/config.c: patch does not apply Checking patch doc/guides/prog_guide/rte_flow.rst... Hunk #1 succeeded at 1325 (offset 24 lines). error: while searching for: .. table:: RSS +--------------+--------------------------------+ | Field | Value | -- +--------------+--------------------------------+ Action: ``PF`` ^^^^^^^^^^^^^^ error: patch failed: doc/guides/prog_guide/rte_flow.rst:1309 error: doc/guides/prog_guide/rte_flow.rst: patch does not apply Checking patch doc/guides/testpmd_app_ug/testpmd_funcs.rst... error: while searching for: - ``rss``: spread packets among several queues. - ``types [{RSS hash type} [...]] end``: RSS hash types, allowed tokens are the same as `set_hash_input_set`_, an empty list means none (0). - ``key {string}``: RSS hash key, overrides ``key_len``. error: patch failed: doc/guides/testpmd_app_ug/testpmd_funcs.rst:3398 error: doc/guides/testpmd_app_ug/testpmd_funcs.rst: patch does not apply Checking patch drivers/net/e1000/e1000_ethdev.h... Checking patch drivers/net/e1000/igb_ethdev.c... Checking patch drivers/net/e1000/igb_flow.c... Checking patch drivers/net/e1000/igb_rxtx.c... Checking patch drivers/net/i40e/i40e_ethdev.c... -- Hunk #4 succeeded at 5739 (offset -1 lines). Hunk #5 succeeded at 5749 (offset -1 lines). Hunk #6 succeeded at 5768 (offset -1 lines). Checking patch drivers/net/mlx4/mlx4.c... Checking patch drivers/net/mlx4/mlx4_flow.c... error: while searching for: switch (action->type) { const struct rte_flow_action_queue *queue; const struct rte_flow_action_rss *rss; const struct rte_eth_rss_conf *rss_conf; uint64_t fields; unsigned int i; error: patch failed: drivers/net/mlx4/mlx4_flow.c:717 error: drivers/net/mlx4/mlx4_flow.c: patch does not apply Checking patch drivers/net/mlx4/mlx4_flow.h... Checking patch drivers/net/mlx4/mlx4_rxq.c... Checking patch drivers/net/mlx4/mlx4_rxtx.h... Checking patch drivers/net/mlx5/mlx5_flow.c... Hunk #1 succeeded at 212 (offset -2 lines). Hunk #2 succeeded at 403 (offset -2 lines). Hunk #3 succeeded at 528 (offset -2 lines). error: while searching for: enum { FATE = 1, MARK = 2, COUNT = 4, }; uint32_t overlap = 0; struct priv *priv = dev->data->dev_private; int ret; -- return ret; for (; actions->type != RTE_FLOW_ACTION_TYPE_END; ++actions) { if (actions->type == RTE_FLOW_ACTION_TYPE_VOID) { continue; error: patch failed: drivers/net/mlx5/mlx5_flow.c:642 error: drivers/net/mlx5/mlx5_flow.c: patch does not apply Checking patch drivers/net/mlx5/mlx5_rxq.c... Checking patch drivers/net/mlx5/mlx5_rxtx.h... Checking patch drivers/net/sfc/sfc_flow.c... Checking patch drivers/net/tap/tap_flow.c... Hunk #1 succeeded at 1214 (offset -1 lines). Hunk #2 succeeded at 2039 (offset -11 lines). Hunk #3 succeeded at 2055 (offset -11 lines). Checking patch examples/ipsec-secgw/ipsec.c... error: while searching for: i < eth_dev->data->nb_rx_queues; ++i) if (eth_dev->data->rx_queues[i]) queue[j++] = i; action_rss.rss_conf = &rss_conf; action_rss.num = j; action_rss.queue = queue; ret = rte_flow_validate(sa->portid, &sa->attr, sa->pattern, sa->action, &err); error: patch failed: examples/ipsec-secgw/ipsec.c:202 error: examples/ipsec-secgw/ipsec.c: patch does not apply Checking patch lib/librte_ether/rte_flow.c... error: while searching for: off = 0; if (dst.rss) *dst.rss = (struct rte_flow_action_rss){ .num = src.rss->num, }; -- } off += size; } size = off; error: patch failed: lib/librte_ether/rte_flow.c:330 error: lib/librte_ether/rte_flow.c: patch does not apply Checking patch lib/librte_ether/rte_flow.h... error: while searching for: * Similar to QUEUE, except RSS is additionally performed on packets to * spread them among several queues according to the provided parameters. * * Note: RSS hash result is stored in the hash.rss mbuf field which overlaps * hash.fdir.lo. Since the MARK action sets the hash.fdir.hi field only, -- uint16_t num; /**< Number of entries in @p queue. */ const uint16_t *queue; /**< Queue indices to use. */ }; error: patch failed: lib/librte_ether/rte_flow.h:1033 error: lib/librte_ether/rte_flow.h: patch does not apply DPDK STV team