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

_apply issues_

Submitter: Ori Kam <orika@mellanox.com>
Date: 2019-05-01 20:40:45
Reply_mail: 1556743245-138357-1-git-send-email-orika@mellanox.com
DPDK git baseline:
	Repo:dpdk-master, CommitID: 46155cb49a61423ab67095c786f83a6d57a1891b
	Repo:dpdk-next-eventdev, CommitID: 7a1ccc24874e251957513aba0520500f873e276a
	Repo:dpdk-next-net, CommitID: 23e4b468ed540108e775dd0406ae22d8611bc0a3
	Repo:dpdk-next-crypto, CommitID: 035c9fb61cb3d1053bdb291d45a0ca13a69230f6
	Repo:dpdk-next-virtio, CommitID: 4a3c54c92a2ca4bbbc46eaa331e71c2ec4d00cc9

*Repo: dpdk-master
Checking patch drivers/net/mlx5/Makefile...
error: while searching for:
	$Q sh -- '$<' '$@' \
		HAVE_MLX5DV_DR \
		infiniband/mlx5dv.h \
		enum MLX5DV_DR_NS_TYPE_TERMINATING \
		$(AUTOCONF_OUTPUT)
--
		enum MLX5DV_DR_NS_DOMAIN_FDB_BYPASS \
		$(AUTOCONF_OUTPUT)
	$Q sh -- '$<' '$@' \
		HAVE_IBV_DEVX_OBJ \

