From patchwork Tue Apr 11 09:11:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nithin Dabilpuram X-Patchwork-Id: 125910 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 805374291B; Tue, 11 Apr 2023 11:12:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 42D3442D0E; Tue, 11 Apr 2023 11:12:19 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 01A12427EE for ; Tue, 11 Apr 2023 11:12:17 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33B8g4Dg014876 for ; Tue, 11 Apr 2023 02:12:17 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=9t5F6QXl2+OkXJvfrO0FqCi0ioTbm2jGib5xFv65nWs=; b=C+hiflbi1S7DSSsCAXRM7jPGG6OYMcuwsjWEU0znGieUUBFwImjgH6BSuSB/j8yLTvWJ XqkEcius3wu77uhTK6wQczZ6MgFwEpwbgoF+EUh4STB6B0rWY82e1KifaZgiLsM4no3w LjH8dwpzUyQJiqtYMPkYLm3xMldOXQz39cn9Edw032t2ZMcq2tJNrG+3I5oUzsXVCgfi eIl4CLvWTM1GlMytwd4b+tBrerltySPnxAvaS27AEytTaCDJLfJvL3CJsOc2EQQ/j6AR TM78Z4GaJUkkq3UI8jd1fdo2L2jyQz598DMUohpuI2zeAY8ek6RE5SbEQ9xiFB7K4vAZ bQ== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3purfs94fm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 11 Apr 2023 02:12:17 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Tue, 11 Apr 2023 02:12:15 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Tue, 11 Apr 2023 02:12:14 -0700 Received: from hyd1588t430.caveonetworks.com (unknown [10.29.52.204]) by maili.marvell.com (Postfix) with ESMTP id C68493F7071; Tue, 11 Apr 2023 02:12:12 -0700 (PDT) From: Nithin Dabilpuram To: Nithin Kumar Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , Subject: [PATCH 05/21] common/cnxk: dump SW SSO work count as xstat Date: Tue, 11 Apr 2023 14:41:28 +0530 Message-ID: <20230411091144.1087887-5-ndabilpuram@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230411091144.1087887-1-ndabilpuram@marvell.com> References: <20230411091144.1087887-1-ndabilpuram@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: Z2BtoPYEh3pcySL58y3pvYOMpv_EXkiT X-Proofpoint-GUID: Z2BtoPYEh3pcySL58y3pvYOMpv_EXkiT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-11_05,2023-04-06_03,2023-02-09_01 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 Dump SW SSO work count as xstat. Signed-off-by: Nithin Dabilpuram --- drivers/common/cnxk/roc_nix_inl_dev_irq.c | 1 + drivers/common/cnxk/roc_nix_inl_priv.h | 1 + drivers/common/cnxk/roc_nix_stats.c | 17 +++++++++++------ drivers/common/cnxk/roc_nix_xstats.h | 4 ++++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/common/cnxk/roc_nix_inl_dev_irq.c b/drivers/common/cnxk/roc_nix_inl_dev_irq.c index 445b440447..becd7907f2 100644 --- a/drivers/common/cnxk/roc_nix_inl_dev_irq.c +++ b/drivers/common/cnxk/roc_nix_inl_dev_irq.c @@ -41,6 +41,7 @@ nix_inl_sso_work_cb(struct nix_inl_dev *inl_dev) goto again; } + inl_dev->sso_work_cnt += cnt; plt_atomic_thread_fence(__ATOMIC_ACQ_REL); } diff --git a/drivers/common/cnxk/roc_nix_inl_priv.h b/drivers/common/cnxk/roc_nix_inl_priv.h index 528d2db365..b0a8976c6b 100644 --- a/drivers/common/cnxk/roc_nix_inl_priv.h +++ b/drivers/common/cnxk/roc_nix_inl_priv.h @@ -57,6 +57,7 @@ struct nix_inl_dev { bool is_nix1; uint8_t spb_drop_pc; uint8_t lpb_drop_pc; + uint64_t sso_work_cnt; /* NIX/CPT data */ void *inb_sa_base; diff --git a/drivers/common/cnxk/roc_nix_stats.c b/drivers/common/cnxk/roc_nix_stats.c index 6b5803af84..ca0e8ccb4f 100644 --- a/drivers/common/cnxk/roc_nix_stats.c +++ b/drivers/common/cnxk/roc_nix_stats.c @@ -24,12 +24,7 @@ int roc_nix_num_xstats_get(struct roc_nix *roc_nix) { - if (roc_nix_is_vf_or_sdp(roc_nix)) - return CNXK_NIX_NUM_XSTATS_REG; - else if (roc_model_is_cn9k()) - return CNXK_NIX_NUM_XSTATS_CGX; - - return CNXK_NIX_NUM_XSTATS_RPM; + return roc_nix_xstats_names_get(roc_nix, NULL, 0); } int @@ -360,6 +355,12 @@ roc_nix_xstats_get(struct roc_nix *roc_nix, struct roc_nix_xstat *xstats, xstats[count].id = count; count++; } + for (i = 0; i < PLT_DIM(inl_sw_xstats); i++) { + if (!inl_sw_xstats[i].offset) + xstats[count].value = inl_dev->sso_work_cnt; + xstats[count].id = count; + count++; + } } } @@ -475,6 +476,10 @@ roc_nix_xstats_names_get(struct roc_nix *roc_nix, inl_nix_rq_xstats, i); count++; } + for (i = 0; i < PLT_DIM(inl_sw_xstats); i++) { + NIX_XSTATS_NAME_PRINT(xstats_names, count, inl_sw_xstats, i); + count++; + } } } diff --git a/drivers/common/cnxk/roc_nix_xstats.h b/drivers/common/cnxk/roc_nix_xstats.h index 813fb7f578..11b8e1c0ff 100644 --- a/drivers/common/cnxk/roc_nix_xstats.h +++ b/drivers/common/cnxk/roc_nix_xstats.h @@ -206,6 +206,10 @@ static const struct cnxk_nix_xstats_name nix_tx_xstats_cgx[] = { {"cgx_tx_pause_packets", CGX_TX_PAUSE_PKTS}, }; +static const struct cnxk_nix_xstats_name inl_sw_xstats[] = { + {"inl_sso_work_cnt", 0}, +}; + #define CNXK_NIX_NUM_RX_XSTATS PLT_DIM(nix_rx_xstats) #define CNXK_NIX_NUM_TX_XSTATS PLT_DIM(nix_tx_xstats) #define CNXK_NIX_NUM_QUEUE_XSTATS PLT_DIM(nix_q_xstats)