From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B3238A04E6; Sat, 31 Oct 2020 14:56:15 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 19638CA90; Sat, 31 Oct 2020 14:56:14 +0100 (CET) Received: from mail-il1-f194.google.com (mail-il1-f194.google.com [209.85.166.194]) by dpdk.org (Postfix) with ESMTP id 89D91CA8F; Sat, 31 Oct 2020 14:56:11 +0100 (CET) Received: by mail-il1-f194.google.com with SMTP id q1so9008388ilt.6; Sat, 31 Oct 2020 06:56:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=2vRDzi/pzcLkhH7Y06ktenT3QrXoUpO1E1Zh+iBbjNY=; b=ARCumW7ohJJL0MFWzg//9CFAWVqeuDK696GZmmrrurM5IR8Q83Cya213FnNzmGbot1 wajuhkLZbxe41dcjibVnXnE+Vy504oLYr+bHnb1zY321z5HiZMEZ+N9WaZnpTh1ZlLIj bcUhplvGXibkAZzpVTHVxUTYybHuzZzbV7Q9Uk0clgvACHFO/zfeTWjS1/I7IAwlPpBN Ug0DmboguCwLo7TOOnUUbwaf66pQBsGK66b/0BQBGnxCsYHX/hHfB1veD/lnbLkAxopY QcYJ6Dqsu6N3Id+71oend21p6R2banbee2eEeV4L/RYpNoHgQ5hib2RCZminz06vV5OV gzVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=2vRDzi/pzcLkhH7Y06ktenT3QrXoUpO1E1Zh+iBbjNY=; b=Noy8HzJfAhunZvdbVosnmDytCDl4tc62x/1S791JBP9CobpAa5exrT/avhZgFEysfg Q2pk1HkyzBKJL/8m8B8EWJjl9HskYgsOIo5bv50EKhchQpq0eVm917YZhRatTqRVl66d nodiNedSCq836gcHTRY32yeJ72MvU7p43fcdwK/cfa8Hi9vweiUxJLUNjorHef7q7fh8 69jaDGbdHuXXAdpkdWFlBfkCZD8xcOohsVnpGsnyPsEP5Vt35Fpe7VItjNnFFZs108yl NqFkxzz9fb/7aIcSem+F8TfhrrWBU31O8M3BoH8Y0Y6Fx1NwxbSgroC9gQh8ozF4LSWM 4FAw== X-Gm-Message-State: AOAM531G8mecXN264v4sew7nCHWh+sonUJO7uRCC+JIPmI2ws+Qmkwaa 8WONmN33wnTlmtjQrMSly4VyKjaxzmesGEVJ690= X-Google-Smtp-Source: ABdhPJwk68LGmSkBG5D6jUowQ3s8dnqxb2c7d/FvZ7644XVwT9Blban+gKCUA6ldaHBsH1OknivmQzkfMyWJBnha+/s= X-Received: by 2002:a05:6e02:5d1:: with SMTP id l17mr5386794ils.130.1604152569830; Sat, 31 Oct 2020 06:56:09 -0700 (PDT) MIME-Version: 1.0 References: <20201028113934.6422-1-ndabilpuram@marvell.com> <20201028114643.6723-1-ndabilpuram@marvell.com> In-Reply-To: <20201028114643.6723-1-ndabilpuram@marvell.com> From: Jerin Jacob Date: Sat, 31 Oct 2020 19:25:53 +0530 Message-ID: To: Nithin Dabilpuram , Ferruh Yigit Cc: Pavan Nikhilesh , Jerin Jacob , Kiran Kumar K , dpdk-dev , Harman Kalra , dpdk stable Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH v2] net/octeontx2: avoid per-pkt barrier with multi seg X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Wed, Oct 28, 2020 at 5:17 PM Nithin Dabilpuram wrote: > > Avoid per-pkt barrier with multi-seg with fast free > and remove mbuf update to NULL. > > Fixes: ce8628c66a22 ("net/octeontx2: fix jumbo frame crash") > Cc: hkalra@marvell.com > Cc: stable@dpdk.org > > Signed-off-by: Nithin Dabilpuram > Signed-off-by: Jerin Jacob Applied to dpdk-next-net-mrvl/for-main. Thanks > --- > > v2: > - Add fixes tag and also cc stable > > drivers/event/octeontx2/otx2_worker.h | 22 ++++++++-------------- > drivers/net/octeontx2/otx2_tx.c | 8 ++++++-- > drivers/net/octeontx2/otx2_tx.h | 12 ++++++++---- > 3 files changed, 22 insertions(+), 20 deletions(-) > > diff --git a/drivers/event/octeontx2/otx2_worker.h b/drivers/event/octeontx2/otx2_worker.h > index 4501f4e..3efd3ba 100644 > --- a/drivers/event/octeontx2/otx2_worker.h > +++ b/drivers/event/octeontx2/otx2_worker.h > @@ -288,18 +288,12 @@ otx2_ssogws_event_tx(struct otx2_ssogws *ws, struct rte_event ev[], > > /* Perform header writes before barrier for TSO */ > otx2_nix_xmit_prepare_tso(m, flags); > - /* Lets commit any changes in the packet here in case of single seg as > - * no further changes to mbuf will be done. > - * While for multi seg all mbufs used are set to NULL in > - * otx2_nix_prepare_mseg() after preparing the sg list and these changes > - * should be committed before LMTST. > - * Also in no fast free case some mbuf fields are updated in > - * otx2_nix_prefree_seg > - * Hence otx2_nix_xmit_submit_lmt_release/otx2_nix_xmit_mseg_one_release > - * has store barrier for multiseg. > + /* Lets commit any changes in the packet here in case when > + * fast free is set as no further changes will be made to mbuf. > + * In case of fast free is not set, both otx2_nix_prepare_mseg() > + * and otx2_nix_xmit_prepare() has a barrier after refcnt update. > */ > - if (!(flags & NIX_TX_MULTI_SEG_F) && > - !(flags & NIX_TX_OFFLOAD_MBUF_NOFF_F)) > + if (!(flags & NIX_TX_OFFLOAD_MBUF_NOFF_F)) > rte_io_wmb(); > txq = otx2_ssogws_xtract_meta(m, txq_data); > otx2_ssogws_prepare_pkt(txq, m, cmd, flags); > @@ -311,12 +305,12 @@ otx2_ssogws_event_tx(struct otx2_ssogws *ws, struct rte_event ev[], > if (!ev->sched_type) { > otx2_nix_xmit_mseg_prep_lmt(cmd, txq->lmt_addr, segdw); > otx2_ssogws_head_wait(ws); > - if (otx2_nix_xmit_submit_lmt_release(txq->io_addr) == 0) > + if (otx2_nix_xmit_submit_lmt(txq->io_addr) == 0) > otx2_nix_xmit_mseg_one(cmd, txq->lmt_addr, > txq->io_addr, segdw); > } else { > - otx2_nix_xmit_mseg_one_release(cmd, txq->lmt_addr, > - txq->io_addr, segdw); > + otx2_nix_xmit_mseg_one(cmd, txq->lmt_addr, > + txq->io_addr, segdw); > } > } else { > /* Passing no of segdw as 4: HDR + EXT + SG + SMEM */ > diff --git a/drivers/net/octeontx2/otx2_tx.c b/drivers/net/octeontx2/otx2_tx.c > index 4458d8b..439c46f 100644 > --- a/drivers/net/octeontx2/otx2_tx.c > +++ b/drivers/net/octeontx2/otx2_tx.c > @@ -77,11 +77,15 @@ nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts, > otx2_nix_xmit_prepare_tso(tx_pkts[i], flags); > } > > + /* Lets commit any changes in the packet here as no further changes > + * to the packet will be done unless no fast free is enabled. > + */ > + if (!(flags & NIX_TX_OFFLOAD_MBUF_NOFF_F)) > + rte_io_wmb(); > + > for (i = 0; i < pkts; i++) { > otx2_nix_xmit_prepare(tx_pkts[i], cmd, flags); > segdw = otx2_nix_prepare_mseg(tx_pkts[i], cmd, flags); > - /* Lets commit any changes in the packet */ > - rte_io_wmb(); > otx2_nix_xmit_prepare_tstamp(cmd, &txq->cmd[0], > tx_pkts[i]->ol_flags, segdw, > flags); > diff --git a/drivers/net/octeontx2/otx2_tx.h b/drivers/net/octeontx2/otx2_tx.h > index d6ea3b4..a97b160 100644 > --- a/drivers/net/octeontx2/otx2_tx.h > +++ b/drivers/net/octeontx2/otx2_tx.h > @@ -440,13 +440,17 @@ otx2_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags) > sg_u = sg_u | ((uint64_t)m->data_len << (i << 4)); > *slist = rte_mbuf_data_iova(m); > /* Set invert df if buffer is not to be freed by H/W */ > - if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) > + if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) { > sg_u |= (otx2_nix_prefree_seg(m) << (i + 55)); > + /* Commit changes to mbuf */ > + rte_io_wmb(); > + } > /* Mark mempool object as "put" since it is freed by NIX */ > - if (!(sg_u & (1ULL << (i + 55)))) { > - m->next = NULL; > +#ifdef RTE_LIBRTE_MEMPOOL_DEBUG > + if (!(sg_u & (1ULL << (i + 55)))) > __mempool_check_cookies(m->pool, (void **)&m, 1, 0); > - } > + rte_io_wmb(); > +#endif > slist++; > i++; > nb_segs--; > -- > 2.8.4 >