From patchwork Fri Mar 19 21:08:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh Bhagavatula X-Patchwork-Id: 89584 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D5C5DA0524; Fri, 19 Mar 2021 22:08:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6B5F7141050; Fri, 19 Mar 2021 22:08:27 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 17C9014104E; Fri, 19 Mar 2021 22:08:25 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 12JL6Unt008848; Fri, 19 Mar 2021 14:08:25 -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-transfer-encoding : content-type; s=pfpt0220; bh=tlYjsJW3mEqOW904DpC8VbuY1l1aelk1CAsmf2GhDgA=; b=cqvegLo8o2eBmiQrNOVoVR7VDe/aQq5BpDC7vSEx6Th81em4aUeOXRvj7R5xOBzQ4FmM GXIF78ZGx2NvLSS8kg/jHJoKly7dYF5H8hTvnlsPrZjc3CpGrWyvq2QgFqIGu3ZREVkt nDnWJd/uFG0FQ+aXUs1uvYgDkk1hz1bwX+FAL4RLTJtY/65317YP5HazVjZDN6D3eh60 ESZ1CbD+WPaoNZwsjhEkWR+v3ooHNZjKA4r331eFmdod7bzryYHISgwBwZqxmyJ4MNPS 1XWbhJreJkT1yLfhn+G69d51lnZuYpIEJuLWPZActtcb9JfjzYgPToq4U6sWTlIZqMnG tQ== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com with ESMTP id 37cakqcfrt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 19 Mar 2021 14:08:25 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 19 Mar 2021 14:08:23 -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; Fri, 19 Mar 2021 14:08:23 -0700 Received: from BG-LT7430.marvell.com (BG-LT7430.marvell.com [10.28.177.176]) by maili.marvell.com (Postfix) with ESMTP id A98433F703F; Fri, 19 Mar 2021 14:08:21 -0700 (PDT) From: To: , Nithin Dabilpuram , "Pavan Nikhilesh" CC: , Date: Sat, 20 Mar 2021 02:38:15 +0530 Message-ID: <20210319210815.2884-1-pbhagavatula@marvell.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369, 18.0.761 definitions=2021-03-19_12:2021-03-19, 2021-03-19 signatures=0 Subject: [dpdk-dev] [PATCH] event/octeontx2: fix xaq pool reconfigure 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 Sender: "dev" From: Pavan Nikhilesh When XAQ pool is being re-configured, and if the same memzone is used for fc_mem when freeing the old mempool the fc_mem will be incorrectly updated with the free count. Fixes: ffa4ec0b6063 ("event/octeontx2: allow adapters to resize inflight buffers") Cc: stable@dpdk.org Signed-off-by: Pavan Nikhilesh --- drivers/common/octeontx2/otx2_mbox.h | 7 +++++++ drivers/event/octeontx2/otx2_evdev.c | 31 ++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/drivers/common/octeontx2/otx2_mbox.h b/drivers/common/octeontx2/otx2_mbox.h index 7e7667bf0..ae6c661ab 100644 --- a/drivers/common/octeontx2/otx2_mbox.h +++ b/drivers/common/octeontx2/otx2_mbox.h @@ -177,6 +177,8 @@ M(SSO_GRP_GET_STATS, 0x609, sso_grp_get_stats, sso_info_req, \ sso_grp_stats) \ M(SSO_HWS_GET_STATS, 0x610, sso_hws_get_stats, sso_info_req, \ sso_hws_stats) \ +M(SSO_HW_RELEASE_XAQ, 0x611, sso_hw_release_xaq_aura, \ + sso_release_xaq, msg_rsp) \ /* TIM mbox IDs (range 0x800 - 0x9FF) */ \ M(TIM_LF_ALLOC, 0x800, tim_lf_alloc, tim_lf_alloc_req, \ tim_lf_alloc_rsp) \ @@ -1190,6 +1192,11 @@ struct sso_hw_setconfig { uint16_t __otx2_io hwgrps; }; +struct sso_release_xaq { + struct mbox_msghdr hdr; + uint16_t __otx2_io hwgrps; +}; + struct sso_info_req { struct mbox_msghdr hdr; union { diff --git a/drivers/event/octeontx2/otx2_evdev.c b/drivers/event/octeontx2/otx2_evdev.c index 7e2343599..770a801c4 100644 --- a/drivers/event/octeontx2/otx2_evdev.c +++ b/drivers/event/octeontx2/otx2_evdev.c @@ -986,7 +986,7 @@ sso_xaq_allocate(struct otx2_sso_evdev *dev) dev->fc_iova = mz->iova; dev->fc_mem = mz->addr; - + *dev->fc_mem = 0; aura = (struct npa_aura_s *)((uintptr_t)dev->fc_mem + OTX2_ALIGN); memset(aura, 0, sizeof(struct npa_aura_s)); @@ -1062,6 +1062,19 @@ sso_ggrp_alloc_xaq(struct otx2_sso_evdev *dev) return otx2_mbox_process(mbox); } +static int +sso_ggrp_free_xaq(struct otx2_sso_evdev *dev) +{ + struct otx2_mbox *mbox = dev->mbox; + struct sso_release_xaq *req; + + otx2_sso_dbg("Freeing XAQ for GGRPs"); + req = otx2_mbox_alloc_msg_sso_hw_release_xaq_aura(mbox); + req->hwgrps = dev->nb_event_queues; + + return otx2_mbox_process(mbox); +} + static void sso_lf_teardown(struct otx2_sso_evdev *dev, enum otx2_sso_lf_type lf_type) @@ -1452,12 +1465,16 @@ sso_cleanup(struct rte_eventdev *event_dev, uint8_t enable) ssogws_reset((struct otx2_ssogws *)&ws->ws_state[1]); ws->swtag_req = 0; ws->vws = 0; + ws->fc_mem = dev->fc_mem; + ws->xaq_lmt = dev->xaq_lmt; } else { struct otx2_ssogws *ws; ws = event_dev->data->ports[i]; ssogws_reset(ws); ws->swtag_req = 0; + ws->fc_mem = dev->fc_mem; + ws->xaq_lmt = dev->xaq_lmt; } } @@ -1498,28 +1515,30 @@ int sso_xae_reconfigure(struct rte_eventdev *event_dev) { struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev); - struct rte_mempool *prev_xaq_pool; int rc = 0; if (event_dev->data->dev_started) sso_cleanup(event_dev, 0); - prev_xaq_pool = dev->xaq_pool; + rc = sso_ggrp_free_xaq(dev); + if (rc < 0) { + otx2_err("Failed to free XAQ\n"); + return rc; + } + + rte_mempool_free(dev->xaq_pool); dev->xaq_pool = NULL; rc = sso_xaq_allocate(dev); if (rc < 0) { otx2_err("Failed to alloc xaq pool %d", rc); - rte_mempool_free(prev_xaq_pool); return rc; } rc = sso_ggrp_alloc_xaq(dev); if (rc < 0) { otx2_err("Failed to alloc xaq to ggrp %d", rc); - rte_mempool_free(prev_xaq_pool); return rc; } - rte_mempool_free(prev_xaq_pool); rte_mb(); if (event_dev->data->dev_started) sso_cleanup(event_dev, 1);