All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jasvinder Singh <jasvinder.singh@intel.com>
To: dev@dpdk.org
Cc: cristian.dumitrescu@intel.com
Subject: [PATCH 10/10] net/softnic: enable meter action using flow rule
Date: Fri,  7 Sep 2018 19:13:57 +0100	[thread overview]
Message-ID: <20180907181357.23915-11-jasvinder.singh@intel.com> (raw)
In-Reply-To: <20180907181357.23915-1-jasvinder.singh@intel.com>

Implement meter enablement through flow rules.

Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
---
 drivers/net/softnic/rte_eth_softnic_flow.c | 170 +++++++++++++++++++++++++++++
 1 file changed, 170 insertions(+)

diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c b/drivers/net/softnic/rte_eth_softnic_flow.c
index 6562004..0f33381 100644
--- a/drivers/net/softnic/rte_eth_softnic_flow.c
+++ b/drivers/net/softnic/rte_eth_softnic_flow.c
@@ -1459,6 +1459,117 @@ 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 softnic_mtr *m;
+			struct softnic_mtr_meter_profile *mp;
+			uint32_t meter_profile_id;
+
+			if (conf == NULL)
+				return rte_flow_error_set(error,
+					EINVAL,
+					RTE_FLOW_ERROR_TYPE_ACTION,
+					action,
+					"COUNT: 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 action not supported by this table");
+
+			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,
+					rte_strerror(EINVAL));
+
+			if (params->mtr.n_tc != 1)
+				return -rte_flow_error_set(error,
+					EINVAL,
+					RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+					NULL,
+					rte_strerror(EINVAL));
+
+			meter_profile_id = m->params.meter_profile_id;
+
+			mp = softnic_table_meter_profile_find(table, meter_profile_id);
+			if (mp == NULL) {
+				struct softnic_mtr_meter_profile *mtr_meter_profile;
+				struct rte_table_action_meter_profile profile;
+				int status;
+
+				mp = calloc(1, sizeof(struct softnic_mtr_meter_profile));
+				if (mp == NULL) {
+					rte_flow_error_set(error,
+						ENOMEM,
+						RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+						NULL,
+						"Not enough table memory for meter profile");
+					return -1;
+				}
+
+				mtr_meter_profile = softnic_mtr_meter_profile_find(softnic,
+					meter_profile_id);
+				if (mtr_meter_profile == NULL) {
+					free(mp);
+
+					rte_flow_error_set(error,
+						EINVAL,
+						RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+						NULL,
+						rte_strerror(EINVAL));
+					return -1;
+				}
+
+				mp->meter_profile_id = meter_profile_id;
+				mp->n_users = mtr_meter_profile->n_users;
+				memcpy(&mp->params, &mtr_meter_profile->params,
+					sizeof(mp->params));
+
+				profile.alg = RTE_TABLE_ACTION_METER_TRTCM;
+				memcpy(&profile.trtcm, &mp->params.trtcm_rfc2698,
+					sizeof(profile.trtcm));
+
+				status = rte_table_action_meter_profile_add(table->a,
+					meter_profile_id,
+					&profile);
+				if (status) {
+						free(mp);
+
+					rte_flow_error_set(error,
+						EINVAL,
+						RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+						NULL,
+						rte_strerror(EINVAL));
+					return -1;
+				}
+
+				/* Add to table meter profile list */
+				TAILQ_INSERT_TAIL(&table->meter_profiles, mp, node);
+			}
+
+			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];
+
+			/* RTE_TABLE_ACTION_METER */
+			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;
 		}
@@ -1562,6 +1673,35 @@ 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,
@@ -1702,6 +1842,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);
@@ -1709,6 +1851,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,
@@ -1744,6 +1911,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;
 }
 
