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 5D79FA04DD; Wed, 28 Oct 2020 12:39:47 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 36F1DCADC; Wed, 28 Oct 2020 12:39:46 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 045AFCACE for ; Wed, 28 Oct 2020 12:39:43 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 09SBUOAk023750 for ; Wed, 28 Oct 2020 04:39:41 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=pfpt0220; bh=YSPlhjjLMFJx/7heo2+39krgtd4SpSgBHqE1EXVGkto=; b=gxqkdndZgQe6OxJA1S+EL35Ze+JxF9UtvccnR7ZtK8I8FbsKPUA4vpIKvg1eYKo2/2UJ 3ACvzG8rqLBempKYB+Ypz9X8DmfTyjcSMfTggxOd1xKQOzd1XPejvvE1W8wc/sjDmh02 r9oYsXhKmjZe14zEYzzsZv5rc4LsUQONkAZt00BQKDGmSk59h2ojB6sQF8NjXL1fC0ae Ioybz07kn/tL0I6aO/8ROZnDmm6wrNLSmnpmtdOGDrtY2T6RqtqaIRsQ9rO/OpxUCckB 0WIz7892mDHbcj5+PC5Fq+WB29rrYMkp9Gs3MiI3u7oG/3Rl5QuUsjJ2SCsE82R+TOeX xg== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0a-0016f401.pphosted.com with ESMTP id 34chmn7dm4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 28 Oct 2020 04:39:41 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 28 Oct 2020 04:39:40 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 28 Oct 2020 04:39:39 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 28 Oct 2020 04:39:39 -0700 Received: from hyd1588t430.marvell.com (unknown [10.29.52.204]) by maili.marvell.com (Postfix) with ESMTP id 484E03F7040; Wed, 28 Oct 2020 04:39:36 -0700 (PDT) From: Nithin Dabilpuram To: Pavan Nikhilesh , Jerin Jacob , Nithin Dabilpuram , "Kiran Kumar K" CC: Date: Wed, 28 Oct 2020 17:09:34 +0530 Message-ID: <20201028113934.6422-1-ndabilpuram@marvell.com> X-Mailer: git-send-email 2.8.4 MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312, 18.0.737 definitions=2020-10-28_04:2020-10-26, 2020-10-28 signatures=0 Subject: [dpdk-dev] [PATCH] 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" Avoid per-pkt barrier with multi-seg with fast free and remove mbuf update to NULL. Signed-off-by: Nithin Dabilpuram Signed-off-by: Jerin Jacob --- 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