automatic DPDK test reports
 help / color / mirror / Atom feed
* [dpdk-test-report]  |FAILURE| pw37397[dpdk-dev, v2, 07/15] ethdev: flatten RSS configuration in flow API
@ 2018-05-10  8:10 sys_stv
  0 siblings, 0 replies; only message in thread
From: sys_stv @ 2018-05-10  8:10 UTC (permalink / raw)
  To: test-report; +Cc: xinfengx.zhao, zhaoyan.chen, peipeix.lu

[-- Attachment #1: Type: text/plain, Size: 54887 bytes --]

Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/37397

_apply issues_

Submitter: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Date: 2018-04-06 13:25:41
DPDK git baseline:
	Repo:dpdk-master, CommitID: 8ea41438832a360aed2b7ba49fb75e310a2ff1dc
	Repo:dpdk-next-eventdev, CommitID: 640b0d1e510e111694c25145466f37867453837f
	Repo:dpdk-next-net, CommitID: 774c1892c434dba09998ccc76b956feb72224571
	Repo:dpdk-next-crypto, CommitID: 728ca9b0d5abea82cd01dee6645456a9d56215f7
	Repo:dpdk-next-virtio, CommitID: 037c0996bc927342f157426739e0cb63f2db8689

*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:1084
error: app/test-pmd/config.c: patch does not apply
Checking patch doc/guides/prog_guide/rte_flow.rst...
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 drivers/net/e1000/e1000_ethdev.h...
error: while searching for:

#ifndef _E1000_ETHDEV_H_
#define _E1000_ETHDEV_H_
#include <rte_time.h>
#include <rte_pci.h>


error: patch failed: drivers/net/e1000/e1000_ethdev.h:4
error: drivers/net/e1000/e1000_ethdev.h: patch does not apply
Checking patch drivers/net/e1000/igb_ethdev.c...
error: while searching for:
#define IGB_DEFAULT_TX_HTHRESH      1
#define IGB_DEFAULT_TX_WTHRESH      ((hw->mac.type == e1000_82576) ? 1 : 16)

#define IGB_HKEY_MAX_INDEX 10

/* Bit shift and mask */
#define IGB_4_BIT_WIDTH  (CHAR_BIT / 2)
#define IGB_4_BIT_MASK   RTE_LEN2MASK(IGB_4_BIT_WIDTH, uint8_t)

error: patch failed: drivers/net/e1000/igb_ethdev.c:41
error: drivers/net/e1000/igb_ethdev.c: patch does not apply
Checking patch drivers/net/e1000/igb_flow.c...
error: while searching for:

	rss = (const struct rte_flow_action_rss *)act->conf;

	if (!rss || !rss->num) {
		rte_flow_error_set(error, EINVAL,
				RTE_FLOW_ERROR_TYPE_ACTION,
				act,

error: patch failed: drivers/net/e1000/igb_flow.c:1292
error: drivers/net/e1000/igb_flow.c: patch does not apply
Checking patch drivers/net/e1000/igb_rxtx.c...
error: while searching for:
}

int
igb_config_rss_filter(struct rte_eth_dev *dev,
		struct igb_rte_flow_rss_conf *conf, bool add)
--
	struct rte_eth_rss_conf rss_conf = conf->rss_conf;
	struct e1000_filter_info *filter_info =
		E1000_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);
	struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);

error: patch failed: drivers/net/e1000/igb_rxtx.c:2898
error: drivers/net/e1000/igb_rxtx.c: patch does not apply
Checking patch drivers/net/i40e/i40e_ethdev.c...
error: while searching for:
#include <inttypes.h>
#include <assert.h>

#include <rte_eal.h>
#include <rte_string_fns.h>
#include <rte_pci.h>

error: patch failed: drivers/net/i40e/i40e_ethdev.c:11
error: drivers/net/i40e/i40e_ethdev.c: patch does not apply
Checking patch drivers/net/i40e/i40e_ethdev.h...
error: while searching for:
#ifndef _I40E_ETHDEV_H_
#define _I40E_ETHDEV_H_

#include <rte_eth_ctrl.h>
#include <rte_time.h>
--

