Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/52189 _apply issues_ Submitter: Ori Kam Date: 2019-04-03 13:21:57 Reply_mail: 1554297697-13525-3-git-send-email-orika@mellanox.com DPDK git baseline: Repo:dpdk-master, CommitID: 196c650b8b63fc74f3c30d9be35fc0c8108abe8e Repo:dpdk-next-eventdev, CommitID: 7a1ccc24874e251957513aba0520500f873e276a Repo:dpdk-next-net, CommitID: 69f805ac18abe03b8d6c7badccb45e3fde4ad0db Repo:dpdk-next-crypto, CommitID: 3331ddcd9a80379e59f5c29707f684735996a106 Repo:dpdk-next-virtio, CommitID: daf8de5c41dfbe40f354ff009f5791db348e0b09 *Repo: dpdk-master Checking patch drivers/net/mlx5/mlx5.h... Hunk #1 succeeded at 219 (offset -40 lines). Hunk #2 succeeded at 296 (offset -39 lines). Checking patch drivers/net/mlx5/mlx5_flow.c... Checking patch drivers/net/mlx5/mlx5_flow.h... error: while searching for: size_t size; uint8_t reformat_type; uint8_t ft_type; }; /* Tag resource structure. */ error: patch failed: drivers/net/mlx5/mlx5_flow.h:220 error: drivers/net/mlx5/mlx5_flow.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_flow_dv.c... Hunk #1 succeeded at 810 (offset 1 line). Hunk #2 succeeded at 845 (offset 1 line). Hunk #3 succeeded at 1452 (offset 1 line). Hunk #4 succeeded at 1481 (offset 1 line). -- Hunk #17 succeeded at 3298 (offset -78 lines). Hunk #18 succeeded at 3414 (offset -78 lines). Hunk #19 succeeded at 3425 (offset -78 lines). Hunk #20 succeeded at 3522 (offset -78 lines). Checking patch drivers/net/mlx5/mlx5_glue.c... error: while searching for: mlx5_glue_destroy_flow_action(void *action) { #ifdef HAVE_IBV_FLOW_DV_SUPPORT struct mlx5dv_flow_action_attr *attr = action; int res = 0; switch (attr->type) { error: patch failed: drivers/net/mlx5/mlx5_glue.c:178 error: drivers/net/mlx5/mlx5_glue.c: patch does not apply Checking patch drivers/net/mlx5/mlx5_glue.h... Hunk #1 succeeded at 59 (offset -4 lines). Hunk #2 succeeded at 141 (offset -4 lines). error: while searching for: (struct ibv_context *context, struct ibv_qp_init_attr_ex *qp_init_attr_ex, struct mlx5dv_qp_init_attr *dv_qp_init_attr); struct mlx5dv_flow_matcher *(*dv_create_flow_matcher) (struct ibv_context *context, -- void *(*dv_create_flow_action_tag)(uint32_t tag); struct ibv_context *(*dv_open_device)(struct ibv_device *device); struct mlx5dv_devx_obj *(*devx_obj_create) (struct ibv_context *ctx, error: patch failed: drivers/net/mlx5/mlx5_glue.h:158 error: drivers/net/mlx5/mlx5_glue.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_prm.h... *Repo: dpdk-next-eventdev Checking patch drivers/net/mlx5/mlx5.h... Hunk #1 succeeded at 219 (offset -40 lines). Hunk #2 succeeded at 296 (offset -39 lines). Checking patch drivers/net/mlx5/mlx5_flow.c... Checking patch drivers/net/mlx5/mlx5_flow.h... error: while searching for: size_t size; uint8_t reformat_type; uint8_t ft_type; }; /* Tag resource structure. */ error: patch failed: drivers/net/mlx5/mlx5_flow.h:220 error: drivers/net/mlx5/mlx5_flow.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_flow_dv.c... Hunk #1 succeeded at 810 (offset 1 line). Hunk #2 succeeded at 845 (offset 1 line). Hunk #3 succeeded at 1452 (offset 1 line). Hunk #4 succeeded at 1481 (offset 1 line). -- Hunk #17 succeeded at 3298 (offset -78 lines). Hunk #18 succeeded at 3414 (offset -78 lines). Hunk #19 succeeded at 3425 (offset -78 lines). Hunk #20 succeeded at 3522 (offset -78 lines). Checking patch drivers/net/mlx5/mlx5_glue.c... error: while searching for: mlx5_glue_destroy_flow_action(void *action) { #ifdef HAVE_IBV_FLOW_DV_SUPPORT struct mlx5dv_flow_action_attr *attr = action; int res = 0; switch (attr->type) { error: patch failed: drivers/net/mlx5/mlx5_glue.c:178 error: drivers/net/mlx5/mlx5_glue.c: patch does not apply Checking patch drivers/net/mlx5/mlx5_glue.h... Hunk #1 succeeded at 59 (offset -4 lines). Hunk #2 succeeded at 141 (offset -4 lines). error: while searching for: (struct ibv_context *context, struct ibv_qp_init_attr_ex *qp_init_attr_ex, struct mlx5dv_qp_init_attr *dv_qp_init_attr); struct mlx5dv_flow_matcher *(*dv_create_flow_matcher) (struct ibv_context *context, -- void *(*dv_create_flow_action_tag)(uint32_t tag); struct ibv_context *(*dv_open_device)(struct ibv_device *device); struct mlx5dv_devx_obj *(*devx_obj_create) (struct ibv_context *ctx, error: patch failed: drivers/net/mlx5/mlx5_glue.h:158 error: drivers/net/mlx5/mlx5_glue.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_prm.h... *Repo: dpdk-next-net Checking patch drivers/net/mlx5/mlx5.c... Checking patch drivers/net/mlx5/mlx5.h... Hunk #2 succeeded at 333 (offset -2 lines). Checking patch drivers/net/mlx5/mlx5_flow.c... Checking patch drivers/net/mlx5/mlx5_flow.h... error: while searching for: size_t size; uint8_t reformat_type; uint8_t ft_type; }; /* Tag resource structure. */ error: patch failed: drivers/net/mlx5/mlx5_flow.h:220 error: drivers/net/mlx5/mlx5_flow.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_flow_dv.c... Hunk #1 succeeded at 810 (offset 1 line). Hunk #2 succeeded at 845 (offset 1 line). Hunk #3 succeeded at 1452 (offset 1 line). Hunk #4 succeeded at 1481 (offset 1 line). -- Hunk #17 succeeded at 3298 (offset -78 lines). Hunk #18 succeeded at 3414 (offset -78 lines). Hunk #19 succeeded at 3425 (offset -78 lines). Hunk #20 succeeded at 3522 (offset -78 lines). Checking patch drivers/net/mlx5/mlx5_glue.c... error: while searching for: mlx5_glue_destroy_flow_action(void *action) { #ifdef HAVE_IBV_FLOW_DV_SUPPORT struct mlx5dv_flow_action_attr *attr = action; int res = 0; switch (attr->type) { error: patch failed: drivers/net/mlx5/mlx5_glue.c:178 error: drivers/net/mlx5/mlx5_glue.c: patch does not apply Checking patch drivers/net/mlx5/mlx5_glue.h... Hunk #1 succeeded at 59 (offset -4 lines). Hunk #2 succeeded at 141 (offset -4 lines). error: while searching for: (struct ibv_context *context, struct ibv_qp_init_attr_ex *qp_init_attr_ex, struct mlx5dv_qp_init_attr *dv_qp_init_attr); struct mlx5dv_flow_matcher *(*dv_create_flow_matcher) (struct ibv_context *context, -- void *(*dv_create_flow_action_tag)(uint32_t tag); struct ibv_context *(*dv_open_device)(struct ibv_device *device); struct mlx5dv_devx_obj *(*devx_obj_create) (struct ibv_context *ctx, error: patch failed: drivers/net/mlx5/mlx5_glue.h:158 error: drivers/net/mlx5/mlx5_glue.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_prm.h... *Repo: dpdk-next-crypto Checking patch drivers/net/mlx5/mlx5.h... Hunk #1 succeeded at 219 (offset -40 lines). Hunk #2 succeeded at 296 (offset -39 lines). Checking patch drivers/net/mlx5/mlx5_flow.c... Checking patch drivers/net/mlx5/mlx5_flow.h... error: while searching for: size_t size; uint8_t reformat_type; uint8_t ft_type; }; /* Tag resource structure. */ error: patch failed: drivers/net/mlx5/mlx5_flow.h:220 error: drivers/net/mlx5/mlx5_flow.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_flow_dv.c... Hunk #1 succeeded at 810 (offset 1 line). Hunk #2 succeeded at 845 (offset 1 line). Hunk #3 succeeded at 1452 (offset 1 line). Hunk #4 succeeded at 1481 (offset 1 line). -- Hunk #17 succeeded at 3298 (offset -78 lines). Hunk #18 succeeded at 3414 (offset -78 lines). Hunk #19 succeeded at 3425 (offset -78 lines). Hunk #20 succeeded at 3522 (offset -78 lines). Checking patch drivers/net/mlx5/mlx5_glue.c... error: while searching for: mlx5_glue_destroy_flow_action(void *action) { #ifdef HAVE_IBV_FLOW_DV_SUPPORT struct mlx5dv_flow_action_attr *attr = action; int res = 0; switch (attr->type) { error: patch failed: drivers/net/mlx5/mlx5_glue.c:178 error: drivers/net/mlx5/mlx5_glue.c: patch does not apply Checking patch drivers/net/mlx5/mlx5_glue.h... Hunk #1 succeeded at 59 (offset -4 lines). Hunk #2 succeeded at 141 (offset -4 lines). error: while searching for: (struct ibv_context *context, struct ibv_qp_init_attr_ex *qp_init_attr_ex, struct mlx5dv_qp_init_attr *dv_qp_init_attr); struct mlx5dv_flow_matcher *(*dv_create_flow_matcher) (struct ibv_context *context, -- void *(*dv_create_flow_action_tag)(uint32_t tag); struct ibv_context *(*dv_open_device)(struct ibv_device *device); struct mlx5dv_devx_obj *(*devx_obj_create) (struct ibv_context *ctx, error: patch failed: drivers/net/mlx5/mlx5_glue.h:158 error: drivers/net/mlx5/mlx5_glue.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_prm.h... *Repo: dpdk-next-virtio Checking patch drivers/net/mlx5/Makefile... Checking patch drivers/net/mlx5/mlx5.c... Hunk #1 succeeded at 1219 (offset -264 lines). Checking patch drivers/net/mlx5/mlx5.h... error: while searching for: struct mlx5_ibv_shared_port port[]; /* per device port data array. */ }; struct mlx5_priv { LIST_ENTRY(mlx5_priv) mem_event_cb; /**< Called by memory event callback. */ error: patch failed: drivers/net/mlx5/mlx5.h:259 error: drivers/net/mlx5/mlx5.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_flow.c... Hunk #1 succeeded at 2082 (offset -2 lines). Checking patch drivers/net/mlx5/mlx5_flow.h... error: while searching for: size_t size; uint8_t reformat_type; uint8_t ft_type; }; /* Tag resource structure. */ error: patch failed: drivers/net/mlx5/mlx5_flow.h:220 error: drivers/net/mlx5/mlx5_flow.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_flow_dv.c... Hunk #1 succeeded at 810 (offset 1 line). error: while searching for: *cache_resource = *resource; cache_resource->verbs_action = mlx5_glue->dv_create_flow_action_packet_reformat (priv->sh->ctx, cache_resource->size, (cache_resource->size ? cache_resource->buf : NULL), cache_resource->reformat_type, cache_resource->ft_type); if (!cache_resource->verbs_action) { rte_free(cache_resource); return rte_flow_error_set(error, ENOMEM, error: patch failed: drivers/net/mlx5/mlx5_flow_dv.c:835 error: drivers/net/mlx5/mlx5_flow_dv.c: patch does not apply Checking patch drivers/net/mlx5/mlx5_glue.c... error: while searching for: mlx5_glue_destroy_flow_action(void *action) { #ifdef HAVE_IBV_FLOW_DV_SUPPORT struct mlx5dv_flow_action_attr *attr = action; int res = 0; switch (attr->type) { error: patch failed: drivers/net/mlx5/mlx5_glue.c:178 error: drivers/net/mlx5/mlx5_glue.c: patch does not apply Checking patch drivers/net/mlx5/mlx5_glue.h... Hunk #1 succeeded at 59 (offset -4 lines). Hunk #2 succeeded at 141 (offset -4 lines). error: while searching for: (struct ibv_context *context, struct ibv_qp_init_attr_ex *qp_init_attr_ex, struct mlx5dv_qp_init_attr *dv_qp_init_attr); struct mlx5dv_flow_matcher *(*dv_create_flow_matcher) (struct ibv_context *context, -- void *(*dv_create_flow_action_tag)(uint32_t tag); struct ibv_context *(*dv_open_device)(struct ibv_device *device); struct mlx5dv_devx_obj *(*devx_obj_create) (struct ibv_context *ctx, error: patch failed: drivers/net/mlx5/mlx5_glue.h:158 error: drivers/net/mlx5/mlx5_glue.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_prm.h... DPDK STV team