Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/106157 _apply patch failure_ Submitter: Satheesh Paul Date: Friday, January 21 2022 06:26:41 Applied on: CommitID:9cc217a28310d21fba56e5eceb740b4feb7e0949 Apply patch set 106157-106160 failed: Checking patch doc/guides/nics/cnxk.rst... Checking patch drivers/common/cnxk/hw/npc.h... Checking patch drivers/common/cnxk/roc_mbox.h... Checking patch drivers/common/cnxk/roc_nix.h... Checking patch drivers/common/cnxk/roc_nix_ops.c... Checking patch drivers/common/cnxk/roc_npc.h... Checking patch drivers/net/cnxk/cnxk_ethdev.c... Checking patch drivers/net/cnxk/cnxk_ethdev_devargs.c... error: while searching for: uint16_t mask; }; static int parse_outb_nb_desc(const char *key, const char *value, void *extra_args) { error: patch failed: drivers/net/cnxk/cnxk_ethdev_devargs.c:13 Hunk #2 succeeded at 118 (offset -12 lines). Hunk #3 succeeded at 184 (offset -12 lines). error: while searching for: #define CNXK_FORCE_INB_INL_DEV "force_inb_inl_dev" #define CNXK_OUTB_NB_CRYPTO_QS "outb_nb_crypto_qs" #define CNXK_SDP_CHANNEL_MASK "sdp_channel_mask" int cnxk_ethdev_parse_devargs(struct rte_devargs *devargs, struct cnxk_eth_dev *dev) { uint16_t reta_sz = ROC_NIX_RSS_RETA_SZ_64; uint16_t sqb_count = CNXK_NIX_TX_MAX_SQB; uint16_t ipsec_in_max_spi = BIT(8) - 1; uint16_t ipsec_out_max_sa = BIT(12); uint16_t flow_prealloc_size = 1; error: patch failed: drivers/net/cnxk/cnxk_ethdev_devargs.c:205 error: while searching for: struct rte_kvargs *kvlist; memset(&sdp_chan, 0, sizeof(sdp_chan)); if (devargs == NULL) goto null_devargs; error: patch failed: drivers/net/cnxk/cnxk_ethdev_devargs.c:226 error: while searching for: &force_inb_inl_dev); rte_kvargs_process(kvlist, CNXK_SDP_CHANNEL_MASK, &parse_sdp_channel_mask, &sdp_chan); rte_kvargs_free(kvlist); null_devargs: error: patch failed: drivers/net/cnxk/cnxk_ethdev_devargs.c:261 error: while searching for: dev->npc.sdp_channel = sdp_chan.channel; dev->npc.sdp_channel_mask = sdp_chan.mask; dev->npc.is_sdp_mask_set = sdp_chan.is_sdp_mask_set; return 0; exit: return -EINVAL; error: patch failed: drivers/net/cnxk/cnxk_ethdev_devargs.c:282 error: while searching for: CNXK_RSS_TAG_AS_XOR "=1" CNXK_IPSEC_IN_MAX_SPI "=<1-65535>" CNXK_OUTB_NB_DESC "=<1-65535>" CNXK_OUTB_NB_CRYPTO_QS "=<1-64>" CNXK_FORCE_INB_INL_DEV "=1" CNXK_SDP_CHANNEL_MASK "=<1-4095>/<1-4095>"); error: patch failed: drivers/net/cnxk/cnxk_ethdev_devargs.c:297 Applied patch doc/guides/nics/cnxk.rst cleanly. Applied patch drivers/common/cnxk/hw/npc.h cleanly. Applied patch drivers/common/cnxk/roc_mbox.h cleanly. Applied patch drivers/common/cnxk/roc_nix.h cleanly. Applied patch drivers/common/cnxk/roc_nix_ops.c cleanly. Applied patch drivers/common/cnxk/roc_npc.h cleanly. Applied patch drivers/net/cnxk/cnxk_ethdev.c cleanly. Applying patch drivers/net/cnxk/cnxk_ethdev_devargs.c with 6 rejects... Rejected hunk #1. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Rejected hunk #4. Rejected hunk #5. Rejected hunk #6. Rejected hunk #7. Rejected hunk #8. diff a/drivers/net/cnxk/cnxk_ethdev_devargs.c b/drivers/net/cnxk/cnxk_ethdev_devargs.c (rejected hunks) @@ -13,6 +13,12 @@ struct sdp_channel { uint16_t mask; }; +struct flow_pre_l2_size_info { + uint8_t pre_l2_size_off; + uint8_t pre_l2_size_off_mask; + uint8_t pre_l2_size_shift_dir; +}; + static int parse_outb_nb_desc(const char *key, const char *value, void *extra_args) { @@ -205,12 +237,14 @@ parse_sdp_channel_mask(const char *key, const char *value, void *extra_args) #define CNXK_FORCE_INB_INL_DEV "force_inb_inl_dev" #define CNXK_OUTB_NB_CRYPTO_QS "outb_nb_crypto_qs" #define CNXK_SDP_CHANNEL_MASK "sdp_channel_mask" +#define CNXK_FLOW_PRE_L2_INFO "flow_pre_l2_info" int cnxk_ethdev_parse_devargs(struct rte_devargs *devargs, struct cnxk_eth_dev *dev) { uint16_t reta_sz = ROC_NIX_RSS_RETA_SZ_64; uint16_t sqb_count = CNXK_NIX_TX_MAX_SQB; + struct flow_pre_l2_size_info pre_l2_info; uint16_t ipsec_in_max_spi = BIT(8) - 1; uint16_t ipsec_out_max_sa = BIT(12); uint16_t flow_prealloc_size = 1; @@ -226,6 +260,7 @@ cnxk_ethdev_parse_devargs(struct rte_devargs *devargs, struct cnxk_eth_dev *dev) struct rte_kvargs *kvlist; memset(&sdp_chan, 0, sizeof(sdp_chan)); + memset(&pre_l2_info, 0, sizeof(struct flow_pre_l2_size_info)); if (devargs == NULL) goto null_devargs; @@ -261,6 +296,8 @@ cnxk_ethdev_parse_devargs(struct rte_devargs *devargs, struct cnxk_eth_dev *dev) &force_inb_inl_dev); rte_kvargs_process(kvlist, CNXK_SDP_CHANNEL_MASK, &parse_sdp_channel_mask, &sdp_chan); + rte_kvargs_process(kvlist, CNXK_FLOW_PRE_L2_INFO, + &parse_pre_l2_hdr_info, &pre_l2_info); rte_kvargs_free(kvlist); null_devargs: @@ -282,6 +319,9 @@ cnxk_ethdev_parse_devargs(struct rte_devargs *devargs, struct cnxk_eth_dev *dev) dev->npc.sdp_channel = sdp_chan.channel; dev->npc.sdp_channel_mask = sdp_chan.mask; dev->npc.is_sdp_mask_set = sdp_chan.is_sdp_mask_set; + dev->npc.pre_l2_size_offset = pre_l2_info.pre_l2_size_off; + dev->npc.pre_l2_size_offset_mask = pre_l2_info.pre_l2_size_off_mask; + dev->npc.pre_l2_size_shift_dir = pre_l2_info.pre_l2_size_shift_dir; return 0; exit: return -EINVAL; @@ -297,6 +337,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_cnxk, CNXK_RSS_TAG_AS_XOR "=1" CNXK_IPSEC_IN_MAX_SPI "=<1-65535>" CNXK_OUTB_NB_DESC "=<1-65535>" + CNXK_FLOW_PRE_L2_INFO "=<0-255>/<1-255>/<0-1>" CNXK_OUTB_NB_CRYPTO_QS "=<1-64>" CNXK_FORCE_INB_INL_DEV "=1" CNXK_SDP_CHANNEL_MASK "=<1-4095>/<1-4095>"); Checking patch drivers/common/cnxk/roc_npc.h... error: drivers/common/cnxk/roc_npc.h: does not match index Checking patch drivers/common/cnxk/roc_npc_mcam.c... Hunk #1 succeeded at 603 (offset -10 lines). Hunk #2 succeeded at 663 (offset -10 lines). Hunk #3 succeeded at 680 (offset -10 lines). Hunk #4 succeeded at 696 (offset -10 lines). Checking patch drivers/common/cnxk/roc_npc_parse.c... Checking patch drivers/common/cnxk/roc_npc_priv.h... Checking patch drivers/common/cnxk/roc_platform.h... error: while searching for: #define PLT_INIT RTE_INIT #define PLT_TAILQ_FOREACH_SAFE RTE_TAILQ_FOREACH_SAFE /** Divide ceil */ #define PLT_DIV_CEIL(x, y) \ ({ \ error: patch failed: drivers/common/cnxk/roc_platform.h:56 Hunk #3 succeeded at 83 (offset -5 lines). Applied patch drivers/common/cnxk/roc_npc_mcam.c cleanly. Applied patch drivers/common/cnxk/roc_npc_parse.c cleanly. Applied patch drivers/common/cnxk/roc_npc_priv.h cleanly. Applying patch drivers/common/cnxk/roc_platform.h with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. diff a/drivers/common/cnxk/roc_platform.h b/drivers/common/cnxk/roc_platform.h (rejected hunks) @@ -56,6 +57,9 @@ #define PLT_INIT RTE_INIT #define PLT_TAILQ_FOREACH_SAFE RTE_TAILQ_FOREACH_SAFE +#ifndef PLT_ETHER_ADDR_LEN +#define PLT_ETHER_ADDR_LEN RTE_ETHER_ADDR_LEN +#endif /** Divide ceil */ #define PLT_DIV_CEIL(x, y) \ ({ \ Checking patch drivers/common/cnxk/hw/npc.h... error: drivers/common/cnxk/hw/npc.h: does not match index Checking patch drivers/common/cnxk/roc_npc.h... error: drivers/common/cnxk/roc_npc.h: does not match index Checking patch drivers/common/cnxk/roc_npc_mcam.c... error: drivers/common/cnxk/roc_npc_mcam.c: does not match index Checking patch drivers/common/cnxk/roc_npc_parse.c... error: drivers/common/cnxk/roc_npc_parse.c: does not match index Checking patch drivers/common/cnxk/roc_npc_priv.h... error: drivers/common/cnxk/roc_npc_priv.h: does not match index https://lab.dpdk.org/results/dashboard/patchsets/20759/ UNH-IOL DPDK Community Lab