#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...
error: while searching for:

	if (action_flag) {
		for (n = 0; n < 64; n++) {
			if (rss->rss_conf->rss_hf & (hf_bit << n)) {
				conf_info->region[0].hw_flowtype[0] = n;
				conf_info->region[0].flowtype_num = 1;
				conf_info->queue_region_number = 1;

error: patch failed: drivers/net/i40e/i40e_flow.c:4207
error: drivers/net/i40e/i40e_flow.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_ethdev.c...
error: while searching for:

#define IXGBE_QUEUE_STAT_COUNTERS (sizeof(hw_stats->qprc) / sizeof(hw_stats->qprc[0]))

#define IXGBE_HKEY_MAX_INDEX 10

/* Additional timesync values. */
#define NSEC_PER_SEC             1000000000L
#define IXGBE_INCVAL_10GB        0x66666666

error: patch failed: drivers/net/ixgbe/ixgbe_ethdev.c:100
error: drivers/net/ixgbe/ixgbe_ethdev.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_ethdev.h...
error: while searching for:

#ifndef _IXGBE_ETHDEV_H_
#define _IXGBE_ETHDEV_H_
#include "base/ixgbe_type.h"
#include "base/ixgbe_dcb.h"
#include "base/ixgbe_dcb_82599.h"

error: patch failed: drivers/net/ixgbe/ixgbe_ethdev.h:4
error: drivers/net/ixgbe/ixgbe_ethdev.h: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_flow.c...
error: while searching for:

	rss = (const struct rte_flow_action_rss *)act->conf;

	if (!rss || !rss->num) {
		rte_flow_error_set(error, EINVAL,
				RTE_FLOW_ERROR_TYPE_ACTION,
				act,

error: patch failed: drivers/net/ixgbe/ixgbe_flow.c:2761
error: drivers/net/ixgbe/ixgbe_flow.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_rxtx.c...
Hunk #1 succeeded at 5710 (offset 35 lines).
error: while searching for:
	uint16_t j;
	uint16_t sp_reta_size;
	uint32_t reta_reg;
	struct rte_eth_rss_conf rss_conf = conf->rss_conf;
	struct ixgbe_filter_info *filter_info =
		IXGBE_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);


error: patch failed: drivers/net/ixgbe/ixgbe_rxtx.c:5684
error: drivers/net/ixgbe/ixgbe_rxtx.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4.c...
error: while searching for:
			     " for UDP RSS and inner VXLAN RSS");
			/* Fake support for all possible RSS hash fields. */
			priv->hw_rss_sup = ~UINT64_C(0);
			priv->hw_rss_sup = mlx4_conv_rss_hf(priv, -1);
			/* Filter out known unsupported fields. */
			priv->hw_rss_sup &=
				~(uint64_t)(IBV_RX_HASH_SRC_PORT_UDP |

error: patch failed: drivers/net/mlx4/mlx4.c:569
error: drivers/net/mlx4/mlx4.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_flow.c...
error: while searching for:
};

/**
 * Convert DPDK RSS hash fields to their Verbs equivalent.
 *
--
mlx4_conv_rss_hf(struct priv *priv, uint64_t rss_hf)
{
	enum { IPV4, IPV6, TCP, UDP, };
	const uint64_t in[] = {

error: patch failed: drivers/net/mlx4/mlx4_flow.c:76
error: drivers/net/mlx4/mlx4_flow.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_flow.h...
error: while searching for:

/* mlx4_flow.c */

uint64_t mlx4_conv_rss_hf(struct priv *priv, uint64_t rss_hf);
int mlx4_flow_sync(struct priv *priv, struct rte_flow_error *error);
void mlx4_flow_clean(struct priv *priv);
int mlx4_filter_ctrl(struct rte_eth_dev *dev,

error: patch failed: drivers/net/mlx4/mlx4_flow.h:47
error: drivers/net/mlx4/mlx4_flow.h: patch does not apply
Checking patch drivers/net/mlx4/mlx4_rxq.c...
error: while searching for:
 */
struct mlx4_rss *
mlx4_rss_get(struct priv *priv, uint64_t fields,
	     uint8_t key[MLX4_RSS_HASH_KEY_SIZE],
	     uint16_t queues, const uint16_t queue_id[])
{
	struct mlx4_rss *rss;

error: patch failed: drivers/net/mlx4/mlx4_rxq.c:88
error: drivers/net/mlx4/mlx4_rxq.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_rxtx.h...
error: while searching for:
int mlx4_rss_init(struct priv *priv);
void mlx4_rss_deinit(struct priv *priv);
struct mlx4_rss *mlx4_rss_get(struct priv *priv, uint64_t fields,
			      uint8_t key[MLX4_RSS_HASH_KEY_SIZE],
			      uint16_t queues, const uint16_t queue_id[]);
void mlx4_rss_put(struct mlx4_rss *rss);
int mlx4_rss_attach(struct mlx4_rss *rss);

error: patch failed: drivers/net/mlx4/mlx4_rxtx.h:126
error: drivers/net/mlx4/mlx4_rxtx.h: patch does not apply
Checking patch drivers/net/mlx5/mlx5_flow.c...
error: while searching for:
	TAILQ_ENTRY(rte_flow) next; /**< Pointer to the next flow structure. */
	uint32_t mark:1; /**< Set if the flow is marked. */
	uint32_t drop:1; /**< Drop queue. */
	uint16_t queues_n; /**< Number of entries in queue[]. */
	uint16_t (*queues)[]; /**< Queues indexes to use. */
	struct rte_eth_rss_conf rss_conf; /**< RSS configuration */
	uint8_t rss_key[40]; /**< copy of the RSS key. */
	struct ibv_counter_set *cs; /**< Holds the counters for the rule. */
	struct mlx5_flow_counter_stats counter_stats;/**<The counter stats. */

error: patch failed: drivers/net/mlx5/mlx5_flow.c:214
error: drivers/net/mlx5/mlx5_flow.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_rxq.c...
error: while searching for:
 *   The Verbs object initialised, NULL otherwise and rte_errno is set.
 */
struct mlx5_ind_table_ibv *
mlx5_ind_table_ibv_new(struct rte_eth_dev *dev, uint16_t queues[],
		       uint16_t queues_n)
{
	struct priv *priv = dev->data->dev_private;
	struct mlx5_ind_table_ibv *ind_tbl;

error: patch failed: drivers/net/mlx5/mlx5_rxq.c:1218
error: drivers/net/mlx5/mlx5_rxq.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_rxtx.h...
error: while searching for:
	LIST_ENTRY(mlx5_ind_table_ibv) next; /* Pointer to the next element. */
	rte_atomic32_t refcnt; /* Reference counter. */
	struct ibv_rwq_ind_table *ind_table; /**< Indirection table. */
	uint16_t queues_n; /**< Number of queues in the list. */
	uint16_t queues[]; /**< Queue list. */
};


error: patch failed: drivers/net/mlx5/mlx5_rxtx.h:134
error: drivers/net/mlx5/mlx5_rxtx.h: patch does not apply
Checking patch drivers/net/sfc/sfc_flow.c...
error: while searching for:
	struct sfc_rxq *rxq;
	unsigned int rxq_hw_index_min;
	unsigned int rxq_hw_index_max;
	const struct rte_eth_rss_conf *rss_conf = rss->rss_conf;
	uint64_t rss_hf;
--
	if (rss->num == 0)
		return -EINVAL;

	rxq_sw_index = sa->rxq_count - 1;

error: patch failed: drivers/net/sfc/sfc_flow.c:1234
error: drivers/net/sfc/sfc_flow.c: patch does not apply
Checking patch drivers/net/tap/tap_flow.c...
error: while searching for:
				if (err)
					goto exit_action_not_supported;
			}
			if (flow && rss)
				err = rss_add_actions(flow, pmd, rss, error);
		} else {
			goto exit_action_not_supported;

error: patch failed: drivers/net/tap/tap_flow.c:1215
error: drivers/net/tap/tap_flow.c: patch does not apply
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: lib/librte_ether/rte_flow.c: No such file or directory
Checking patch lib/librte_ether/rte_flow.h...
error: lib/librte_ether/rte_flow.h: No such file or directory
*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:1084
error: app/test-pmd/config.c: patch does not apply
Checking patch doc/guides/prog_guide/rte_flow.rst...
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 drivers/net/e1000/e1000_ethdev.h...
error: while searching for:

#ifndef _E1000_ETHDEV_H_
#define _E1000_ETHDEV_H_
#include <rte_time.h>
#include <rte_pci.h>


error: patch failed: drivers/net/e1000/e1000_ethdev.h:4
error: drivers/net/e1000/e1000_ethdev.h: patch does not apply
Checking patch drivers/net/e1000/igb_ethdev.c...
error: while searching for:
#define IGB_DEFAULT_TX_HTHRESH      1
#define IGB_DEFAULT_TX_WTHRESH      ((hw->mac.type == e1000_82576) ? 1 : 16)

#define IGB_HKEY_MAX_INDEX 10

/* Bit shift and mask */
#define IGB_4_BIT_WIDTH  (CHAR_BIT / 2)
#define IGB_4_BIT_MASK   RTE_LEN2MASK(IGB_4_BIT_WIDTH, uint8_t)

error: patch failed: drivers/net/e1000/igb_ethdev.c:41
error: drivers/net/e1000/igb_ethdev.c: patch does not apply
Checking patch drivers/net/e1000/igb_flow.c...
error: while searching for:

	rss = (const struct rte_flow_action_rss *)act->conf;

	if (!rss || !rss->num) {
		rte_flow_error_set(error, EINVAL,
				RTE_FLOW_ERROR_TYPE_ACTION,
				act,

error: patch failed: drivers/net/e1000/igb_flow.c:1292
error: drivers/net/e1000/igb_flow.c: patch does not apply
Checking patch drivers/net/e1000/igb_rxtx.c...
error: while searching for:
}

int
igb_config_rss_filter(struct rte_eth_dev *dev,
		struct igb_rte_flow_rss_conf *conf, bool add)
--
	struct rte_eth_rss_conf rss_conf = conf->rss_conf;
	struct e1000_filter_info *filter_info =
		E1000_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);
	struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);

error: patch failed: drivers/net/e1000/igb_rxtx.c:2898
error: drivers/net/e1000/igb_rxtx.c: patch does not apply
Checking patch drivers/net/i40e/i40e_ethdev.c...
error: while searching for:
#include <inttypes.h>
#include <assert.h>

#include <rte_eal.h>
#include <rte_string_fns.h>
#include <rte_pci.h>

error: patch failed: drivers/net/i40e/i40e_ethdev.c:11
error: drivers/net/i40e/i40e_ethdev.c: patch does not apply
Checking patch drivers/net/i40e/i40e_ethdev.h...
error: while searching for:
#ifndef _I40E_ETHDEV_H_
#define _I40E_ETHDEV_H_

#include <rte_eth_ctrl.h>
#include <rte_time.h>
--

#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...
error: while searching for:

	if (action_flag) {
		for (n = 0; n < 64; n++) {
			if (rss->rss_conf->rss_hf & (hf_bit << n)) {
				conf_info->region[0].hw_flowtype[0] = n;
				conf_info->region[0].flowtype_num = 1;
				conf_info->queue_region_number = 1;

error: patch failed: drivers/net/i40e/i40e_flow.c:4207
error: drivers/net/i40e/i40e_flow.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_ethdev.c...
error: while searching for:

#define IXGBE_QUEUE_STAT_COUNTERS (sizeof(hw_stats->qprc) / sizeof(hw_stats->qprc[0]))

#define IXGBE_HKEY_MAX_INDEX 10

/* Additional timesync values. */
#define NSEC_PER_SEC             1000000000L
#define IXGBE_INCVAL_10GB        0x66666666

error: patch failed: drivers/net/ixgbe/ixgbe_ethdev.c:100
error: drivers/net/ixgbe/ixgbe_ethdev.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_ethdev.h...
error: while searching for:

#ifndef _IXGBE_ETHDEV_H_
#define _IXGBE_ETHDEV_H_
#include "base/ixgbe_type.h"
#include "base/ixgbe_dcb.h"
#include "base/ixgbe_dcb_82599.h"

error: patch failed: drivers/net/ixgbe/ixgbe_ethdev.h:4
error: drivers/net/ixgbe/ixgbe_ethdev.h: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_flow.c...
error: while searching for:

	rss = (const struct rte_flow_action_rss *)act->conf;

	if (!rss || !rss->num) {
		rte_flow_error_set(error, EINVAL,
				RTE_FLOW_ERROR_TYPE_ACTION,
				act,

error: patch failed: drivers/net/ixgbe/ixgbe_flow.c:2761
error: drivers/net/ixgbe/ixgbe_flow.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_rxtx.c...
Hunk #1 succeeded at 5710 (offset 35 lines).
error: while searching for:
	uint16_t j;
	uint16_t sp_reta_size;
	uint32_t reta_reg;
	struct rte_eth_rss_conf rss_conf = conf->rss_conf;
	struct ixgbe_filter_info *filter_info =
		IXGBE_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);


error: patch failed: drivers/net/ixgbe/ixgbe_rxtx.c:5684
error: drivers/net/ixgbe/ixgbe_rxtx.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4.c...
error: while searching for:
			     " for UDP RSS and inner VXLAN RSS");
			/* Fake support for all possible RSS hash fields. */
			priv->hw_rss_sup = ~UINT64_C(0);
			priv->hw_rss_sup = mlx4_conv_rss_hf(priv, -1);
			/* Filter out known unsupported fields. */
			priv->hw_rss_sup &=
				~(uint64_t)(IBV_RX_HASH_SRC_PORT_UDP |

error: patch failed: drivers/net/mlx4/mlx4.c:569
error: drivers/net/mlx4/mlx4.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_flow.c...
error: while searching for:
};

/**
 * Convert DPDK RSS hash fields to their Verbs equivalent.
 *
--
mlx4_conv_rss_hf(struct priv *priv, uint64_t rss_hf)
{
	enum { IPV4, IPV6, TCP, UDP, };
	const uint64_t in[] = {

error: patch failed: drivers/net/mlx4/mlx4_flow.c:76
error: drivers/net/mlx4/mlx4_flow.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_flow.h...
error: while searching for:

/* mlx4_flow.c */

uint64_t mlx4_conv_rss_hf(struct priv *priv, uint64_t rss_hf);
int mlx4_flow_sync(struct priv *priv, struct rte_flow_error *error);
void mlx4_flow_clean(struct priv *priv);
int mlx4_filter_ctrl(struct rte_eth_dev *dev,

error: patch failed: drivers/net/mlx4/mlx4_flow.h:47
error: drivers/net/mlx4/mlx4_flow.h: patch does not apply
Checking patch drivers/net/mlx4/mlx4_rxq.c...
error: while searching for:
 */
struct mlx4_rss *
mlx4_rss_get(struct priv *priv, uint64_t fields,
	     uint8_t key[MLX4_RSS_HASH_KEY_SIZE],
	     uint16_t queues, const uint16_t queue_id[])
{
	struct mlx4_rss *rss;

error: patch failed: drivers/net/mlx4/mlx4_rxq.c:88
error: drivers/net/mlx4/mlx4_rxq.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_rxtx.h...
error: while searching for:
int mlx4_rss_init(struct priv *priv);
void mlx4_rss_deinit(struct priv *priv);
struct mlx4_rss *mlx4_rss_get(struct priv *priv, uint64_t fields,
			      uint8_t key[MLX4_RSS_HASH_KEY_SIZE],
			      uint16_t queues, const uint16_t queue_id[]);
void mlx4_rss_put(struct mlx4_rss *rss);
int mlx4_rss_attach(struct mlx4_rss *rss);

error: patch failed: drivers/net/mlx4/mlx4_rxtx.h:126
error: drivers/net/mlx4/mlx4_rxtx.h: patch does not apply
Checking patch drivers/net/mlx5/mlx5_flow.c...
error: while searching for:
	TAILQ_ENTRY(rte_flow) next; /**< Pointer to the next flow structure. */
	uint32_t mark:1; /**< Set if the flow is marked. */
	uint32_t drop:1; /**< Drop queue. */
	uint16_t queues_n; /**< Number of entries in queue[]. */
	uint16_t (*queues)[]; /**< Queues indexes to use. */
	struct rte_eth_rss_conf rss_conf; /**< RSS configuration */
	uint8_t rss_key[40]; /**< copy of the RSS key. */
	struct ibv_counter_set *cs; /**< Holds the counters for the rule. */
	struct mlx5_flow_counter_stats counter_stats;/**<The counter stats. */

error: patch failed: drivers/net/mlx5/mlx5_flow.c:214
error: drivers/net/mlx5/mlx5_flow.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_rxq.c...
error: while searching for:
 *   The Verbs object initialised, NULL otherwise and rte_errno is set.
 */
struct mlx5_ind_table_ibv *
mlx5_ind_table_ibv_new(struct rte_eth_dev *dev, uint16_t queues[],
		       uint16_t queues_n)
{
	struct priv *priv = dev->data->dev_private;
	struct mlx5_ind_table_ibv *ind_tbl;

error: patch failed: drivers/net/mlx5/mlx5_rxq.c:1218
error: drivers/net/mlx5/mlx5_rxq.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_rxtx.h...
error: while searching for:
	LIST_ENTRY(mlx5_ind_table_ibv) next; /* Pointer to the next element. */
	rte_atomic32_t refcnt; /* Reference counter. */
	struct ibv_rwq_ind_table *ind_table; /**< Indirection table. */
	uint16_t queues_n; /**< Number of queues in the list. */
	uint16_t queues[]; /**< Queue list. */
};


error: patch failed: drivers/net/mlx5/mlx5_rxtx.h:134
error: drivers/net/mlx5/mlx5_rxtx.h: patch does not apply
Checking patch drivers/net/sfc/sfc_flow.c...
error: while searching for:
	struct sfc_rxq *rxq;
	unsigned int rxq_hw_index_min;
	unsigned int rxq_hw_index_max;
	const struct rte_eth_rss_conf *rss_conf = rss->rss_conf;
	uint64_t rss_hf;
--
	if (rss->num == 0)
		return -EINVAL;

	rxq_sw_index = sa->rxq_count - 1;

error: patch failed: drivers/net/sfc/sfc_flow.c:1234
error: drivers/net/sfc/sfc_flow.c: patch does not apply
Checking patch drivers/net/tap/tap_flow.c...
error: while searching for:
				if (err)
					goto exit_action_not_supported;
			}
			if (flow && rss)
				err = rss_add_actions(flow, pmd, rss, error);
		} else {
			goto exit_action_not_supported;

error: patch failed: drivers/net/tap/tap_flow.c:1215
error: drivers/net/tap/tap_flow.c: patch does not apply
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: lib/librte_ether/rte_flow.c: No such file or directory
Checking patch lib/librte_ether/rte_flow.h...
error: lib/librte_ether/rte_flow.h: No such file or directory
*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:1084
error: app/test-pmd/config.c: patch does not apply
Checking patch doc/guides/prog_guide/rte_flow.rst...
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 drivers/net/e1000/e1000_ethdev.h...
error: while searching for:

#ifndef _E1000_ETHDEV_H_
#define _E1000_ETHDEV_H_
#include <rte_time.h>
#include <rte_pci.h>


error: patch failed: drivers/net/e1000/e1000_ethdev.h:4
error: drivers/net/e1000/e1000_ethdev.h: patch does not apply
Checking patch drivers/net/e1000/igb_ethdev.c...
error: while searching for:
#define IGB_DEFAULT_TX_HTHRESH      1
#define IGB_DEFAULT_TX_WTHRESH      ((hw->mac.type == e1000_82576) ? 1 : 16)

#define IGB_HKEY_MAX_INDEX 10

/* Bit shift and mask */
#define IGB_4_BIT_WIDTH  (CHAR_BIT / 2)
#define IGB_4_BIT_MASK   RTE_LEN2MASK(IGB_4_BIT_WIDTH, uint8_t)

error: patch failed: drivers/net/e1000/igb_ethdev.c:41
error: drivers/net/e1000/igb_ethdev.c: patch does not apply
Checking patch drivers/net/e1000/igb_flow.c...
error: while searching for:

	rss = (const struct rte_flow_action_rss *)act->conf;

	if (!rss || !rss->num) {
		rte_flow_error_set(error, EINVAL,
				RTE_FLOW_ERROR_TYPE_ACTION,
				act,

error: patch failed: drivers/net/e1000/igb_flow.c:1292
error: drivers/net/e1000/igb_flow.c: patch does not apply
Checking patch drivers/net/e1000/igb_rxtx.c...
error: while searching for:
}

int
igb_config_rss_filter(struct rte_eth_dev *dev,
		struct igb_rte_flow_rss_conf *conf, bool add)
--
	struct rte_eth_rss_conf rss_conf = conf->rss_conf;
	struct e1000_filter_info *filter_info =
		E1000_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);
	struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);

error: patch failed: drivers/net/e1000/igb_rxtx.c:2898
error: drivers/net/e1000/igb_rxtx.c: patch does not apply
Checking patch drivers/net/i40e/i40e_ethdev.c...
error: while searching for:
#include <inttypes.h>
#include <assert.h>

#include <rte_eal.h>
#include <rte_string_fns.h>
#include <rte_pci.h>

error: patch failed: drivers/net/i40e/i40e_ethdev.c:11
error: drivers/net/i40e/i40e_ethdev.c: patch does not apply
Checking patch drivers/net/i40e/i40e_ethdev.h...
error: while searching for:
#ifndef _I40E_ETHDEV_H_
#define _I40E_ETHDEV_H_

#include <rte_eth_ctrl.h>
#include <rte_time.h>
--

#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...
error: while searching for:

	if (action_flag) {
		for (n = 0; n < 64; n++) {
			if (rss->rss_conf->rss_hf & (hf_bit << n)) {
				conf_info->region[0].hw_flowtype[0] = n;
				conf_info->region[0].flowtype_num = 1;
				conf_info->queue_region_number = 1;

error: patch failed: drivers/net/i40e/i40e_flow.c:4207
error: drivers/net/i40e/i40e_flow.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_ethdev.c...
error: while searching for:

#define IXGBE_QUEUE_STAT_COUNTERS (sizeof(hw_stats->qprc) / sizeof(hw_stats->qprc[0]))

#define IXGBE_HKEY_MAX_INDEX 10

/* Additional timesync values. */
#define NSEC_PER_SEC             1000000000L
#define IXGBE_INCVAL_10GB        0x66666666

error: patch failed: drivers/net/ixgbe/ixgbe_ethdev.c:100
error: drivers/net/ixgbe/ixgbe_ethdev.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_ethdev.h...
error: while searching for:

#ifndef _IXGBE_ETHDEV_H_
#define _IXGBE_ETHDEV_H_
#include "base/ixgbe_type.h"
#include "base/ixgbe_dcb.h"
#include "base/ixgbe_dcb_82599.h"

error: patch failed: drivers/net/ixgbe/ixgbe_ethdev.h:4
error: drivers/net/ixgbe/ixgbe_ethdev.h: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_flow.c...
error: while searching for:

	rss = (const struct rte_flow_action_rss *)act->conf;

	if (!rss || !rss->num) {
		rte_flow_error_set(error, EINVAL,
				RTE_FLOW_ERROR_TYPE_ACTION,
				act,

error: patch failed: drivers/net/ixgbe/ixgbe_flow.c:2761
error: drivers/net/ixgbe/ixgbe_flow.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_rxtx.c...
Hunk #1 succeeded at 5655 (offset -20 lines).
error: while searching for:
	uint16_t j;
	uint16_t sp_reta_size;
	uint32_t reta_reg;
	struct rte_eth_rss_conf rss_conf = conf->rss_conf;
	struct ixgbe_filter_info *filter_info =
		IXGBE_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);


error: patch failed: drivers/net/ixgbe/ixgbe_rxtx.c:5684
error: drivers/net/ixgbe/ixgbe_rxtx.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4.c...
error: while searching for:
			     " for UDP RSS and inner VXLAN RSS");
			/* Fake support for all possible RSS hash fields. */
			priv->hw_rss_sup = ~UINT64_C(0);
			priv->hw_rss_sup = mlx4_conv_rss_hf(priv, -1);
			/* Filter out known unsupported fields. */
			priv->hw_rss_sup &=
				~(uint64_t)(IBV_RX_HASH_SRC_PORT_UDP |

error: patch failed: drivers/net/mlx4/mlx4.c:569
error: drivers/net/mlx4/mlx4.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_flow.c...
error: while searching for:
};

/**
 * Convert DPDK RSS hash fields to their Verbs equivalent.
 *
--
mlx4_conv_rss_hf(struct priv *priv, uint64_t rss_hf)
{
	enum { IPV4, IPV6, TCP, UDP, };
	const uint64_t in[] = {

error: patch failed: drivers/net/mlx4/mlx4_flow.c:76
error: drivers/net/mlx4/mlx4_flow.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_flow.h...
error: while searching for:

/* mlx4_flow.c */

uint64_t mlx4_conv_rss_hf(struct priv *priv, uint64_t rss_hf);
int mlx4_flow_sync(struct priv *priv, struct rte_flow_error *error);
void mlx4_flow_clean(struct priv *priv);
int mlx4_filter_ctrl(struct rte_eth_dev *dev,

error: patch failed: drivers/net/mlx4/mlx4_flow.h:47
error: drivers/net/mlx4/mlx4_flow.h: patch does not apply
Checking patch drivers/net/mlx4/mlx4_rxq.c...
error: while searching for:
 */
struct mlx4_rss *
mlx4_rss_get(struct priv *priv, uint64_t fields,
	     uint8_t key[MLX4_RSS_HASH_KEY_SIZE],
	     uint16_t queues, const uint16_t queue_id[])
{
	struct mlx4_rss *rss;

error: patch failed: drivers/net/mlx4/mlx4_rxq.c:88
error: drivers/net/mlx4/mlx4_rxq.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_rxtx.h...
error: while searching for:
int mlx4_rss_init(struct priv *priv);
void mlx4_rss_deinit(struct priv *priv);
struct mlx4_rss *mlx4_rss_get(struct priv *priv, uint64_t fields,
			      uint8_t key[MLX4_RSS_HASH_KEY_SIZE],
			      uint16_t queues, const uint16_t queue_id[]);
void mlx4_rss_put(struct mlx4_rss *rss);
int mlx4_rss_attach(struct mlx4_rss *rss);

error: patch failed: drivers/net/mlx4/mlx4_rxtx.h:126
error: drivers/net/mlx4/mlx4_rxtx.h: patch does not apply
Checking patch drivers/net/mlx5/mlx5_flow.c...
error: while searching for:
	TAILQ_ENTRY(rte_flow) next; /**< Pointer to the next flow structure. */
	uint32_t mark:1; /**< Set if the flow is marked. */
	uint32_t drop:1; /**< Drop queue. */
	uint16_t queues_n; /**< Number of entries in queue[]. */
	uint16_t (*queues)[]; /**< Queues indexes to use. */
	struct rte_eth_rss_conf rss_conf; /**< RSS configuration */
	uint8_t rss_key[40]; /**< copy of the RSS key. */
	struct ibv_counter_set *cs; /**< Holds the counters for the rule. */
	struct mlx5_flow_counter_stats counter_stats;/**<The counter stats. */

error: patch failed: drivers/net/mlx5/mlx5_flow.c:214
error: drivers/net/mlx5/mlx5_flow.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_rxq.c...
error: while searching for:
 *   The Verbs object initialised, NULL otherwise and rte_errno is set.
 */
struct mlx5_ind_table_ibv *
mlx5_ind_table_ibv_new(struct rte_eth_dev *dev, uint16_t queues[],
		       uint16_t queues_n)
{
	struct priv *priv = dev->data->dev_private;
	struct mlx5_ind_table_ibv *ind_tbl;

error: patch failed: drivers/net/mlx5/mlx5_rxq.c:1218
error: drivers/net/mlx5/mlx5_rxq.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_rxtx.h...
error: while searching for:
	LIST_ENTRY(mlx5_ind_table_ibv) next; /* Pointer to the next element. */
	rte_atomic32_t refcnt; /* Reference counter. */
	struct ibv_rwq_ind_table *ind_table; /**< Indirection table. */
	uint16_t queues_n; /**< Number of queues in the list. */
	uint16_t queues[]; /**< Queue list. */
};


error: patch failed: drivers/net/mlx5/mlx5_rxtx.h:134
error: drivers/net/mlx5/mlx5_rxtx.h: patch does not apply
Checking patch drivers/net/sfc/sfc_flow.c...
error: while searching for:
	struct sfc_rxq *rxq;
	unsigned int rxq_hw_index_min;
	unsigned int rxq_hw_index_max;
	const struct rte_eth_rss_conf *rss_conf = rss->rss_conf;
	uint64_t rss_hf;
--
	if (rss->num == 0)
		return -EINVAL;

	rxq_sw_index = sa->rxq_count - 1;

error: patch failed: drivers/net/sfc/sfc_flow.c:1234
error: drivers/net/sfc/sfc_flow.c: patch does not apply
Checking patch drivers/net/tap/tap_flow.c...
error: while searching for:
				if (err)
					goto exit_action_not_supported;
			}
			if (flow && rss)
				err = rss_add_actions(flow, pmd, rss, error);
		} else {
			goto exit_action_not_supported;

error: patch failed: drivers/net/tap/tap_flow.c:1215
error: drivers/net/tap/tap_flow.c: patch does not apply
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: lib/librte_ether/rte_flow.c: No such file or directory
Checking patch lib/librte_ether/rte_flow.h...
error: lib/librte_ether/rte_flow.h: No such file or directory
*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:1084
error: app/test-pmd/config.c: patch does not apply
Checking patch doc/guides/prog_guide/rte_flow.rst...
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 drivers/net/e1000/e1000_ethdev.h...
error: while searching for:

#ifndef _E1000_ETHDEV_H_
#define _E1000_ETHDEV_H_
#include <rte_time.h>
#include <rte_pci.h>


error: patch failed: drivers/net/e1000/e1000_ethdev.h:4
error: drivers/net/e1000/e1000_ethdev.h: patch does not apply
Checking patch drivers/net/e1000/igb_ethdev.c...
error: while searching for:
#define IGB_DEFAULT_TX_HTHRESH      1
#define IGB_DEFAULT_TX_WTHRESH      ((hw->mac.type == e1000_82576) ? 1 : 16)

#define IGB_HKEY_MAX_INDEX 10

/* Bit shift and mask */
#define IGB_4_BIT_WIDTH  (CHAR_BIT / 2)
#define IGB_4_BIT_MASK   RTE_LEN2MASK(IGB_4_BIT_WIDTH, uint8_t)

error: patch failed: drivers/net/e1000/igb_ethdev.c:41
error: drivers/net/e1000/igb_ethdev.c: patch does not apply
Checking patch drivers/net/e1000/igb_flow.c...
error: while searching for:

	rss = (const struct rte_flow_action_rss *)act->conf;

	if (!rss || !rss->num) {
		rte_flow_error_set(error, EINVAL,
				RTE_FLOW_ERROR_TYPE_ACTION,
				act,

error: patch failed: drivers/net/e1000/igb_flow.c:1292
error: drivers/net/e1000/igb_flow.c: patch does not apply
Checking patch drivers/net/e1000/igb_rxtx.c...
error: while searching for:
}

int
igb_config_rss_filter(struct rte_eth_dev *dev,
		struct igb_rte_flow_rss_conf *conf, bool add)
--
	struct rte_eth_rss_conf rss_conf = conf->rss_conf;
	struct e1000_filter_info *filter_info =
		E1000_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);
	struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);

error: patch failed: drivers/net/e1000/igb_rxtx.c:2898
error: drivers/net/e1000/igb_rxtx.c: patch does not apply
Checking patch drivers/net/i40e/i40e_ethdev.c...
error: while searching for:
#include <inttypes.h>
#include <assert.h>

#include <rte_eal.h>
#include <rte_string_fns.h>
#include <rte_pci.h>

error: patch failed: drivers/net/i40e/i40e_ethdev.c:11
error: drivers/net/i40e/i40e_ethdev.c: patch does not apply
Checking patch drivers/net/i40e/i40e_ethdev.h...
error: while searching for:
#ifndef _I40E_ETHDEV_H_
#define _I40E_ETHDEV_H_

#include <rte_eth_ctrl.h>
#include <rte_time.h>
--

#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...
error: while searching for:

	if (action_flag) {
		for (n = 0; n < 64; n++) {
			if (rss->rss_conf->rss_hf & (hf_bit << n)) {
				conf_info->region[0].hw_flowtype[0] = n;
				conf_info->region[0].flowtype_num = 1;
				conf_info->queue_region_number = 1;

error: patch failed: drivers/net/i40e/i40e_flow.c:4207
error: drivers/net/i40e/i40e_flow.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_ethdev.c...
error: while searching for:

#define IXGBE_QUEUE_STAT_COUNTERS (sizeof(hw_stats->qprc) / sizeof(hw_stats->qprc[0]))

#define IXGBE_HKEY_MAX_INDEX 10

/* Additional timesync values. */
#define NSEC_PER_SEC             1000000000L
#define IXGBE_INCVAL_10GB        0x66666666

error: patch failed: drivers/net/ixgbe/ixgbe_ethdev.c:100
error: drivers/net/ixgbe/ixgbe_ethdev.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_ethdev.h...
error: while searching for:

#ifndef _IXGBE_ETHDEV_H_
#define _IXGBE_ETHDEV_H_
#include "base/ixgbe_type.h"
#include "base/ixgbe_dcb.h"
#include "base/ixgbe_dcb_82599.h"

error: patch failed: drivers/net/ixgbe/ixgbe_ethdev.h:4
error: drivers/net/ixgbe/ixgbe_ethdev.h: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_flow.c...
error: while searching for:

	rss = (const struct rte_flow_action_rss *)act->conf;

	if (!rss || !rss->num) {
		rte_flow_error_set(error, EINVAL,
				RTE_FLOW_ERROR_TYPE_ACTION,
				act,

error: patch failed: drivers/net/ixgbe/ixgbe_flow.c:2761
error: drivers/net/ixgbe/ixgbe_flow.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_rxtx.c...
Hunk #1 succeeded at 5710 (offset 35 lines).
error: while searching for:
	uint16_t j;
	uint16_t sp_reta_size;
	uint32_t reta_reg;
	struct rte_eth_rss_conf rss_conf = conf->rss_conf;
	struct ixgbe_filter_info *filter_info =
		IXGBE_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);


error: patch failed: drivers/net/ixgbe/ixgbe_rxtx.c:5684
error: drivers/net/ixgbe/ixgbe_rxtx.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4.c...
error: while searching for:
			     " for UDP RSS and inner VXLAN RSS");
			/* Fake support for all possible RSS hash fields. */
			priv->hw_rss_sup = ~UINT64_C(0);
			priv->hw_rss_sup = mlx4_conv_rss_hf(priv, -1);
			/* Filter out known unsupported fields. */
			priv->hw_rss_sup &=
				~(uint64_t)(IBV_RX_HASH_SRC_PORT_UDP |

error: patch failed: drivers/net/mlx4/mlx4.c:569
error: drivers/net/mlx4/mlx4.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_flow.c...
error: while searching for:
};

/**
 * Convert DPDK RSS hash fields to their Verbs equivalent.
 *
--
mlx4_conv_rss_hf(struct priv *priv, uint64_t rss_hf)
{
	enum { IPV4, IPV6, TCP, UDP, };
	const uint64_t in[] = {

error: patch failed: drivers/net/mlx4/mlx4_flow.c:76
error: drivers/net/mlx4/mlx4_flow.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_flow.h...
error: while searching for:

/* mlx4_flow.c */

uint64_t mlx4_conv_rss_hf(struct priv *priv, uint64_t rss_hf);
int mlx4_flow_sync(struct priv *priv, struct rte_flow_error *error);
void mlx4_flow_clean(struct priv *priv);
int mlx4_filter_ctrl(struct rte_eth_dev *dev,

error: patch failed: drivers/net/mlx4/mlx4_flow.h:47
error: drivers/net/mlx4/mlx4_flow.h: patch does not apply
Checking patch drivers/net/mlx4/mlx4_rxq.c...
error: while searching for:
 */
struct mlx4_rss *
mlx4_rss_get(struct priv *priv, uint64_t fields,
	     uint8_t key[MLX4_RSS_HASH_KEY_SIZE],
	     uint16_t queues, const uint16_t queue_id[])
{
	struct mlx4_rss *rss;

error: patch failed: drivers/net/mlx4/mlx4_rxq.c:88
error: drivers/net/mlx4/mlx4_rxq.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_rxtx.h...
error: while searching for:
int mlx4_rss_init(struct priv *priv);
void mlx4_rss_deinit(struct priv *priv);
struct mlx4_rss *mlx4_rss_get(struct priv *priv, uint64_t fields,
			      uint8_t key[MLX4_RSS_HASH_KEY_SIZE],
			      uint16_t queues, const uint16_t queue_id[]);
void mlx4_rss_put(struct mlx4_rss *rss);
int mlx4_rss_attach(struct mlx4_rss *rss);

error: patch failed: drivers/net/mlx4/mlx4_rxtx.h:126
error: drivers/net/mlx4/mlx4_rxtx.h: patch does not apply
Checking patch drivers/net/mlx5/mlx5_flow.c...
error: while searching for:
	TAILQ_ENTRY(rte_flow) next; /**< Pointer to the next flow structure. */
	uint32_t mark:1; /**< Set if the flow is marked. */
	uint32_t drop:1; /**< Drop queue. */
	uint16_t queues_n; /**< Number of entries in queue[]. */
	uint16_t (*queues)[]; /**< Queues indexes to use. */
	struct rte_eth_rss_conf rss_conf; /**< RSS configuration */
	uint8_t rss_key[40]; /**< copy of the RSS key. */
	struct ibv_counter_set *cs; /**< Holds the counters for the rule. */
	struct mlx5_flow_counter_stats counter_stats;/**<The counter stats. */

error: patch failed: drivers/net/mlx5/mlx5_flow.c:214
error: drivers/net/mlx5/mlx5_flow.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_rxq.c...
error: while searching for:
 *   The Verbs object initialised, NULL otherwise and rte_errno is set.
 */
struct mlx5_ind_table_ibv *
mlx5_ind_table_ibv_new(struct rte_eth_dev *dev, uint16_t queues[],
		       uint16_t queues_n)
{
	struct priv *priv = dev->data->dev_private;
	struct mlx5_ind_table_ibv *ind_tbl;

error: patch failed: drivers/net/mlx5/mlx5_rxq.c:1218
error: drivers/net/mlx5/mlx5_rxq.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_rxtx.h...
error: while searching for:
	LIST_ENTRY(mlx5_ind_table_ibv) next; /* Pointer to the next element. */
	rte_atomic32_t refcnt; /* Reference counter. */
	struct ibv_rwq_ind_table *ind_table; /**< Indirection table. */
	uint16_t queues_n; /**< Number of queues in the list. */
	uint16_t queues[]; /**< Queue list. */
};


error: patch failed: drivers/net/mlx5/mlx5_rxtx.h:134
error: drivers/net/mlx5/mlx5_rxtx.h: patch does not apply
Checking patch drivers/net/sfc/sfc_flow.c...
error: while searching for:
	struct sfc_rxq *rxq;
	unsigned int rxq_hw_index_min;
	unsigned int rxq_hw_index_max;
	const struct rte_eth_rss_conf *rss_conf = rss->rss_conf;
	uint64_t rss_hf;
--
	if (rss->num == 0)
		return -EINVAL;

	rxq_sw_index = sa->rxq_count - 1;

error: patch failed: drivers/net/sfc/sfc_flow.c:1234
error: drivers/net/sfc/sfc_flow.c: patch does not apply
Checking patch drivers/net/tap/tap_flow.c...
error: while searching for:
				if (err)
					goto exit_action_not_supported;
			}
			if (flow && rss)
				err = rss_add_actions(flow, pmd, rss, error);
		} else {
			goto exit_action_not_supported;

error: patch failed: drivers/net/tap/tap_flow.c:1215
error: drivers/net/tap/tap_flow.c: patch does not apply
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: lib/librte_ether/rte_flow.c: No such file or directory
Checking patch lib/librte_ether/rte_flow.h...
error: lib/librte_ether/rte_flow.h: No such file or directory
*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:1084
error: app/test-pmd/config.c: patch does not apply
Checking patch doc/guides/prog_guide/rte_flow.rst...
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 drivers/net/e1000/e1000_ethdev.h...
error: while searching for:

#ifndef _E1000_ETHDEV_H_
#define _E1000_ETHDEV_H_
#include <rte_time.h>
#include <rte_pci.h>


error: patch failed: drivers/net/e1000/e1000_ethdev.h:4
error: drivers/net/e1000/e1000_ethdev.h: patch does not apply
Checking patch drivers/net/e1000/igb_ethdev.c...
error: while searching for:
#define IGB_DEFAULT_TX_HTHRESH      1
#define IGB_DEFAULT_TX_WTHRESH      ((hw->mac.type == e1000_82576) ? 1 : 16)

#define IGB_HKEY_MAX_INDEX 10

/* Bit shift and mask */
#define IGB_4_BIT_WIDTH  (CHAR_BIT / 2)
#define IGB_4_BIT_MASK   RTE_LEN2MASK(IGB_4_BIT_WIDTH, uint8_t)

error: patch failed: drivers/net/e1000/igb_ethdev.c:41
error: drivers/net/e1000/igb_ethdev.c: patch does not apply
Checking patch drivers/net/e1000/igb_flow.c...
error: while searching for:

	rss = (const struct rte_flow_action_rss *)act->conf;

	if (!rss || !rss->num) {
		rte_flow_error_set(error, EINVAL,
				RTE_FLOW_ERROR_TYPE_ACTION,
				act,

error: patch failed: drivers/net/e1000/igb_flow.c:1292
error: drivers/net/e1000/igb_flow.c: patch does not apply
Checking patch drivers/net/e1000/igb_rxtx.c...
error: while searching for:
}

int
igb_config_rss_filter(struct rte_eth_dev *dev,
		struct igb_rte_flow_rss_conf *conf, bool add)
--
	struct rte_eth_rss_conf rss_conf = conf->rss_conf;
	struct e1000_filter_info *filter_info =
		E1000_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);
	struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);

error: patch failed: drivers/net/e1000/igb_rxtx.c:2898
error: drivers/net/e1000/igb_rxtx.c: patch does not apply
Checking patch drivers/net/i40e/i40e_ethdev.c...
error: while searching for:
#include <inttypes.h>
#include <assert.h>

#include <rte_eal.h>
#include <rte_string_fns.h>
#include <rte_pci.h>

error: patch failed: drivers/net/i40e/i40e_ethdev.c:11
error: drivers/net/i40e/i40e_ethdev.c: patch does not apply
Checking patch drivers/net/i40e/i40e_ethdev.h...
error: while searching for:
#ifndef _I40E_ETHDEV_H_
#define _I40E_ETHDEV_H_

#include <rte_eth_ctrl.h>
#include <rte_time.h>
--

#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...
error: while searching for:

	if (action_flag) {
		for (n = 0; n < 64; n++) {
			if (rss->rss_conf->rss_hf & (hf_bit << n)) {
				conf_info->region[0].hw_flowtype[0] = n;
				conf_info->region[0].flowtype_num = 1;
				conf_info->queue_region_number = 1;

error: patch failed: drivers/net/i40e/i40e_flow.c:4207
error: drivers/net/i40e/i40e_flow.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_ethdev.c...
error: while searching for:

#define IXGBE_QUEUE_STAT_COUNTERS (sizeof(hw_stats->qprc) / sizeof(hw_stats->qprc[0]))

#define IXGBE_HKEY_MAX_INDEX 10

/* Additional timesync values. */
#define NSEC_PER_SEC             1000000000L
#define IXGBE_INCVAL_10GB        0x66666666

error: patch failed: drivers/net/ixgbe/ixgbe_ethdev.c:100
error: drivers/net/ixgbe/ixgbe_ethdev.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_ethdev.h...
error: while searching for:

#ifndef _IXGBE_ETHDEV_H_
#define _IXGBE_ETHDEV_H_
#include "base/ixgbe_type.h"
#include "base/ixgbe_dcb.h"
#include "base/ixgbe_dcb_82599.h"

error: patch failed: drivers/net/ixgbe/ixgbe_ethdev.h:4
error: drivers/net/ixgbe/ixgbe_ethdev.h: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_flow.c...
error: while searching for:

	rss = (const struct rte_flow_action_rss *)act->conf;

	if (!rss || !rss->num) {
		rte_flow_error_set(error, EINVAL,
				RTE_FLOW_ERROR_TYPE_ACTION,
				act,

error: patch failed: drivers/net/ixgbe/ixgbe_flow.c:2761
error: drivers/net/ixgbe/ixgbe_flow.c: patch does not apply
Checking patch drivers/net/ixgbe/ixgbe_rxtx.c...
Hunk #1 succeeded at 5710 (offset 35 lines).
error: while searching for:
	uint16_t j;
	uint16_t sp_reta_size;
	uint32_t reta_reg;
	struct rte_eth_rss_conf rss_conf = conf->rss_conf;
	struct ixgbe_filter_info *filter_info =
		IXGBE_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);


error: patch failed: drivers/net/ixgbe/ixgbe_rxtx.c:5684
error: drivers/net/ixgbe/ixgbe_rxtx.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4.c...
error: while searching for:
			     " for UDP RSS and inner VXLAN RSS");
			/* Fake support for all possible RSS hash fields. */
			priv->hw_rss_sup = ~UINT64_C(0);
			priv->hw_rss_sup = mlx4_conv_rss_hf(priv, -1);
			/* Filter out known unsupported fields. */
			priv->hw_rss_sup &=
				~(uint64_t)(IBV_RX_HASH_SRC_PORT_UDP |

error: patch failed: drivers/net/mlx4/mlx4.c:569
error: drivers/net/mlx4/mlx4.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_flow.c...
error: while searching for:
};

/**
 * Convert DPDK RSS hash fields to their Verbs equivalent.
 *
--
mlx4_conv_rss_hf(struct priv *priv, uint64_t rss_hf)
{
	enum { IPV4, IPV6, TCP, UDP, };
	const uint64_t in[] = {

error: patch failed: drivers/net/mlx4/mlx4_flow.c:76
error: drivers/net/mlx4/mlx4_flow.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_flow.h...
error: while searching for:

/* mlx4_flow.c */

uint64_t mlx4_conv_rss_hf(struct priv *priv, uint64_t rss_hf);
int mlx4_flow_sync(struct priv *priv, struct rte_flow_error *error);
void mlx4_flow_clean(struct priv *priv);
int mlx4_filter_ctrl(struct rte_eth_dev *dev,

error: patch failed: drivers/net/mlx4/mlx4_flow.h:47
error: drivers/net/mlx4/mlx4_flow.h: patch does not apply
Checking patch drivers/net/mlx4/mlx4_rxq.c...
error: while searching for:
 */
struct mlx4_rss *
mlx4_rss_get(struct priv *priv, uint64_t fields,
	     uint8_t key[MLX4_RSS_HASH_KEY_SIZE],
	     uint16_t queues, const uint16_t queue_id[])
{
	struct mlx4_rss *rss;

error: patch failed: drivers/net/mlx4/mlx4_rxq.c:88
error: drivers/net/mlx4/mlx4_rxq.c: patch does not apply
Checking patch drivers/net/mlx4/mlx4_rxtx.h...
error: while searching for:
int mlx4_rss_init(struct priv *priv);
void mlx4_rss_deinit(struct priv *priv);
struct mlx4_rss *mlx4_rss_get(struct priv *priv, uint64_t fields,
			      uint8_t key[MLX4_RSS_HASH_KEY_SIZE],
			      uint16_t queues, const uint16_t queue_id[]);
void mlx4_rss_put(struct mlx4_rss *rss);
int mlx4_rss_attach(struct mlx4_rss *rss);

error: patch failed: drivers/net/mlx4/mlx4_rxtx.h:126
error: drivers/net/mlx4/mlx4_rxtx.h: patch does not apply
Checking patch drivers/net/mlx5/mlx5_flow.c...
error: while searching for:
	TAILQ_ENTRY(rte_flow) next; /**< Pointer to the next flow structure. */
	uint32_t mark:1; /**< Set if the flow is marked. */
	uint32_t drop:1; /**< Drop queue. */
	uint16_t queues_n; /**< Number of entries in queue[]. */
	uint16_t (*queues)[]; /**< Queues indexes to use. */
	struct rte_eth_rss_conf rss_conf; /**< RSS configuration */
	uint8_t rss_key[40]; /**< copy of the RSS key. */
	struct ibv_counter_set *cs; /**< Holds the counters for the rule. */
	struct mlx5_flow_counter_stats counter_stats;/**<The counter stats. */

error: patch failed: drivers/net/mlx5/mlx5_flow.c:214
error: drivers/net/mlx5/mlx5_flow.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_rxq.c...
error: while searching for:
 *   The Verbs object initialised, NULL otherwise and rte_errno is set.
 */
struct mlx5_ind_table_ibv *
mlx5_ind_table_ibv_new(struct rte_eth_dev *dev, uint16_t queues[],
		       uint16_t queues_n)
{
	struct priv *priv = dev->data->dev_private;
	struct mlx5_ind_table_ibv *ind_tbl;

error: patch failed: drivers/net/mlx5/mlx5_rxq.c:1218
error: drivers/net/mlx5/mlx5_rxq.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_rxtx.h...
error: while searching for:
	LIST_ENTRY(mlx5_ind_table_ibv) next; /* Pointer to the next element. */
	rte_atomic32_t refcnt; /* Reference counter. */
	struct ibv_rwq_ind_table *ind_table; /**< Indirection table. */
	uint16_t queues_n; /**< Number of queues in the list. */
	uint16_t queues[]; /**< Queue list. */
};


error: patch failed: drivers/net/mlx5/mlx5_rxtx.h:134
error: drivers/net/mlx5/mlx5_rxtx.h: patch does not apply
Checking patch drivers/net/sfc/sfc_flow.c...
error: while searching for:
	struct sfc_rxq *rxq;
	unsigned int rxq_hw_index_min;
	unsigned int rxq_hw_index_max;
	const struct rte_eth_rss_conf *rss_conf = rss->rss_conf;
	uint64_t rss_hf;
--
	if (rss->num == 0)
		return -EINVAL;

	rxq_sw_index = sa->rxq_count - 1;

error: patch failed: drivers/net/sfc/sfc_flow.c:1234
error: drivers/net/sfc/sfc_flow.c: patch does not apply
Checking patch drivers/net/tap/tap_flow.c...
error: while searching for:
				if (err)
					goto exit_action_not_supported;
			}
			if (flow && rss)
				err = rss_add_actions(flow, pmd, rss, error);
		} else {
			goto exit_action_not_supported;

error: patch failed: drivers/net/tap/tap_flow.c:1215
error: drivers/net/tap/tap_flow.c: patch does not apply
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: lib/librte_ether/rte_flow.c: No such file or directory
Checking patch lib/librte_ether/rte_flow.h...
error: lib/librte_ether/rte_flow.h: No such file or directory

DPDK STV team

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2018-05-10  8:10 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-10  8:10 [dpdk-test-report] |FAILURE| pw37397[dpdk-dev, v2, 07/15] ethdev: flatten RSS configuration in flow API sys_stv

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).