-- 
2.9.3

      parent reply	other threads:[~2018-09-07 18:15 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-07 18:13 [PATCH 00/10] net/softnic: implement metering and policing API Jasvinder Singh
2018-09-07 18:13 ` [PATCH 01/10] net/softnic: add metering and policing support Jasvinder Singh
2018-09-12 16:41   ` [PATCH v2 00/10] net/softnic: implement metering and policing API Jasvinder Singh
2018-09-12 16:41     ` [PATCH v2 01/10] net/softnic: add metering and policing support Jasvinder Singh
2018-09-14 17:45       ` [PATCH v3 00/10] net/softnic: implement metering and policing API Jasvinder Singh
2018-09-14 17:45         ` [PATCH v3 01/10] net/softnic: add metering and policing support Jasvinder Singh
2018-09-18 16:58           ` [PATCH v4 00/10] net/softnic: implement metering and policing API Jasvinder Singh
2018-09-18 16:58             ` [PATCH v4 01/10] net/softnic: add metering and policing support Jasvinder Singh
2018-09-26 13:08               ` [PATCH v5 00/10] net/softnic: implement metering and policing API Jasvinder Singh
2018-09-26 13:08                 ` [PATCH v5 01/10] net/softnic: add metering and policing support Jasvinder Singh
2018-09-26 13:08                 ` [PATCH v5 02/10] net/softnic: add meter profile Jasvinder Singh
2018-09-26 13:08                 ` [PATCH v5 03/10] net/softnic: delete " Jasvinder Singh
2018-09-26 13:08                 ` [PATCH v5 04/10] net/softnic: create meter object Jasvinder Singh
2018-09-26 13:08                 ` [PATCH v5 05/10] net/softnic: destroy " Jasvinder Singh
2018-09-26 13:08                 ` [PATCH v5 06/10] net/softnic: update meter profile Jasvinder Singh
2018-09-26 13:08                 ` [PATCH v5 07/10] net/softnic: update dscp table Jasvinder Singh
2018-09-26 13:08                 ` [PATCH v5 08/10] net/softnic: update policer actions Jasvinder Singh
2018-09-26 13:08                 ` [PATCH v5 09/10] net/softnic: meter stats read Jasvinder Singh
2018-09-26 13:08                 ` [PATCH v5 10/10] net/softnic: enable flow rule with meter action Jasvinder Singh
2018-09-28 10:36                 ` [PATCH v5 00/10] net/softnic: implement metering and policing API Dumitrescu, Cristian
2018-09-18 16:58             ` [PATCH v4 02/10] net/softnic: add meter profile Jasvinder Singh
2018-09-18 16:58             ` [PATCH v4 03/10] net/softnic: delete " Jasvinder Singh
2018-09-18 16:58             ` [PATCH v4 04/10] net/softnic: create meter object Jasvinder Singh
2018-09-18 16:58             ` [PATCH v4 05/10] net/softnic: destroy " Jasvinder Singh
2018-09-18 16:58             ` [PATCH v4 06/10] net/softnic: update meter profile Jasvinder Singh
2018-09-18 16:58             ` [PATCH v4 07/10] net/softnic: update dscp table Jasvinder Singh
2018-09-18 16:58             ` [PATCH v4 08/10] net/softnic: update policer actions Jasvinder Singh
2018-09-18 16:58             ` [PATCH v4 09/10] net/softnic: meter stats read Jasvinder Singh
2018-09-18 16:58             ` [PATCH v4 10/10] net/softnic: enable flow rule with meter action Jasvinder Singh
2018-09-14 17:45         ` [PATCH v3 02/10] net/softnic: add meter profile Jasvinder Singh
2018-09-14 17:45         ` [PATCH v3 03/10] net/softnic: delete " Jasvinder Singh
2018-09-14 17:45         ` [PATCH v3 04/10] net/softnic: create meter object Jasvinder Singh
2018-09-14 17:45         ` [PATCH v3 05/10] net/softnic: destroy " Jasvinder Singh
2018-09-14 17:45         ` [PATCH v3 06/10] net/softnic: update meter profile Jasvinder Singh
2018-09-14 17:45         ` [PATCH v3 07/10] net/softnic: update dscp table Jasvinder Singh
2018-09-14 17:45         ` [PATCH v3 08/10] net/softnic: update policer actions Jasvinder Singh
2018-09-14 17:45         ` [PATCH v3 09/10] net/softnic: meter stats read Jasvinder Singh
2018-09-14 17:45         ` [PATCH v3 10/10] net/softnic: enable flow rule with meter action Jasvinder Singh
2018-09-12 16:41     ` [PATCH v2 02/10] net/softnic: add meter profile Jasvinder Singh
2018-09-12 16:41     ` [PATCH v2 03/10] net/softnic: delete " Jasvinder Singh
2018-09-12 16:41     ` [PATCH v2 04/10] net/softnic: create meter object Jasvinder Singh
2018-09-12 16:41     ` [PATCH v2 05/10] net/softnic: destroy " Jasvinder Singh
2018-09-12 16:41     ` [PATCH v2 06/10] net/softnic: update meter profile Jasvinder Singh
2018-09-12 16:41     ` [PATCH v2 07/10] net/softnic: update dscp table Jasvinder Singh
2018-09-12 16:41     ` [PATCH v2 08/10] net/softnic: update policer actions Jasvinder Singh
2018-09-12 16:41     ` [PATCH v2 09/10] net/softnic: meter stats read Jasvinder Singh
2018-09-12 16:41     ` [PATCH v2 10/10] net/softnic: enable flow rule with meter action Jasvinder Singh
2018-09-07 18:13 ` [PATCH 02/10] net/softnic: add meter profile Jasvinder Singh
2018-09-07 18:13 ` [PATCH 03/10] net/softnic: delete " Jasvinder Singh
2018-09-07 18:13 ` [PATCH 04/10] net/softnic: create meter object Jasvinder Singh
2018-09-07 18:13 ` [PATCH 05/10] net/softnic: destroy " Jasvinder Singh
2018-09-07 18:13 ` [PATCH 06/10] net/softnic: update meter profile Jasvinder Singh
2018-09-07 18:13 ` [PATCH 07/10] net/softnic: update dscp table Jasvinder Singh
2018-09-07 18:13 ` [PATCH 08/10] net/softnic: update policer actions Jasvinder Singh
2018-09-07 18:13 ` [PATCH 09/10] net/softnic: meter stats read Jasvinder Singh
2018-09-07 18:13 ` Jasvinder Singh [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180907181357.23915-11-jasvinder.singh@intel.com \
    --to=jasvinder.singh@intel.com \
    --cc=cristian.dumitrescu@intel.com \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.