From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BC177A00C2; Wed, 12 Oct 2022 08:54:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 62B4742D86; Wed, 12 Oct 2022 08:54:03 +0200 (CEST) Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by mails.dpdk.org (Postfix) with ESMTP id 94ACE42BF0 for ; Wed, 12 Oct 2022 08:54:01 +0200 (CEST) Received: by mail-qv1-f50.google.com with SMTP id f14so10396007qvo.3 for ; Tue, 11 Oct 2022 23:54:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=EWCqR9MVy54xM02+P9SXzvgR+Mu4K8sRSBU/cSiGRlI=; b=MOuMg8cBgCT9XcSWaaWM9l2a5/xzArspceG5FWRBhRflRY+09km3jfd+9gi1XHAe5L 0+3jxOrDF8JWKkdTg7wLv9sCdeXE2LObeuvVAtyVdnW3nZvIwjEmpIA1UaCYNMDuKxbd k1KXKKgfa3HRAWuf9AJX1BkfZoO9zbWx3Czr9O7ZAxM4CcUpoZzppKVY9soh/crDXGCO OTY5ZSPk0ulQ1n2T+uueDfRYnIC0bc1Tqvrg1Z4rZ0lR262T2yjfggWsedHrWVHyrbfT E1vc8n0t+YOyc47st4jy7563gBcKs5gzpEczJGdRROJuV050t7xT2gn8b29bUQ6qgpLs EvBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=EWCqR9MVy54xM02+P9SXzvgR+Mu4K8sRSBU/cSiGRlI=; b=KpaJAIHNfGqOd0o76FFJGmCX6SniQJyVVBxfbOBMe/yLcO0kDHZG1DCzFcXZeufbfq 6MYpkY7Cth+GA0LOXmrWzFT+wUiIl7eZFuXcde6qNxvZ6GoF9WKBvygrpKZtwLO3j0ml lfxRqzE1kDPfZVVThYuE/0ZOeHHUGpW95sBUjIMzU5jDRo90LsnMIzQktgoLRYzlPwJe 5VjY3A7srvK3aoyeiask0jzCLQgW5ACwfRmqrT81VyqEdLjLZNbiYh+pdAJQvWSXU1uL EFk1+Vui362O4NV2dloHwWT3ZvMbT2cCRwv+7a/oHugdx70IbWM8kqZcQ7dWFqp73cX7 7+eQ== X-Gm-Message-State: ACrzQf2+ZQ4V66z1cAWnXeNezy+QT5cz7y+2Ot/lhCIV1J19Ctf6IG7w mND7M/bSglvo18h2aPAZFQfiMow6TOVcQCas0tY= X-Google-Smtp-Source: AMsMyM6icHIMRr31PiYhYxarkZ4fotzmlVWWQ6thRs7RjqVSknWTrkDd5IybgepiBA3dsoP8vEzZBFJVaW/Y/BM1LmE= X-Received: by 2002:ad4:5bc1:0:b0:4ad:34b2:d29c with SMTP id t1-20020ad45bc1000000b004ad34b2d29cmr22189971qvt.21.1665557640945; Tue, 11 Oct 2022 23:54:00 -0700 (PDT) MIME-Version: 1.0 References: <20221011120135.45846-1-ndabilpuram@marvell.com> <20221011120135.45846-13-ndabilpuram@marvell.com> In-Reply-To: <20221011120135.45846-13-ndabilpuram@marvell.com> From: Jerin Jacob Date: Wed, 12 Oct 2022 12:23:35 +0530 Message-ID: Subject: Re: [PATCH 13/13] net/cnxk: remove duplicate mempool debug checks To: Nithin Dabilpuram Cc: Kiran Kumar K , Sunil Kumar Kori , Satha Rao , jerinj@marvell.com, dev@dpdk.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org On Tue, Oct 11, 2022 at 5:33 PM Nithin Dabilpuram wrote: > > Remove duplicate mempool debug checks for mbufs received. > Fixes: 592642c494b1 ("net/cnxk: align prefetches to CN10K cache model") > > Signed-off-by: Nithin Dabilpuram # 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 >