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 38EDCA04E6; Tue, 17 Nov 2020 17:46:46 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B31D337B1; Tue, 17 Nov 2020 17:46:43 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id A4DF9F3E; Tue, 17 Nov 2020 17:46:41 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0AHGj9Ta023153; Tue, 17 Nov 2020 08:46:39 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=eQyhYOtkVCQ6plYgEgBnDr1C4orBwu0GFEC/RBKGUMQ=; b=BCwqWIR1rp+iZy9+hOJQHwDVbeWl7cx22O94amKfOWuSAtrg5HyK69M5pOpD51ue7brE iEe+WkySW67xkvySlACt48lVEWOZJeB7H+a3sDVDrquPWEfLdpljIosVzPL54xDklJi3 q3OyTW0HCxrmis2gDTv6HLX/Jz3DD+GmnHWzu2KI6YFABk8B+Em1z8CblIrXZZHVQAjL U+DCPV4cKSShvx8FuT0m4xSODA106M5n7Ebhm3icPkcAs3UEEPHoeQmnEvkAL9PFWMCR MYxD2SgHgoWus6PM85aK7Sf73T81K/nxaxlcpzCCxvEnlGKtdefCrCQfdEwvjPguQ91i 3w== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0b-0016f401.pphosted.com with ESMTP id 34tfmshney-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 17 Nov 2020 08:46:39 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 17 Nov 2020 08:46:37 -0800 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; Tue, 17 Nov 2020 08:46:37 -0800 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; Tue, 17 Nov 2020 08:46:37 -0800 Received: from BG-LT7430.marvell.com (BG-LT7430.marvell.com [10.28.170.178]) by maili.marvell.com (Postfix) with ESMTP id 1DB953F703F; Tue, 17 Nov 2020 08:46:34 -0800 (PST) From: To: , Pavan Nikhilesh CC: , Date: Tue, 17 Nov 2020 22:16:29 +0530 Message-ID: <20201117164630.2971-1-pbhagavatula@marvell.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312, 18.0.737 definitions=2020-11-17_06:2020-11-17, 2020-11-17 signatures=0 Subject: [dpdk-dev] [PATCH] event/octeontx2: fix unintended flush in Tx enqueue 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" From: Pavan Nikhilesh SSO workslot shouldn't be flushed on Tx adapter enqueue as application might use reference count to re-transmit or forward the packet. Fixes: cb7ee83b6365 ("event/octeontx2: improve single flow performance") Cc: stable@dpdk.org Signed-off-by: Pavan Nikhilesh --- drivers/event/octeontx2/otx2_evdev.h | 1 + drivers/event/octeontx2/otx2_worker.h | 6 ++++-- drivers/event/octeontx2/otx2_worker_dual.c | 8 ++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/event/octeontx2/otx2_evdev.h b/drivers/event/octeontx2/otx2_evdev.h index 547e29d4a..e4e444ed7 100644 --- a/drivers/event/octeontx2/otx2_evdev.h +++ b/drivers/event/octeontx2/otx2_evdev.h @@ -79,6 +79,7 @@ #define SSOW_LF_GWS_OP_GWC_INVAL (0xe00ull) #define OTX2_SSOW_GET_BASE_ADDR(_GW) ((_GW) - SSOW_LF_GWS_OP_GET_WORK) +#define OTX2_SSOW_TT_FROM_TAG(x) (((x) >> 32) & SSO_TT_EMPTY) #define NSEC2USEC(__ns) ((__ns) / 1E3) #define USEC2NSEC(__us) ((__us) * 1E3) diff --git a/drivers/event/octeontx2/otx2_worker.h b/drivers/event/octeontx2/otx2_worker.h index 3efd3ba97..67893f669 100644 --- a/drivers/event/octeontx2/otx2_worker.h +++ b/drivers/event/octeontx2/otx2_worker.h @@ -198,6 +198,10 @@ otx2_ssogws_swtag_untag(struct otx2_ssogws *ws) static __rte_always_inline void otx2_ssogws_swtag_flush(struct otx2_ssogws *ws) { + if (OTX2_SSOW_TT_FROM_TAG(otx2_read64(ws->tag_op)) == SSO_TT_EMPTY) { + ws->cur_tt = SSO_SYNC_EMPTY; + return; + } otx2_write64(0, ws->swtag_flush_op); ws->cur_tt = SSO_SYNC_EMPTY; } @@ -329,8 +333,6 @@ otx2_ssogws_event_tx(struct otx2_ssogws *ws, struct rte_event ev[], } } - otx2_write64(0, ws->swtag_flush_op); - return 1; } diff --git a/drivers/event/octeontx2/otx2_worker_dual.c b/drivers/event/octeontx2/otx2_worker_dual.c index 946488eab..f1823e29c 100644 --- a/drivers/event/octeontx2/otx2_worker_dual.c +++ b/drivers/event/octeontx2/otx2_worker_dual.c @@ -157,6 +157,8 @@ otx2_ssogws_dual_deq_ ##name(void *port, struct rte_event *ev, \ return 1; \ } \ \ + otx2_ssogws_swtag_flush((struct otx2_ssogws *) \ + &ws->ws_state[!ws->vws]); \ gw = otx2_ssogws_dual_get_work(&ws->ws_state[ws->vws], \ &ws->ws_state[!ws->vws], ev, \ flags, ws->lookup_mem, \ @@ -191,6 +193,8 @@ otx2_ssogws_dual_deq_timeout_ ##name(void *port, struct rte_event *ev, \ return 1; \ } \ \ + otx2_ssogws_swtag_flush((struct otx2_ssogws *) \ + &ws->ws_state[!ws->vws]); \ gw = otx2_ssogws_dual_get_work(&ws->ws_state[ws->vws], \ &ws->ws_state[!ws->vws], ev, \ flags, ws->lookup_mem, \ @@ -235,6 +239,8 @@ otx2_ssogws_dual_deq_seg_ ##name(void *port, struct rte_event *ev, \ return 1; \ } \ \ + otx2_ssogws_swtag_flush((struct otx2_ssogws *) \ + &ws->ws_state[!ws->vws]); \ gw = otx2_ssogws_dual_get_work(&ws->ws_state[ws->vws], \ &ws->ws_state[!ws->vws], ev, \ flags | NIX_RX_MULTI_SEG_F, \ @@ -273,6 +279,8 @@ otx2_ssogws_dual_deq_seg_timeout_ ##name(void *port, \ return 1; \ } \ \ + otx2_ssogws_swtag_flush((struct otx2_ssogws *) \ + &ws->ws_state[!ws->vws]); \ gw = otx2_ssogws_dual_get_work(&ws->ws_state[ws->vws], \ &ws->ws_state[!ws->vws], ev, \ flags | NIX_RX_MULTI_SEG_F, \ -- 2.17.1