From patchwork Wed Sep 12 16:41:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jasvinder Singh X-Patchwork-Id: 44633 X-Patchwork-Delegate: cristian.dumitrescu@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7CF0C5B38; Wed, 12 Sep 2018 18:42:04 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id A315C5681 for ; Wed, 12 Sep 2018 18:41:50 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Sep 2018 09:41:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,365,1531810800"; d="scan'208";a="91068313" Received: from silpixa00381635.ir.intel.com (HELO silpixa00381635.ger.corp.intel.com) ([10.237.222.149]) by orsmga002.jf.intel.com with ESMTP; 12 Sep 2018 09:41:49 -0700 From: Jasvinder Singh To: dev@dpdk.org Cc: cristian.dumitrescu@intel.com Date: Wed, 12 Sep 2018 17:41:38 +0100 Message-Id: <20180912164138.55800-11-jasvinder.singh@intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20180912164138.55800-1-jasvinder.singh@intel.com> References: <20180907181357.23915-2-jasvinder.singh@intel.com> <20180912164138.55800-1-jasvinder.singh@intel.com> Subject: [dpdk-dev] [PATCH v2 10/10] net/softnic: enable flow rule with meter action 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" Implement flow rules with meter action. Signed-off-by: Jasvinder Singh --- drivers/net/softnic/rte_eth_softnic_flow.c | 153 +++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c b/drivers/net/softnic/rte_eth_softnic_flow.c index fc7a0b0..f0eeff2 100644 --- a/drivers/net/softnic/rte_eth_softnic_flow.c +++ b/drivers/net/softnic/rte_eth_softnic_flow.c @@ -1474,6 +1474,101 @@ flow_rule_action_get(struct pmd_internals *softnic, break; } /* RTE_FLOW_ACTION_TYPE_COUNT */ + case RTE_FLOW_ACTION_TYPE_METER: + { + struct rte_table_action_mtr_tc_params mtr_tc_params; + const struct rte_flow_action_meter *conf = action->conf; + struct rte_table_action_meter_profile profile; + struct softnic_mtr_meter_profile *mp; + struct softnic_mtr *m; + uint32_t i, meter_profile_id, table_id = UINT32_MAX; + int status; + + if (conf == NULL) + return rte_flow_error_set(error, + EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, + action, + "METER: Null configuration"); + + if ((params->action_mask & (1LLU << RTE_TABLE_ACTION_MTR)) == 0) + return rte_flow_error_set(error, + EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "METER: table action not supported"); + + m = softnic_mtr_find(softnic, conf->mtr_id); + if (m == NULL) + return -rte_flow_error_set(error, + EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION_CONF, + NULL, + "METER: invalid meter id"); + + if (m->flow) + return -rte_flow_error_set(error, + EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION_CONF, + NULL, + "METER: meter already attached to flow"); + + if (params->mtr.n_tc != 1) + return -rte_flow_error_set(error, + EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "METER: multiple TCs not supported"); + + meter_profile_id = m->params.meter_profile_id; + mp = softnic_mtr_meter_profile_find(softnic, meter_profile_id); + + memset(&profile, 0, sizeof(profile)); + profile.alg = RTE_TABLE_ACTION_METER_TRTCM; + profile.trtcm.cir = mp->params.trtcm_rfc2698.cir; + profile.trtcm.pir = mp->params.trtcm_rfc2698.pir; + profile.trtcm.cbs = mp->params.trtcm_rfc2698.cbs; + profile.trtcm.pbs = mp->params.trtcm_rfc2698.pbs; + + /* Identify the pipeline table to add this flow to. */ + for (i = 0; i < pipeline->n_tables; i++) { + if (table == &pipeline->table[i]) { + table_id = i; + break; + } + } + + /* Add meter profile to pipeline table */ + status = softnic_pipeline_table_mtr_profile_add(softnic, + pipeline->name, + table_id, + meter_profile_id, + &profile); + if (status) { + rte_flow_error_set(error, + EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "Table meter profile add failed"); + return -1; + } + + /* RTE_TABLE_ACTION_METER */ + mtr_tc_params.meter_profile_id = meter_profile_id; + mtr_tc_params.policer[e_RTE_METER_GREEN] = + (enum rte_table_action_policer)m->params.action[RTE_MTR_GREEN]; + mtr_tc_params.policer[e_RTE_METER_YELLOW] = + (enum rte_table_action_policer)m->params.action[RTE_MTR_YELLOW]; + mtr_tc_params.policer[e_RTE_METER_RED] = + (enum rte_table_action_policer)m->params.action[RTE_MTR_RED]; + + memcpy(&rule_action->mtr.mtr[0], &mtr_tc_params, + sizeof(rule_action->mtr.mtr[0])); + rule_action->mtr.tc_mask = 1 << 0; + rule_action->action_mask |= 1 << RTE_TABLE_ACTION_MTR; + break; + } /* RTE_FLOW_ACTION_TYPE_METER */ + default: return -ENOTSUP; } @@ -1577,6 +1672,34 @@ pmd_flow_validate(struct rte_eth_dev *dev, return 0; } +static void set_meter_owner_to_flow(struct pmd_internals *softnic, + struct rte_flow *flow, + const struct rte_flow_action *action) +{ + for ( ; action->type != RTE_FLOW_ACTION_TYPE_END; action++) { + if (action->type == RTE_FLOW_ACTION_TYPE_VOID) + continue; + + if (action->type == RTE_FLOW_ACTION_TYPE_METER) { + const struct rte_flow_action_meter *conf = action->conf; + struct softnic_mtr_list *ml = &softnic->mtr.mtrs; + struct softnic_mtr *m; + + TAILQ_FOREACH(m, ml, node) { + if (m->flow == flow) { + m->flow = NULL; + break; + } + } + + m = softnic_mtr_find(softnic, conf->mtr_id); + m->flow = flow; + + break; + } + } +} + static struct rte_flow * pmd_flow_create(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, @@ -1717,6 +1840,8 @@ pmd_flow_create(struct rte_eth_dev *dev, flow->pipeline = pipeline; flow->table_id = table_id; + set_meter_owner_to_flow(softnic, flow, action); + /* Flow add to list. */ if (new_flow) TAILQ_INSERT_TAIL(&table->flows, flow, node); @@ -1724,6 +1849,31 @@ pmd_flow_create(struct rte_eth_dev *dev, return flow; } +static void reset_meter_owner(struct pmd_internals *softnic, + struct softnic_table *table, + struct rte_flow *flow) +{ + struct softnic_table_action_profile *profile; + struct softnic_table_action_profile_params *params; + + profile = softnic_table_action_profile_find(softnic, + table->params.action_profile_name); + + params = &profile->params; + + if ((params->action_mask & (1LLU << RTE_TABLE_ACTION_MTR)) == 0) { + struct softnic_mtr_list *ml = &softnic->mtr.mtrs; + struct softnic_mtr *m; + + TAILQ_FOREACH(m, ml, node) { + if (m->flow == flow) { + m->flow = NULL; + break; + } + } + } +} + static int pmd_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow, @@ -1759,6 +1909,9 @@ pmd_flow_destroy(struct rte_eth_dev *dev, TAILQ_REMOVE(&table->flows, flow, node); free(flow); + /* Update dependencies */ + reset_meter_owner(softnic, table, flow); + return 0; }