On Tue, Oct 11, 2022 at 5:33 PM Nithin Dabilpuram
<ndabilpu...@marvell.com> wrote:
>
> Remove duplicate mempool debug checks for mbufs received.
> Fixes: 592642c494b1 ("net/cnxk: align prefetches to CN10K cache model")
>
> Signed-off-by: Nithin Dabilpuram <ndabilpu...@marvell.com>
# Please fix the following
# Also, update git comments and add fixes for the relevant patches(for
example the revert patch)
[for-next-net]dell[dpdk-next-net-mrvl] $ git pw series apply 25145
Failed to apply patch:
Applying: common/cnxk: set MTU size on SDP based on SoC type
Applying: common/cnxk: add devargs for soft expiry poll frequency
Applying: net/cnxk: fix later skip to include mbuf priv
Using index info to reconstruct a base tree...
M drivers/net/cnxk/cnxk_ethdev.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/cnxk/cnxk_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/cnxk/cnxk_ethdev.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 net/cnxk: fix later skip to include mbuf priv
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort"
> ---
> drivers/net/cnxk/cn10k_rx.h | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h
> index cf390a0361..4e22ceda02 100644
> --- a/drivers/net/cnxk/cn10k_rx.h
> +++ b/drivers/net/cnxk/cn10k_rx.h
> @@ -1307,12 +1307,6 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf
> **mbufs, uint16_t pkts,
> ol_flags3 |= nix_rx_olflags_get(lookup_mem, cq3_w1);
> }
>
> - /* Mark mempool obj as "get" as it is alloc'ed by NIX */
> - RTE_MEMPOOL_CHECK_COOKIES(mbuf0->pool, (void **)&mbuf0, 1, 1);
> - RTE_MEMPOOL_CHECK_COOKIES(mbuf1->pool, (void **)&mbuf1, 1, 1);
> - RTE_MEMPOOL_CHECK_COOKIES(mbuf2->pool, (void **)&mbuf2, 1, 1);
> - RTE_MEMPOOL_CHECK_COOKIES(mbuf3->pool, (void **)&mbuf3, 1, 1);
> -
> /* Translate meta to mbuf */
> if (flags & NIX_RX_OFFLOAD_SECURITY_F) {
> uint64_t cq0_w5 = *CQE_PTR_OFF(cq0, 0, 40, flags);
> --
> 2.25.1
>
