From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4BB38A034F; Tue, 1 Mar 2022 10:01:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7541C41C25; Tue, 1 Mar 2022 10:01:07 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 6E78541233 for ; Tue, 1 Mar 2022 10:01:06 +0100 (CET) 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 ESMTP id 2217Zk5w014315 for ; Tue, 1 Mar 2022 01:01:05 -0800 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=FkTJLleYP4rxDHEXVciMAnYl2CIBw3HjdQltQBMKlII=; b=cf76eyR/9rVQ83dsoRMO219dzd8iKiF3X1ZPbbMdE9KBAPuKL1KbO5/m5oTvQNR+ouJY jwXeiad7pFhv4FrinxS7IG6NGFNbPjN4TKnsQ6NHbGDLVZRTRsZhU4up3+8E38lnqIYl FP/Zx+dRayr4dRzIXdZYSdGeDX9qPZLoSSKErFp1HEn4xFMZ/943e7tRPgE10B4pY83s qfhniDvFlCZFVjh5/5e4uXoExL6DKQWCzMR1QSeK6/Mj2qSr0Ad+Bsb/fHab9SLXqhll WJs3e/sfwWbGlT2OeONo5xNQ4aM2zsHB1G3Pe3ol/aTb1+AejRYxnJ64IaLfN4JE2ebP Ng== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3ehf7v0abv-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 01 Mar 2022 01:01:05 -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, 1 Mar 2022 01:01:03 -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.18 via Frontend Transport; Tue, 1 Mar 2022 01:01:03 -0800 Received: from localhost.localdomain (unknown [10.28.34.25]) by maili.marvell.com (Postfix) with ESMTP id D80695B696A; Tue, 1 Mar 2022 01:01:01 -0800 (PST) From: To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: Subject: [PATCH v1 2/3] net/cnxk: support ops to update precolor VLAN table Date: Tue, 1 Mar 2022 14:30:54 +0530 Message-ID: <20220301090056.1042866-2-skori@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220301090056.1042866-1-skori@marvell.com> References: <20220301090056.1042866-1-skori@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: fBYsn0ixHBDAJEA4X63kw7XxAFXr7Gbu X-Proofpoint-GUID: fBYsn0ixHBDAJEA4X63kw7XxAFXr7Gbu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-02-28_10,2022-02-26_01,2022-02-23_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 From: Sunil Kumar Kori Implement API to update VLAN table for pre-coloring for incoming packet per nixlf for CN10K platform. Signed-off-by: Sunil Kumar Kori --- drivers/net/cnxk/cnxk_ethdev.h | 2 +- drivers/net/cnxk/cnxk_ethdev_mtr.c | 214 +++++++++++++++++++++++++---- 2 files changed, 188 insertions(+), 28 deletions(-) diff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h index ccdf496860..7c7e013c42 100644 --- a/drivers/net/cnxk/cnxk_ethdev.h +++ b/drivers/net/cnxk/cnxk_ethdev.h @@ -409,7 +409,7 @@ struct cnxk_eth_dev { uint64_t clk_delta; /* Ingress policer */ - enum roc_nix_bpf_color precolor_tbl[ROC_NIX_BPF_PRE_COLOR_MAX]; + enum roc_nix_bpf_color precolor_tbl[ROC_NIX_BPF_PRECOLOR_TBL_SIZE_DSCP]; struct cnxk_mtr_profiles mtr_profiles; struct cnxk_mtr_policy mtr_policy; struct cnxk_mtr mtr; diff --git a/drivers/net/cnxk/cnxk_ethdev_mtr.c b/drivers/net/cnxk/cnxk_ethdev_mtr.c index c8183aa12d..1d6a4807d5 100644 --- a/drivers/net/cnxk/cnxk_ethdev_mtr.c +++ b/drivers/net/cnxk/cnxk_ethdev_mtr.c @@ -48,7 +48,13 @@ static struct rte_mtr_capabilities mtr_capa = { RTE_MTR_STATS_N_PKTS_RED | RTE_MTR_STATS_N_PKTS_DROPPED | RTE_MTR_STATS_N_BYTES_GREEN | RTE_MTR_STATS_N_BYTES_YELLOW | RTE_MTR_STATS_N_BYTES_RED | - RTE_MTR_STATS_N_BYTES_DROPPED}; + RTE_MTR_STATS_N_BYTES_DROPPED, + .methods_mask = RTE_MTR_INPUT_COLOR_METHOD_COLOR_BLIND | + RTE_MTR_INPUT_COLOR_METHOD_VLAN | + RTE_MTR_INPUT_COLOR_METHOD_DSCP | + RTE_MTR_INPUT_COLOR_METHOD_INNER_VLAN | + RTE_MTR_INPUT_COLOR_METHOD_INNER_DSCP, + .separate_input_color_table_per_port = true}; static struct cnxk_meter_node * nix_mtr_find(struct cnxk_eth_dev *dev, uint32_t meter_id) @@ -470,6 +476,7 @@ cnxk_nix_mtr_create(struct rte_eth_dev *eth_dev, uint32_t mtr_id, struct cnxk_mtr_profile_node *profile; struct cnxk_mtr_policy_node *policy; struct cnxk_mtr *fm = &dev->mtr; + enum rte_color *table = NULL; struct cnxk_meter_node *mtr; int i; @@ -521,18 +528,49 @@ cnxk_nix_mtr_create(struct rte_eth_dev *eth_dev, uint32_t mtr_id, mtr->is_next = false; mtr->level = ROC_NIX_BPF_LEVEL_IDX_INVALID; - if (params->dscp_table) { - mtr->params.dscp_table = - plt_zmalloc(ROC_NIX_BPF_PRE_COLOR_MAX, ROC_ALIGN); - if (mtr->params.dscp_table == NULL) { + switch (params->input_color_method) { + case RTE_MTR_INPUT_COLOR_METHOD_DSCP: + case RTE_MTR_INPUT_COLOR_METHOD_INNER_DSCP: + table = (enum rte_color *) + plt_zmalloc(sizeof(enum rte_color) * + ROC_NIX_BPF_PRECOLOR_TBL_SIZE_DSCP, ROC_ALIGN); + if (table == NULL) { plt_free(mtr); return -rte_mtr_error_set(error, ENOMEM, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, "Memory alloc failed."); } + if (params->dscp_table) { + for (i = 0; i < ROC_NIX_BPF_PRECOLOR_TBL_SIZE_DSCP; i++) + table[i] = params->dscp_table[i]; - for (i = 0; i < ROC_NIX_BPF_PRE_COLOR_MAX; i++) - mtr->params.dscp_table[i] = params->dscp_table[i]; + mtr->params.dscp_table = table; + } + break; + case RTE_MTR_INPUT_COLOR_METHOD_VLAN: + case RTE_MTR_INPUT_COLOR_METHOD_INNER_VLAN: + table = (enum rte_color *) + plt_zmalloc(sizeof(enum rte_color) * + ROC_NIX_BPF_PRECOLOR_TBL_SIZE_VLAN, ROC_ALIGN); + if (table == NULL) { + plt_free(mtr); + return -rte_mtr_error_set(error, ENOMEM, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, "Memory alloc failed."); + } + if (params->vlan_table) { + for (i = 0; i < ROC_NIX_BPF_PRECOLOR_TBL_SIZE_VLAN; i++) + table[i] = params->vlan_table[i]; + + mtr->params.vlan_table = table; + } + break; + default: + plt_free(table); + plt_free(mtr); + return -rte_mtr_error_set(error, ENOMEM, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, + "Invalid input color method"); } profile->ref_cnt++; @@ -619,7 +657,13 @@ cnxk_nix_mtr_destroy(struct rte_eth_dev *eth_dev, uint32_t mtr_id, mtr->policy->ref_cnt--; mtr->profile->ref_cnt--; TAILQ_REMOVE(fm, mtr, next); - plt_free(mtr->params.dscp_table); + + if (mtr->params.input_color_method == RTE_MTR_INPUT_COLOR_METHOD_DSCP) + plt_free(mtr->params.dscp_table); + else if (mtr->params.input_color_method == + RTE_MTR_INPUT_COLOR_METHOD_VLAN) + plt_free(mtr->params.vlan_table); + plt_free(mtr); exit: @@ -689,7 +733,7 @@ cnxk_nix_mtr_dscp_table_update(struct rte_eth_dev *eth_dev, uint32_t mtr_id, enum rte_color *dscp_table, struct rte_mtr_error *error) { - enum roc_nix_bpf_color nix_dscp_tbl[ROC_NIX_BPF_PRE_COLOR_MAX]; + enum roc_nix_bpf_color nix_dscp_tbl[ROC_NIX_BPF_PRECOLOR_TBL_SIZE_DSCP]; enum roc_nix_bpf_color color_map[] = {ROC_NIX_BPF_COLOR_GREEN, ROC_NIX_BPF_COLOR_YELLOW, ROC_NIX_BPF_COLOR_RED}; @@ -707,16 +751,22 @@ cnxk_nix_mtr_dscp_table_update(struct rte_eth_dev *eth_dev, uint32_t mtr_id, } if (!dscp_table) { - for (i = 0; i < ROC_NIX_BPF_PRE_COLOR_MAX; i++) + for (i = 0; i < ROC_NIX_BPF_PRECOLOR_TBL_SIZE_DSCP; i++) nix_dscp_tbl[i] = ROC_NIX_BPF_COLOR_GREEN; } else { - for (i = 0; i < ROC_NIX_BPF_PRE_COLOR_MAX; i++) + for (i = 0; i < ROC_NIX_BPF_PRECOLOR_TBL_SIZE_DSCP; i++) nix_dscp_tbl[i] = color_map[dscp_table[i]]; } - table.count = ROC_NIX_BPF_PRE_COLOR_MAX; - table.mode = ROC_NIX_BPF_PC_MODE_DSCP_OUTER; - for (i = 0; i < ROC_NIX_BPF_PRE_COLOR_MAX; i++) + table.count = ROC_NIX_BPF_PRECOLOR_TBL_SIZE_DSCP; + + if (mtr->params.input_color_method == + RTE_MTR_INPUT_COLOR_METHOD_INNER_DSCP) + table.mode = ROC_NIX_BPF_PC_MODE_DSCP_INNER; + else + table.mode = ROC_NIX_BPF_PC_MODE_DSCP_OUTER; + + for (i = 0; i < ROC_NIX_BPF_PRECOLOR_TBL_SIZE_DSCP; i++) table.color[i] = nix_dscp_tbl[i]; rc = roc_nix_bpf_pre_color_tbl_setup(nix, mtr->bpf_id, @@ -727,13 +777,69 @@ cnxk_nix_mtr_dscp_table_update(struct rte_eth_dev *eth_dev, uint32_t mtr_id, goto exit; } - for (i = 0; i < ROC_NIX_BPF_PRE_COLOR_MAX; i++) + for (i = 0; i < ROC_NIX_BPF_PRECOLOR_TBL_SIZE_DSCP; i++) dev->precolor_tbl[i] = nix_dscp_tbl[i]; exit: return rc; } +static int +cnxk_nix_mtr_vlan_table_update(struct rte_eth_dev *eth_dev, uint32_t mtr_id, + enum rte_color *vlan_table, + struct rte_mtr_error *error) +{ + enum roc_nix_bpf_color nix_vlan_tbl[ROC_NIX_BPF_PRECOLOR_TBL_SIZE_VLAN]; + enum roc_nix_bpf_color color_map[] = {ROC_NIX_BPF_COLOR_GREEN, + ROC_NIX_BPF_COLOR_YELLOW, + ROC_NIX_BPF_COLOR_RED}; + struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev); + struct roc_nix_bpf_precolor table; + struct roc_nix *nix = &dev->nix; + struct cnxk_meter_node *mtr; + int rc, i; + + mtr = nix_mtr_find(dev, mtr_id); + if (mtr == NULL) { + return -rte_mtr_error_set(error, ENOENT, + RTE_MTR_ERROR_TYPE_MTR_ID, NULL, + "Meter object not found"); + } + + if (!vlan_table) { + for (i = 0; i < ROC_NIX_BPF_PRECOLOR_TBL_SIZE_VLAN; i++) + nix_vlan_tbl[i] = ROC_NIX_BPF_COLOR_GREEN; + } else { + for (i = 0; i < ROC_NIX_BPF_PRECOLOR_TBL_SIZE_VLAN; i++) + nix_vlan_tbl[i] = color_map[vlan_table[i]]; + } + + table.count = ROC_NIX_BPF_PRECOLOR_TBL_SIZE_VLAN; + + if (mtr->params.input_color_method == + RTE_MTR_INPUT_COLOR_METHOD_INNER_VLAN) + table.mode = ROC_NIX_BPF_PC_MODE_VLAN_INNER; + else + table.mode = ROC_NIX_BPF_PC_MODE_VLAN_OUTER; + + for (i = 0; i < ROC_NIX_BPF_PRECOLOR_TBL_SIZE_VLAN; i++) + table.color[i] = nix_vlan_tbl[i]; + + rc = roc_nix_bpf_pre_color_tbl_setup(nix, mtr->bpf_id, + lvl_map[mtr->level], &table); + if (rc) { + rte_mtr_error_set(error, rc, RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, NULL); + goto exit; + } + + for (i = 0; i < ROC_NIX_BPF_PRECOLOR_TBL_SIZE_VLAN; i++) + dev->precolor_tbl[i] = nix_vlan_tbl[i]; + +exit: + return rc; +} + static int cnxk_nix_mtr_stats_update(struct rte_eth_dev *eth_dev, uint32_t mtr_id, uint64_t stats_mask, struct rte_mtr_error *error) @@ -870,6 +976,7 @@ const struct rte_mtr_ops nix_mtr_ops = { .meter_enable = cnxk_nix_mtr_enable, .meter_disable = cnxk_nix_mtr_disable, .meter_dscp_table_update = cnxk_nix_mtr_dscp_table_update, + .meter_vlan_table_update = cnxk_nix_mtr_vlan_table_update, .stats_update = cnxk_nix_mtr_stats_update, .stats_read = cnxk_nix_mtr_stats_read, }; @@ -1041,6 +1148,9 @@ nix_mtr_level_update(struct rte_eth_dev *eth_dev, uint32_t id, uint32_t level) static void nix_mtr_config_map(struct cnxk_meter_node *mtr, struct roc_nix_bpf_cfg *cfg) { + enum roc_nix_bpf_color color_map[] = {ROC_NIX_BPF_COLOR_GREEN, + ROC_NIX_BPF_COLOR_YELLOW, + ROC_NIX_BPF_COLOR_RED}; enum roc_nix_bpf_algo alg_map[] = { ROC_NIX_BPF_ALGO_NONE, ROC_NIX_BPF_ALGO_2697, ROC_NIX_BPF_ALGO_2698, ROC_NIX_BPF_ALGO_4115}; @@ -1049,6 +1159,28 @@ nix_mtr_config_map(struct cnxk_meter_node *mtr, struct roc_nix_bpf_cfg *cfg) cfg->alg = alg_map[profile->profile.alg]; cfg->lmode = profile->profile.packet_mode; + cfg->icolor = color_map[mtr->params.default_input_color]; + + switch (mtr->params.input_color_method) { + case RTE_MTR_INPUT_COLOR_METHOD_DSCP: + cfg->pc_mode = ROC_NIX_BPF_PC_MODE_DSCP_OUTER; + cfg->tnl_ena = false; + break; + case RTE_MTR_INPUT_COLOR_METHOD_INNER_DSCP: + cfg->pc_mode = ROC_NIX_BPF_PC_MODE_DSCP_INNER; + cfg->tnl_ena = true; + break; + case RTE_MTR_INPUT_COLOR_METHOD_VLAN: + cfg->pc_mode = ROC_NIX_BPF_PC_MODE_VLAN_OUTER; + cfg->tnl_ena = false; + break; + case RTE_MTR_INPUT_COLOR_METHOD_INNER_VLAN: + cfg->pc_mode = ROC_NIX_BPF_PC_MODE_VLAN_INNER; + cfg->tnl_ena = true; + break; + default: + break; + } switch (cfg->alg) { case ROC_NIX_BPF_ALGO_2697: @@ -1090,23 +1222,51 @@ nix_mtr_config_map(struct cnxk_meter_node *mtr, struct roc_nix_bpf_cfg *cfg) } static void -nix_dscp_table_map(struct cnxk_meter_node *mtr, - struct roc_nix_bpf_precolor *tbl) +nix_precolor_table_map(struct cnxk_meter_node *mtr, + struct roc_nix_bpf_precolor *tbl) { enum roc_nix_bpf_color color_map[] = {ROC_NIX_BPF_COLOR_GREEN, ROC_NIX_BPF_COLOR_YELLOW, ROC_NIX_BPF_COLOR_RED}; int i; - tbl->count = ROC_NIX_BPF_PRE_COLOR_MAX; - tbl->mode = ROC_NIX_BPF_PC_MODE_DSCP_OUTER; - - for (i = 0; i < ROC_NIX_BPF_PRE_COLOR_MAX; i++) - tbl->color[i] = ROC_NIX_BPF_COLOR_GREEN; - - if (mtr->params.dscp_table) { - for (i = 0; i < ROC_NIX_BPF_PRE_COLOR_MAX; i++) - tbl->color[i] = color_map[mtr->params.dscp_table[i]]; + switch (mtr->params.input_color_method) { + case RTE_MTR_INPUT_COLOR_METHOD_DSCP: + case RTE_MTR_INPUT_COLOR_METHOD_INNER_DSCP: + tbl->count = ROC_NIX_BPF_PRECOLOR_TBL_SIZE_DSCP; + tbl->mode = (mtr->params.input_color_method == + RTE_MTR_INPUT_COLOR_METHOD_DSCP) ? + ROC_NIX_BPF_PC_MODE_DSCP_OUTER : + ROC_NIX_BPF_PC_MODE_DSCP_INNER; + + for (i = 0; i < tbl->count; i++) + tbl->color[i] = ROC_NIX_BPF_COLOR_GREEN; + + if (mtr->params.dscp_table) { + for (i = 0; i < tbl->count; i++) + tbl->color[i] = + color_map[mtr->params.dscp_table[i]]; + } + break; + case RTE_MTR_INPUT_COLOR_METHOD_VLAN: + case RTE_MTR_INPUT_COLOR_METHOD_INNER_VLAN: + tbl->count = ROC_NIX_BPF_PRECOLOR_TBL_SIZE_VLAN; + tbl->mode = (mtr->params.input_color_method == + RTE_MTR_INPUT_COLOR_METHOD_VLAN) ? + ROC_NIX_BPF_PC_MODE_VLAN_OUTER : + ROC_NIX_BPF_PC_MODE_VLAN_INNER; + + for (i = 0; i < tbl->count; i++) + tbl->color[i] = ROC_NIX_BPF_COLOR_GREEN; + + if (mtr->params.vlan_table) { + for (i = 0; i < tbl->count; i++) + tbl->color[i] = + color_map[mtr->params.vlan_table[i]]; + } + break; + default: + break; } } @@ -1245,7 +1405,7 @@ nix_mtr_configure(struct rte_eth_dev *eth_dev, uint32_t id) memset(&tbl, 0, sizeof(struct roc_nix_bpf_precolor)); - nix_dscp_table_map(mtr[i], &tbl); + nix_precolor_table_map(mtr[i], &tbl); rc = roc_nix_bpf_pre_color_tbl_setup(nix, mtr[i]->bpf_id, lvl_map[mtr[i]->level], &tbl); -- 2.25.1