error: patch failed: drivers/net/mlx5/Makefile:158
error: drivers/net/mlx5/Makefile: patch does not apply
Checking patch drivers/net/mlx5/meson.build...
error: while searching for:
		[ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',
		'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
		[ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h',
		'MLX5DV_DR_NS_TYPE_TERMINATING' ],
		[ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h',
		'MLX5DV_DR_NS_DOMAIN_FDB_BYPASS' ],
		[ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
		'SUPPORTED_40000baseKR4_Full' ],
		[ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',

error: patch failed: drivers/net/mlx5/meson.build:115
error: drivers/net/mlx5/meson.build: patch does not apply
Checking patch drivers/net/mlx5/mlx5.c...
error: while searching for:
#ifdef HAVE_MLX5DV_DR
	struct mlx5_ibv_shared *sh = priv->sh;
	int err = 0;
	void *ns;

	assert(sh);
	if (sh->dv_refcnt) {

error: patch failed: drivers/net/mlx5/mlx5.c:342
error: drivers/net/mlx5/mlx5.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5.h...
error: while searching for:
	/* Shared DV/DR flow data section. */
	pthread_mutex_t dv_mutex; /* DV context mutex. */
	uint32_t dv_refcnt; /* DV/DR data reference counter. */
	void *fdb_ns; /* FDB Direct Rules name space handle. */
	struct mlx5_flow_tbl_resource fdb_tbl[MLX5_MAX_TABLES_FDB];
--
	void *tx_ns; /* TX Direct Rules name space handle. */
	struct mlx5_flow_tbl_resource tx_tbl[MLX5_MAX_TABLES];
	void *esw_drop_action; /* Pointer to DR E-Switch drop action. */
	/* TX Direct Rules tables/ */

error: patch failed: drivers/net/mlx5/mlx5.h:288
error: drivers/net/mlx5/mlx5.h: patch does not apply
Checking patch drivers/net/mlx5/mlx5_flow_dv.c...
error: while searching for:
#endif

#ifndef HAVE_MLX5DV_DR_ESWITCH
#define MLX5DV_FLOW_TABLE_TYPE_FDB 0
#endif

#ifndef HAVE_MLX5DV_DR
#define MLX5DV_DR_ACTION_FLAGS_ROOT_LEVEL 1

error: patch failed: drivers/net/mlx5/mlx5_flow_dv.c:40
error: drivers/net/mlx5/mlx5_flow_dv.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_glue.c...
error: while searching for:
{
#ifdef HAVE_IBV_FLOW_DV_SUPPORT
#ifdef HAVE_MLX5DV_DR
	return mlx5dv_dr_destroy_action(action);
#else
	struct mlx5dv_flow_action_attr *attr = action;
	int res = 0;

error: patch failed: drivers/net/mlx5/mlx5_glue.c:180
error: drivers/net/mlx5/mlx5_glue.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_glue.h...
error: while searching for:
#endif

#ifndef HAVE_MLX5DV_DR
struct mlx5dv_dr_ns;
enum  mlx5dv_dr_ns_domain { unused, };
#endif

/* LIB_GLUE_VERSION must be updated every time this structure is modified. */

error: patch failed: drivers/net/mlx5/mlx5_glue.h:64
error: drivers/net/mlx5/mlx5_glue.h: patch does not apply
*Repo: dpdk-next-eventdev
Checking patch drivers/net/mlx5/Makefile...
error: while searching for:
	$Q sh -- '$<' '$@' \
		HAVE_MLX5DV_DR \
		infiniband/mlx5dv.h \
		enum MLX5DV_DR_NS_TYPE_TERMINATING \
		$(AUTOCONF_OUTPUT)
--
		enum MLX5DV_DR_NS_DOMAIN_FDB_BYPASS \
		$(AUTOCONF_OUTPUT)
	$Q sh -- '$<' '$@' \
		HAVE_IBV_DEVX_OBJ \

error: patch failed: drivers/net/mlx5/Makefile:158
error: drivers/net/mlx5/Makefile: patch does not apply
Checking patch drivers/net/mlx5/meson.build...
error: while searching for:
		[ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',
		'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
		[ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h',
		'MLX5DV_DR_NS_TYPE_TERMINATING' ],
		[ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h',
		'MLX5DV_DR_NS_DOMAIN_FDB_BYPASS' ],
		[ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
		'SUPPORTED_40000baseKR4_Full' ],
		[ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',

error: patch failed: drivers/net/mlx5/meson.build:115
error: drivers/net/mlx5/meson.build: patch does not apply
Checking patch drivers/net/mlx5/mlx5.c...
error: while searching for:
#ifdef HAVE_MLX5DV_DR
	struct mlx5_ibv_shared *sh = priv->sh;
	int err = 0;
	void *ns;

	assert(sh);
	if (sh->dv_refcnt) {

error: patch failed: drivers/net/mlx5/mlx5.c:342
error: drivers/net/mlx5/mlx5.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5.h...
error: while searching for:
	/* Shared DV/DR flow data section. */
	pthread_mutex_t dv_mutex; /* DV context mutex. */
	uint32_t dv_refcnt; /* DV/DR data reference counter. */
	void *fdb_ns; /* FDB Direct Rules name space handle. */
	struct mlx5_flow_tbl_resource fdb_tbl[MLX5_MAX_TABLES_FDB];
--
	void *tx_ns; /* TX Direct Rules name space handle. */
	struct mlx5_flow_tbl_resource tx_tbl[MLX5_MAX_TABLES];
	void *esw_drop_action; /* Pointer to DR E-Switch drop action. */
	/* TX Direct Rules tables/ */

error: patch failed: drivers/net/mlx5/mlx5.h:288
error: drivers/net/mlx5/mlx5.h: patch does not apply
Checking patch drivers/net/mlx5/mlx5_flow_dv.c...
error: while searching for:
#endif

#ifndef HAVE_MLX5DV_DR_ESWITCH
#define MLX5DV_FLOW_TABLE_TYPE_FDB 0
#endif

#ifndef HAVE_MLX5DV_DR
#define MLX5DV_DR_ACTION_FLAGS_ROOT_LEVEL 1

error: patch failed: drivers/net/mlx5/mlx5_flow_dv.c:40
error: drivers/net/mlx5/mlx5_flow_dv.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_glue.c...
error: while searching for:
{
#ifdef HAVE_IBV_FLOW_DV_SUPPORT
#ifdef HAVE_MLX5DV_DR
	return mlx5dv_dr_destroy_action(action);
#else
	struct mlx5dv_flow_action_attr *attr = action;
	int res = 0;

error: patch failed: drivers/net/mlx5/mlx5_glue.c:180
error: drivers/net/mlx5/mlx5_glue.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_glue.h...
error: while searching for:
#endif

#ifndef HAVE_MLX5DV_DR
struct mlx5dv_dr_ns;
enum  mlx5dv_dr_ns_domain { unused, };
#endif

/* LIB_GLUE_VERSION must be updated every time this structure is modified. */

error: patch failed: drivers/net/mlx5/mlx5_glue.h:64
error: drivers/net/mlx5/mlx5_glue.h: patch does not apply
*Repo: dpdk-next-net
Checking patch drivers/net/mlx5/Makefile...
error: while searching for:
	$Q sh -- '$<' '$@' \
		HAVE_MLX5DV_DR \
		infiniband/mlx5dv.h \
		enum MLX5DV_DR_NS_TYPE_TERMINATING \
		$(AUTOCONF_OUTPUT)
--
		enum MLX5DV_DR_NS_DOMAIN_FDB_BYPASS \
		$(AUTOCONF_OUTPUT)
	$Q sh -- '$<' '$@' \
		HAVE_IBV_DEVX_OBJ \

error: patch failed: drivers/net/mlx5/Makefile:158
error: drivers/net/mlx5/Makefile: patch does not apply
Checking patch drivers/net/mlx5/meson.build...
error: while searching for:
		[ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',
		'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
		[ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h',
		'MLX5DV_DR_NS_TYPE_TERMINATING' ],
		[ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h',
		'MLX5DV_DR_NS_DOMAIN_FDB_BYPASS' ],
		[ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
		'SUPPORTED_40000baseKR4_Full' ],
		[ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',

error: patch failed: drivers/net/mlx5/meson.build:115
error: drivers/net/mlx5/meson.build: patch does not apply
Checking patch drivers/net/mlx5/mlx5.c...
error: while searching for:
#ifdef HAVE_MLX5DV_DR
	struct mlx5_ibv_shared *sh = priv->sh;
	int err = 0;
	void *ns;

	assert(sh);
	if (sh->dv_refcnt) {

error: patch failed: drivers/net/mlx5/mlx5.c:342
error: drivers/net/mlx5/mlx5.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5.h...
error: while searching for:
	/* Shared DV/DR flow data section. */
	pthread_mutex_t dv_mutex; /* DV context mutex. */
	uint32_t dv_refcnt; /* DV/DR data reference counter. */
	void *fdb_ns; /* FDB Direct Rules name space handle. */
	struct mlx5_flow_tbl_resource fdb_tbl[MLX5_MAX_TABLES_FDB];
--
	void *tx_ns; /* TX Direct Rules name space handle. */
	struct mlx5_flow_tbl_resource tx_tbl[MLX5_MAX_TABLES];
	void *esw_drop_action; /* Pointer to DR E-Switch drop action. */
	/* TX Direct Rules tables/ */

error: patch failed: drivers/net/mlx5/mlx5.h:288
error: drivers/net/mlx5/mlx5.h: patch does not apply
Checking patch drivers/net/mlx5/mlx5_flow_dv.c...
error: while searching for:
#endif

#ifndef HAVE_MLX5DV_DR_ESWITCH
#define MLX5DV_FLOW_TABLE_TYPE_FDB 0
#endif

#ifndef HAVE_MLX5DV_DR
#define MLX5DV_DR_ACTION_FLAGS_ROOT_LEVEL 1

error: patch failed: drivers/net/mlx5/mlx5_flow_dv.c:40
error: drivers/net/mlx5/mlx5_flow_dv.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_glue.c...
error: while searching for:
{
#ifdef HAVE_IBV_FLOW_DV_SUPPORT
#ifdef HAVE_MLX5DV_DR
	return mlx5dv_dr_destroy_action(action);
#else
	struct mlx5dv_flow_action_attr *attr = action;
	int res = 0;

error: patch failed: drivers/net/mlx5/mlx5_glue.c:180
error: drivers/net/mlx5/mlx5_glue.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_glue.h...
error: while searching for:
#endif

#ifndef HAVE_MLX5DV_DR
struct mlx5dv_dr_ns;
enum  mlx5dv_dr_ns_domain { unused, };
#endif

/* LIB_GLUE_VERSION must be updated every time this structure is modified. */

error: patch failed: drivers/net/mlx5/mlx5_glue.h:64
error: drivers/net/mlx5/mlx5_glue.h: patch does not apply
*Repo: dpdk-next-crypto
Checking patch drivers/net/mlx5/Makefile...
Checking patch drivers/net/mlx5/meson.build...
Checking patch drivers/net/mlx5/mlx5.c...
Hunk #1 succeeded at 322 (offset -20 lines).
error: while searching for:
		return 0;
	}
	/* Reference counter is zero, we should initialize structures. */
	ns = mlx5_glue->dr_create_ns(sh->ctx,
				     MLX5DV_DR_NS_DOMAIN_INGRESS_BYPASS);
	if (!ns) {
		DRV_LOG(ERR, "ingress mlx5dv_dr_create_ns failed");
		err = errno;
		goto error;
	}
	sh->rx_ns = ns;
	ns = mlx5_glue->dr_create_ns(sh->ctx,
				     MLX5DV_DR_NS_DOMAIN_EGRESS_BYPASS);
	if (!ns) {
		DRV_LOG(ERR, "egress mlx5dv_dr_create_ns failed");
		err = errno;
		goto error;
	}
	pthread_mutex_init(&sh->dv_mutex, NULL);
	sh->tx_ns = ns;
#ifdef HAVE_MLX5DV_DR_ESWITCH
	if (priv->config.dv_esw_en) {
		ns  = mlx5_glue->dr_create_ns(sh->ctx,
					      MLX5DV_DR_NS_DOMAIN_FDB_BYPASS);
		if (!ns) {
			DRV_LOG(ERR, "FDB mlx5dv_dr_create_ns failed");
			err = errno;
			goto error;
		}
		sh->fdb_ns = ns;
		sh->esw_drop_action = mlx5_glue->dr_create_flow_action_drop();
	}
#endif

error: patch failed: drivers/net/mlx5/mlx5.c:352
error: drivers/net/mlx5/mlx5.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5.h...
Hunk #1 succeeded at 278 (offset -10 lines).
Checking patch drivers/net/mlx5/mlx5_flow_dv.c...
error: while searching for:
#endif

#ifndef HAVE_MLX5DV_DR_ESWITCH
#define MLX5DV_FLOW_TABLE_TYPE_FDB 0
#endif

#ifndef HAVE_MLX5DV_DR
#define MLX5DV_DR_ACTION_FLAGS_ROOT_LEVEL 1

error: patch failed: drivers/net/mlx5/mlx5_flow_dv.c:40
error: drivers/net/mlx5/mlx5_flow_dv.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_glue.c...
Checking patch drivers/net/mlx5/mlx5_glue.h...
*Repo: dpdk-next-virtio
Checking patch drivers/net/mlx5/Makefile...
Checking patch drivers/net/mlx5/meson.build...
Checking patch drivers/net/mlx5/mlx5.c...
Hunk #1 succeeded at 322 (offset -20 lines).
error: while searching for:
		return 0;
	}
	/* Reference counter is zero, we should initialize structures. */
	ns = mlx5_glue->dr_create_ns(sh->ctx,
				     MLX5DV_DR_NS_DOMAIN_INGRESS_BYPASS);
	if (!ns) {
		DRV_LOG(ERR, "ingress mlx5dv_dr_create_ns failed");
		err = errno;
		goto error;
	}
	sh->rx_ns = ns;
	ns = mlx5_glue->dr_create_ns(sh->ctx,
				     MLX5DV_DR_NS_DOMAIN_EGRESS_BYPASS);
	if (!ns) {
		DRV_LOG(ERR, "egress mlx5dv_dr_create_ns failed");
		err = errno;
		goto error;
	}
	pthread_mutex_init(&sh->dv_mutex, NULL);
	sh->tx_ns = ns;
#ifdef HAVE_MLX5DV_DR_ESWITCH
	if (priv->config.dv_esw_en) {
		ns  = mlx5_glue->dr_create_ns(sh->ctx,
					      MLX5DV_DR_NS_DOMAIN_FDB_BYPASS);
		if (!ns) {
			DRV_LOG(ERR, "FDB mlx5dv_dr_create_ns failed");
			err = errno;
			goto error;
		}
		sh->fdb_ns = ns;
		sh->esw_drop_action = mlx5_glue->dr_create_flow_action_drop();
	}
#endif

error: patch failed: drivers/net/mlx5/mlx5.c:352
error: drivers/net/mlx5/mlx5.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5.h...
Hunk #1 succeeded at 278 (offset -10 lines).
Checking patch drivers/net/mlx5/mlx5_flow_dv.c...
error: while searching for:
#endif

#ifndef HAVE_MLX5DV_DR_ESWITCH
#define MLX5DV_FLOW_TABLE_TYPE_FDB 0
#endif

#ifndef HAVE_MLX5DV_DR
#define MLX5DV_DR_ACTION_FLAGS_ROOT_LEVEL 1

error: patch failed: drivers/net/mlx5/mlx5_flow_dv.c:40
error: drivers/net/mlx5/mlx5_flow_dv.c: patch does not apply
Checking patch drivers/net/mlx5/mlx5_glue.c...
Checking patch drivers/net/mlx5/mlx5_glue.h...

DPDK STV team