Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/62774 _apply issues_ Submitter: Viacheslav Ovsiienko Date: 2019-11-08 15:07:50 Reply_mail: 1573225670-11390-1-git-send-email-viacheslavo@mellanox.com DPDK git baseline: Repo:dpdk-next-net-mlx, CommitID: 4b6b5f61343eab58ca6d423840a6259111e73ecf Repo:dpdk, CommitID: 31aa07759ecd151967b568b1f1aa12b7794217c8 *Repo: dpdk-next-net-mlx $Q sh -- '$<' '$@' \ HAVE_ETHTOOL_LINK_MODE_25G \ /usr/include/linux/ethtool.h \ enum ETHTOOL_LINK_MODE_25000baseCR_Full_BIT \ error: patch failed: drivers/net/mlx5/Makefile:206 error: drivers/net/mlx5/Makefile: patch does not apply Checking patch drivers/net/mlx5/meson.build... error: while searching for: 'mlx5dv_dr_action_create_dest_devx_tir' ], [ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h', 'mlx5dv_dr_action_create_flow_meter' ], [ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h', 'MLX5DV_DR_DOMAIN_TYPE_NIC_RX' ], [ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h', error: patch failed: drivers/net/mlx5/meson.build:134 error: drivers/net/mlx5/meson.build: patch does not apply Checking patch drivers/net/mlx5/mlx5.c... error: while searching for: #define MLX5_TXQ_MPW_EN "txq_mpw_en" /* * Device parameter to include 2 dsegs in the title WQEBB. * Deprecated, ignored. */ error: patch failed: drivers/net/mlx5/mlx5.c:96 error: drivers/net/mlx5/mlx5.c: patch does not apply Checking patch drivers/net/mlx5/mlx5.h... error: while searching for: /* Rx queue count threshold to enable MPRQ. */ } mprq; /* Configurations for Multi-Packet RQ. */ int mps; /* Multi-packet send supported mode. */ unsigned int flow_prio; /* Number of flow priorities. */ enum modify_reg flow_mreg_c[MLX5_MREG_C_NUM]; /* Availibility of mreg_c's. */ error: patch failed: drivers/net/mlx5/mlx5.h:267 error: drivers/net/mlx5/mlx5.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_defs.h... error: while searching for: #define MLX5_UAR_PAGE_NUM_MAX 64 #define MLX5_UAR_PAGE_NUM_MASK ((MLX5_UAR_PAGE_NUM_MAX) - 1) /* Log 2 of the default number of strides per WQE for Multi-Packet RQ. */ #define MLX5_MPRQ_STRIDE_NUM_N 6U error: patch failed: drivers/net/mlx5/mlx5_defs.h:123 error: drivers/net/mlx5/mlx5_defs.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_rxtx.c... error: while searching for: * to improve latencies. The pure software related data treatment * can be completed after doorbell. Tx CQEs for this SQ are -- mlx5_tx_dbrec_cond_wmb(txq, loc.wqe_last, 0); /* Not all of the mbufs may be stored into elts yet. */ part = MLX5_TXOFF_CONFIG(INLINE) ? 0 : loc.pkts_sent - loc.pkts_copy; if (!MLX5_TXOFF_CONFIG(INLINE) && part) { error: patch failed: drivers/net/mlx5/mlx5_rxtx.c:4754 error: drivers/net/mlx5/mlx5_rxtx.c: patch does not apply Checking patch drivers/net/mlx5/mlx5_rxtx.h... error: while searching for: /* When set TX offload for tunneled packets are supported. */ uint16_t swp_en:1; /* Whether SW parser is enabled. */ uint16_t vlan_en:1; /* VLAN insertion in WQE is supported. */ uint16_t inlen_send; /* Ordinary send data inline size. */ uint16_t inlen_empw; /* eMPW max packet size to inline. */ uint16_t inlen_mode; /* Minimal data length to inline. */ error: patch failed: drivers/net/mlx5/mlx5_rxtx.h:287 error: drivers/net/mlx5/mlx5_rxtx.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_txq.c... error: while searching for: #pragma GCC diagnostic ignored "-Wpedantic" #endif #include #ifdef PEDANTIC #pragma GCC diagnostic error "-Wpedantic" #endif error: patch failed: drivers/net/mlx5/mlx5_txq.c:18 error: drivers/net/mlx5/mlx5_txq.c: patch does not apply *Repo: dpdk $Q sh -- '$<' '$@' \ HAVE_ETHTOOL_LINK_MODE_25G \ /usr/include/linux/ethtool.h \ enum ETHTOOL_LINK_MODE_25000baseCR_Full_BIT \ error: patch failed: drivers/net/mlx5/Makefile:206 error: drivers/net/mlx5/Makefile: patch does not apply Checking patch drivers/net/mlx5/meson.build... error: while searching for: 'mlx5dv_dr_action_create_dest_devx_tir' ], [ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h', 'mlx5dv_dr_action_create_flow_meter' ], [ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h', 'MLX5DV_DR_DOMAIN_TYPE_NIC_RX' ], [ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h', error: patch failed: drivers/net/mlx5/meson.build:134 error: drivers/net/mlx5/meson.build: patch does not apply Checking patch drivers/net/mlx5/mlx5.c... error: while searching for: #define MLX5_TXQ_MPW_EN "txq_mpw_en" /* * Device parameter to include 2 dsegs in the title WQEBB. * Deprecated, ignored. */ error: patch failed: drivers/net/mlx5/mlx5.c:96 error: drivers/net/mlx5/mlx5.c: patch does not apply Checking patch drivers/net/mlx5/mlx5.h... error: while searching for: /* Rx queue count threshold to enable MPRQ. */ } mprq; /* Configurations for Multi-Packet RQ. */ int mps; /* Multi-packet send supported mode. */ unsigned int flow_prio; /* Number of flow priorities. */ enum modify_reg flow_mreg_c[MLX5_MREG_C_NUM]; /* Availibility of mreg_c's. */ error: patch failed: drivers/net/mlx5/mlx5.h:267 error: drivers/net/mlx5/mlx5.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_defs.h... error: while searching for: #define MLX5_UAR_PAGE_NUM_MAX 64 #define MLX5_UAR_PAGE_NUM_MASK ((MLX5_UAR_PAGE_NUM_MAX) - 1) /* Log 2 of the default number of strides per WQE for Multi-Packet RQ. */ #define MLX5_MPRQ_STRIDE_NUM_N 6U error: patch failed: drivers/net/mlx5/mlx5_defs.h:123 error: drivers/net/mlx5/mlx5_defs.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_rxtx.c... error: while searching for: * to improve latencies. The pure software related data treatment * can be completed after doorbell. Tx CQEs for this SQ are -- mlx5_tx_dbrec_cond_wmb(txq, loc.wqe_last, 0); /* Not all of the mbufs may be stored into elts yet. */ part = MLX5_TXOFF_CONFIG(INLINE) ? 0 : loc.pkts_sent - loc.pkts_copy; if (!MLX5_TXOFF_CONFIG(INLINE) && part) { error: patch failed: drivers/net/mlx5/mlx5_rxtx.c:4754 error: drivers/net/mlx5/mlx5_rxtx.c: patch does not apply Checking patch drivers/net/mlx5/mlx5_rxtx.h... error: while searching for: /* When set TX offload for tunneled packets are supported. */ uint16_t swp_en:1; /* Whether SW parser is enabled. */ uint16_t vlan_en:1; /* VLAN insertion in WQE is supported. */ uint16_t inlen_send; /* Ordinary send data inline size. */ uint16_t inlen_empw; /* eMPW max packet size to inline. */ uint16_t inlen_mode; /* Minimal data length to inline. */ error: patch failed: drivers/net/mlx5/mlx5_rxtx.h:287 error: drivers/net/mlx5/mlx5_rxtx.h: patch does not apply Checking patch drivers/net/mlx5/mlx5_txq.c... error: while searching for: #pragma GCC diagnostic ignored "-Wpedantic" #endif #include #ifdef PEDANTIC #pragma GCC diagnostic error "-Wpedantic" #endif error: patch failed: drivers/net/mlx5/mlx5_txq.c:18 error: drivers/net/mlx5/mlx5_txq.c: patch does not apply DPDK STV team