From patchwork Mon Sep 6 07:54:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil Kumar Kori X-Patchwork-Id: 98059 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 EDF87A0C4D; Mon, 6 Sep 2021 09:57:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8FB3E41178; Mon, 6 Sep 2021 09:55:48 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 2476341183 for ; Mon, 6 Sep 2021 09:55:47 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 185Npttw013220 for ; Mon, 6 Sep 2021 00:55:46 -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=G3terSR/Y9uuoMBZ3Ui3zbNL8vgG5yipMdD48K0Zqd0=; b=AdZcfWS+xeVFmAsw6ByRTSjJO7QPwJG+ZKRrGhnJ0byuVqdqO158vb1kLvATi7CXMnSE ozcKNMuRHQxyCkgXLAxx+fF3EcyPumdv+ceiifqxpxbDzI/h/fgh1uOFARFE3tHiWVTF 2kBoqnti3e9vTfdNs89gFdQjIxw7jfLJ4WFZBvW+CZXFlnp7yAgkuOJka6xrDpLpCC9N 3D3SZj638cNOJDe/U0eNIpuR80+3tVr8m6+ukVodv4tJGM2yAlAs9x6R/BvmCLHEoM0A IhwaxjX4ChqmSX+uYMnyCaDwaz4sr78Vx+MeF4OaVy6l8zihguJJNAR2AZOONJ+nbmqJ Ig== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com with ESMTP id 3aw2sp1spw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Mon, 06 Sep 2021 00:55:46 -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.18; Mon, 6 Sep 2021 00:55:44 -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.18 via Frontend Transport; Mon, 6 Sep 2021 00:55:44 -0700 Received: from localhost.localdomain (unknown [10.28.34.25]) by maili.marvell.com (Postfix) with ESMTP id 151C93F709E; Mon, 6 Sep 2021 00:55:42 -0700 (PDT) From: To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: Date: Mon, 6 Sep 2021 13:24:45 +0530 Message-ID: <20210906075450.1452123-22-skori@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210906075450.1452123-1-skori@marvell.com> References: <20210906075450.1452123-1-skori@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: r6H0xtod6xZZ-ZMfDF-Fynnj7daI2p_r X-Proofpoint-ORIG-GUID: r6H0xtod6xZZ-ZMfDF-Fynnj7daI2p_r X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475 definitions=2021-09-06_02,2021-09-03_01,2020-04-07_01 Subject: [dpdk-dev] [PATCH 22/27] net/cnxk: support ops to create meter 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: Sunil Kumar Kori Implement API to create meter instance for CN10K platform. Signed-off-by: Sunil Kumar Kori --- drivers/net/cnxk/cn10k_ethdev_mtr.c | 75 +++++++++++++++++++++++++++++ drivers/net/cnxk/cnxk_ethdev.h | 20 ++++++++ 2 files changed, 95 insertions(+) diff --git a/drivers/net/cnxk/cn10k_ethdev_mtr.c b/drivers/net/cnxk/cn10k_ethdev_mtr.c index 7273b88046..dbf74249c7 100644 --- a/drivers/net/cnxk/cn10k_ethdev_mtr.c +++ b/drivers/net/cnxk/cn10k_ethdev_mtr.c @@ -37,6 +37,18 @@ static struct rte_mtr_capabilities mtr_capa = { RTE_MTR_STATS_N_BYTES_YELLOW | RTE_MTR_STATS_N_BYTES_RED | RTE_MTR_STATS_N_BYTES_DROPPED}; +static struct cn10k_flow_meter * +nix_mtr_find(struct cnxk_eth_dev *dev, uint32_t meter_id) +{ + struct cn10k_mtr *fms = &dev->mtr; + struct cn10k_flow_meter *fm; + + TAILQ_FOREACH(fm, fms, next) + if (meter_id == fm->id) + return fm; + return NULL; +} + static struct cn10k_flow_meter_profile * nix_mtr_profile_find(struct cnxk_eth_dev *dev, uint32_t profile_id) { @@ -317,6 +329,68 @@ cn10k_nix_mtr_policy_delete(struct rte_eth_dev *eth_dev, uint32_t policy_id, return 0; } +static int +cn10k_nix_mtr_create(struct rte_eth_dev *eth_dev, uint32_t mtr_id, + struct rte_mtr_params *params, int shared, + struct rte_mtr_error *error) +{ + struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev); + struct cn10k_flow_meter_profile *profile; + struct cn10k_flow_meter_policy *policy; + struct cn10k_mtr *fm = &dev->mtr; + struct cn10k_flow_meter *mtr; + + RTE_SET_USED(shared); + + if (params == NULL) + return -rte_mtr_error_set(error, ENOENT, + RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL, + "Meter params are invalid."); + + profile = nix_mtr_profile_find(dev, params->meter_profile_id); + if (profile == NULL) + return -rte_mtr_error_set(error, ENOENT, + RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, + ¶ms->meter_profile_id, + "Meter profile is invalid."); + + policy = nix_mtr_policy_find(dev, params->meter_policy_id); + if (policy == NULL) + return -rte_mtr_error_set(error, ENOENT, + RTE_MTR_ERROR_TYPE_METER_POLICY_ID, + ¶ms->meter_policy_id, + "Meter policy is invalid."); + + mtr = nix_mtr_find(dev, mtr_id); + if (mtr == NULL) { + mtr = plt_zmalloc(sizeof(struct cn10k_flow_meter), ROC_ALIGN); + if (mtr == NULL) { + return -rte_mtr_error_set(error, ENOMEM, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, + "Meter memory alloc failed."); + } else { + mtr->id = mtr_id; + mtr->profile = profile; + mtr->policy = policy; + mtr->params = *params; + mtr->bpf_id = ROC_NIX_BPF_ID_INVALID; + mtr->prev_id = ROC_NIX_BPF_ID_INVALID; + mtr->next_id = ROC_NIX_BPF_ID_INVALID; + mtr->is_prev = false; + mtr->is_next = false; + mtr->level = ROC_NIX_BPF_LEVEL_IDX_INVALID; + } + } else { + plt_info("Meter already exist"); + return 0; + } + + profile->ref_cnt++; + policy->ref_cnt++; + TAILQ_INSERT_TAIL(fm, mtr, next); + return 0; +} + const struct rte_mtr_ops nix_mtr_ops = { .capabilities_get = cn10k_nix_mtr_capabilities_get, .meter_profile_add = cn10k_nix_mtr_profile_add, @@ -324,6 +398,7 @@ const struct rte_mtr_ops nix_mtr_ops = { .meter_policy_validate = cn10k_nix_mtr_policy_validate, .meter_policy_add = cn10k_nix_mtr_policy_add, .meter_policy_delete = cn10k_nix_mtr_policy_delete, + .create = cn10k_nix_mtr_create, }; int diff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h index 3811360b75..c8ddcab8f1 100644 --- a/drivers/net/cnxk/cnxk_ethdev.h +++ b/drivers/net/cnxk/cnxk_ethdev.h @@ -145,6 +145,24 @@ struct cnxk_timesync_info { uint64_t *tx_tstamp; } __plt_cache_aligned; +struct cn10k_flow_meter { + TAILQ_ENTRY(cn10k_flow_meter) next; + /**< Pointer to the next flow meter structure. */ + uint32_t id; /**< Usr mtr id. */ + struct cn10k_flow_meter_profile *profile; + struct cn10k_flow_meter_policy *policy; + uint32_t bpf_id; /**< Hw mtr id. */ + uint32_t rq_num; + uint32_t *rq_id; + uint16_t level; + uint32_t prev_id; /**< Prev mtr id for chaining */ + uint32_t next_id; /**< Next mtr id for chaining */ + bool is_prev; + bool is_next; + struct rte_mtr_params params; + struct roc_nix_bpf_objs profs; + uint32_t ref_cnt; +}; struct cn10k_flow_meter_policy { TAILQ_ENTRY(cn10k_flow_meter_policy) next; @@ -164,6 +182,7 @@ struct cn10k_flow_meter_profile { TAILQ_HEAD(cn10k_mtr_profiles, cn10k_flow_meter_profile); TAILQ_HEAD(cn10k_mtr_policy, cn10k_flow_meter_policy); +TAILQ_HEAD(cn10k_mtr, cn10k_flow_meter); struct cnxk_eth_dev { /* ROC NIX */ @@ -235,6 +254,7 @@ struct cnxk_eth_dev { /* Ingress policer */ struct cn10k_mtr_profiles mtr_profiles; struct cn10k_mtr_policy mtr_policy; + struct cn10k_mtr mtr; /* Rx burst for cleanup(Only Primary) */ eth_rx_burst_t rx_pkt_burst_no_offload;