From: Peng Zhang <peng.zh...@corigine.com>
For dpif-netdev, meters are mapped by DPDK meter with one-to-one
relationship. Implement meter offload API to set/get/del
the DPDK meter.
Signed-off-by: Peng Zhang <peng.zh...@corigine.com>
Signed-off-by: Jin Liu <jin....@corigine.com>
---
lib/netdev-dpdk.c | 199 ++++++++++++++++++++++++++++++++++++++
lib/netdev-dpdk.h | 41 ++++++++
lib/netdev-offload-dpdk.c | 88 +++++++++++++++++
3 files changed, 328 insertions(+)
diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
index fff57f78279a..180f3fb4b299 100644
--- a/lib/netdev-dpdk.c
+++ b/lib/netdev-dpdk.c
@@ -37,6 +37,7 @@
#include <rte_malloc.h>
#include <rte_mbuf.h>
#include <rte_meter.h>
+#include <rte_mtr.h>
#include <rte_pci.h>
#include <rte_version.h>
#include <rte_vhost.h>
@@ -5274,8 +5275,206 @@ netdev_dpdk_rte_flow_query_count(struct netdev *netdev,
return ret;
}
+static int OVS_UNUSED
+netdev_dpdk_meter_profile_create(struct rte_mtr_meter_profile *profile,
+ struct rte_mtr_capabilities *cap,
+ const uint64_t rate,
+ const uint64_t burst,
+ const int flag)
+{
+ if (!cap->meter_srtcm_rfc2697_n_max) {
+ return EOPNOTSUPP;
+ }
+
+ profile->alg = RTE_MTR_SRTCM_RFC2697;
+ profile->packet_mode = flag;
+ profile->srtcm_rfc2697.cir = rate;
+ profile->srtcm_rfc2697.cbs = burst;
+ profile->srtcm_rfc2697.ebs = burst;
+
+ return 0;
+}
+
#ifdef ALLOW_EXPERIMENTAL_API
+static int
+netdev_dpdk_rte_mtr_meter_add(struct rte_mtr_meter_profile *profile,
+ struct netdev *netdev,
+ uint32_t meter_id,
+ const uint32_t rate,
+ const uint32_t burst,
+ const int flag,
+ struct rte_mtr_error *error)
+{
+ struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
+ uint32_t meter_profile_id = meter_id;
+ uint32_t meter_policy_id = meter_id;
+ struct rte_mtr_capabilities cap;
+ struct rte_mtr_stats mtr_stats;
+ struct rte_mtr_params params;
+ uint64_t stats_mask = 0;
+ int clear = 0;
+ int mod;
+ int ret;
+
+ memset(&mtr_stats, 0, sizeof(struct rte_mtr_stats));
+ memset(&cap, 0, sizeof(cap));
+
+ ovs_mutex_lock(&dev->mutex);
+
+ ret = rte_mtr_capabilities_get(dev->port_id, &cap, error);
+ if (ret) {
+ goto out;
+ }
+
+ ret = netdev_dpdk_meter_profile_create(profile, &cap, rate, burst, flag);
+ if (ret) {
+ goto out;
+ }
+
+
+ /* If can get the meter stats, the meter is offload in the HW.
+ * So the operate is mod, just update the meter_profile.
+ *
+ * If can't get the meter stats, the meter is not offload in the HW.
+ * So the operate is add, need create the profile, policy, mtr. */
+ mod = rte_mtr_stats_read(dev->port_id, meter_id, &mtr_stats, &stats_mask,
+ clear, error);
+ ret = rte_mtr_meter_profile_add(dev->port_id, meter_profile_id, profile,
+ error);
+ if (!mod || ret) {
+ goto out;
+ }
+
+ rte_mtr_policy_drop_red(policy);
+ ret = rte_mtr_meter_policy_add(dev->port_id, meter_policy_id, &policy,
+ error);
+
+ if (ret) {
+ goto out;
+ }
+
+ memset(¶ms, 0 , sizeof(struct rte_mtr_params));
+ params.meter_profile_id = meter_profile_id;
+ params.meter_policy_id = meter_policy_id;
+ params.stats_mask = cap.stats_mask;
+ params.meter_enable = 1;
+
+ ret = rte_mtr_create(dev->port_id, meter_id, ¶ms, 1, error);
+out:
+ ovs_mutex_unlock(&dev->mutex);
+ return ret;
+}
+
+int
+netdev_dpdk_meter_create(struct netdev *netdev,
+ const uint32_t meter_profile_id,
+ const uint64_t rate,
+ const uint64_t burst,
+ const int flag)
+{
+ struct rte_mtr_meter_profile profile;
+ struct rte_mtr_error error;
+ int ret;
+
+ memset(&profile, 0 , sizeof(struct rte_mtr_meter_profile));
+ memset(&error, 0 , sizeof(struct rte_mtr_error));
+
+ ret = netdev_dpdk_rte_mtr_meter_add(&profile, netdev, meter_profile_id,
+ rate, burst, flag, &error);
+ if (!ret) {
+ if (!VLOG_DROP_DBG(&rl)) {
+ VLOG_DBG("%s: rte_meter_id %d port_id %d mtr create ",
+ netdev_get_name(netdev), meter_profile_id,
+ netdev_dpdk_get_port_id(netdev));
+ }
+ } else {
+ VLOG_DBG("%s: rte_mtr creation failed: %d (%s).",
+ netdev_get_name(netdev), error.type, error.message);
+ }
+ return ret;
+}
+
+int
+netdev_dpdk_meter_del(struct netdev *netdev,
+ const uint32_t meter_id,
+ const uint32_t meter_profile_id,
+ const uint32_t meter_policy_id)
+{
+ struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
+ struct rte_mtr_stats mtr_stats;
+ struct rte_mtr_error error;
+ uint64_t stats_mask = 0;
+ int clear = 0;
+ int ret = 0 ;
+
+ memset(&mtr_stats, 0, sizeof(struct rte_mtr_stats));
+ memset(&error, 0 , sizeof(struct rte_mtr_error));
+ ovs_mutex_lock(&dev->mutex);
+
+ ret = rte_mtr_stats_read(dev->port_id, meter_id, &mtr_stats, &stats_mask,
+ clear, &error);
+ if (ret) {
+ goto out;
+ }
+
+ ret = rte_mtr_destroy(dev->port_id, meter_id, &error);
+ if (!ret) {
+ ret = rte_mtr_meter_policy_delete(dev->port_id, meter_policy_id,
+ &error);
+ if (!ret) {
+ ret = rte_mtr_meter_profile_delete(dev->port_id, meter_profile_id,
+ &error);
+ }
+
+ if (!VLOG_DROP_DBG(&rl)) {
+ VLOG_DBG("%s: rte_meter_id %d port_id %d mtr delete",
+ netdev_get_name(netdev), meter_id,
+ netdev_dpdk_get_port_id(netdev));
+ }
+ } else {
+ VLOG_DBG("%s: rte_mtr delete mtr_id %d failed: %d (%s).",
+ netdev_get_name(netdev), meter_id, error.type, error.message);
+ }
+
+out:
+ ovs_mutex_unlock(&dev->mutex);
+ return ret;
+}
+
+int
+netdev_dpdk_meter_get(struct netdev *netdev,
+ const uint32_t meter_id,
+ uint64_t *byte_in_count,
+ uint64_t *packet_in_count)
+{
+ struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
+ struct rte_mtr_error error;
+ struct rte_mtr_stats mtr_stats;
+ uint64_t stats_mask = 0;
+ int clear = 0;
+ int ret = 0 ;
+
+ memset(&mtr_stats, 0, sizeof(struct rte_mtr_stats));
+ memset(&error, 0, sizeof(struct rte_mtr_error));
+
+ ret = rte_mtr_stats_read(dev->port_id, meter_id, &mtr_stats, &stats_mask,
+ clear, &error);
+ if (!ret) {
+ *byte_in_count = mtr_stats.n_bytes[RTE_COLOR_GREEN];
+ *packet_in_count = mtr_stats.n_pkts[RTE_COLOR_GREEN];
+ if (!VLOG_DROP_DBG(&rl)) {
+ VLOG_DBG("%s: rte_meter_id %d port_id %d mtr get stats success ",
+ netdev_get_name(netdev),
+ meter_id, netdev_dpdk_get_port_id(netdev));
+ }
+ } else {
+ VLOG_DBG("%s: rte_mtr get mtr_id %d stats failed: %d (%s).",
+ netdev_get_name(netdev), meter_id, error.type, error.message);
+ }
+ return ret;
+}
+
int
netdev_dpdk_rte_flow_tunnel_decap_set(struct netdev *netdev,
struct rte_flow_tunnel *tunnel,
diff --git a/lib/netdev-dpdk.h b/lib/netdev-dpdk.h
index 5cd95d00f5a5..58342dc6af1e 100644
--- a/lib/netdev-dpdk.h
+++ b/lib/netdev-dpdk.h
@@ -54,6 +54,19 @@ netdev_dpdk_get_port_id(struct netdev *netdev);
#ifdef ALLOW_EXPERIMENTAL_API
+int netdev_dpdk_meter_create(struct netdev *netdev,
+ const uint32_t meter_profile_id,
+ const uint64_t rate,
+ const uint64_t burst,
+ const int flag);
+int netdev_dpdk_meter_del(struct netdev *netdev,
+ const uint32_t meter_id,
+ const uint32_t meter_profile_id,
+ const uint32_t meter_policy_id);
+int netdev_dpdk_meter_get(struct netdev *netdev,
+ const uint32_t meter_id,
+ uint64_t *byte_in_count,
+ uint64_t *packet_in_count);
int netdev_dpdk_rte_flow_tunnel_decap_set(struct netdev *,
struct rte_flow_tunnel *,
struct rte_flow_action **,
@@ -79,6 +92,34 @@ int netdev_dpdk_rte_flow_tunnel_item_release(struct netdev *,
#else
+static inline int
+netdev_dpdk_meter_create(struct netdev *netdev OVS_UNUSED,
+ const uint32_t meter_profile_id OVS_UNUSED,
+ const uint64_t rate OVS_UNUSED,
+ const uint64_t burst OVS_UNUSED,
+ const int flag OVS_UNUSED)
+{
+ return -1;
+}
+
+static inline int
+netdev_dpdk_meter_del(struct netdev *netdev OVS_UNUSED,
+ const uint32_t meter_id OVS_UNUSED,
+ const uint32_t meter_profile_id OVS_UNUSED,
+ const uint32_t meter_policy_id OVS_UNUSED)
+{
+ return -1;
+}
+
+static inline int
+netdev_dpdk_meter_get(struct netdev *netdev OVS_UNUSED,
+ const uint32_t meter_id OVS_UNUSED,
+ uint64_t *byte_in_count OVS_UNUSED,
+ uint64_t *packet_in_count OVS_UNUSED)
+{
+ return -1;
+}
+
static inline void
set_error(struct rte_flow_error *error, enum rte_flow_error_type type)
{
diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c
index 38f00fd309e6..26c21f270a47 100644
--- a/lib/netdev-offload-dpdk.c
+++ b/lib/netdev-offload-dpdk.c
@@ -2452,6 +2452,91 @@ netdev_offload_dpdk_flow_del(struct netdev *netdev
OVS_UNUSED,
return netdev_offload_dpdk_flow_destroy(rte_flow_data);
}
+static int
+netdev_offload_dpdk_meter_set(struct netdev *dev,
+ ofproto_meter_id meter_id,
+ struct ofputil_meter_config *config)
+{
+ uint32_t mid = meter_id.uint32;
+ uint64_t burst;
+ uint64_t rate;
+ int ret = 0;
+ int flag;
+
+ if (config->n_bands != 1 || config->bands[0].type != OFPMBT13_DROP) {
+ return 0;
+ }
+
+ if (config->flags & OFPMF13_KBPS) {
+ flag = 0;
+ } else if (config->flags & OFPMF13_PKTPS) {
+ flag = 1;
+ } else {
+ return EBADF;
+ }
+
+ if (flag == 0) {
+ rate = ((uint64_t) config->bands[0].rate * 1024) / 8;
+ burst = ((uint64_t) config->bands[0].burst_size * 1024) / 8;
+ } else {
+ rate = config->bands[0].rate;
+ burst = config->bands[0].burst_size;
+ }
+
+ if (!config->bands[0].burst_size) {
+ burst = rate / 5;
+ }
+ ret = netdev_dpdk_meter_create(dev, mid, rate, burst, flag);
+ if (ret) {
+ VLOG_ERR("Failed offload the flow to the %s", dev->name);
+ }
+ return ret;
+}
+
+static int
+netdev_offload_dpdk_meter_del(struct netdev *dev,
+ ofproto_meter_id meter_id,
+ struct ofputil_meter_stats *stats)
+{
+ uint32_t meter_profile_id = meter_id.uint32;
+ uint32_t meter_policy_id = meter_id.uint32;
+ int ret = 0;
+
+ ret = netdev_dpdk_meter_del(dev, meter_id.uint32, meter_profile_id,
+ meter_policy_id);
+ if (ret) {
+ VLOG_ERR("Failed del the flow to the %s", dev->name);
+ return ret;
+ }
+
+ if (stats) {
+ memset(stats, 0, sizeof *stats);
+ }
+
+ return 0;
+}
+
+static int
+netdev_offload_dpdk_meter_get(struct netdev *dev,
+ ofproto_meter_id meter_id,
+ struct ofputil_meter_stats *stats)
+{
+ uint64_t byte_in_count = 0;
+ uint64_t packet_in_count = 0;
+ int ret = 0;
+
+ ret = netdev_dpdk_meter_get(dev, meter_id.uint32, &byte_in_count,
+ &packet_in_count);
+ if (ret) {
+ VLOG_ERR("Failed get the flow to the %s", dev->name);
+ return ret;
+ }
+ stats->byte_in_count = byte_in_count;
+ stats->packet_in_count = packet_in_count;
+
+ return 0;
+}
+
static int
netdev_offload_dpdk_init_flow_api(struct netdev *netdev)
{
@@ -2738,6 +2823,9 @@ const struct netdev_flow_api netdev_offload_dpdk = {
.type = "dpdk_flow_api",
.flow_put = netdev_offload_dpdk_flow_put,
.flow_del = netdev_offload_dpdk_flow_del,
+ .dpdk_meter_set = netdev_offload_dpdk_meter_set,
+ .dpdk_meter_get = netdev_offload_dpdk_meter_get,
+ .dpdk_meter_del = netdev_offload_dpdk_meter_del,
.init_flow_api = netdev_offload_dpdk_init_flow_api,
.uninit_flow_api = netdev_offload_dpdk_uninit_flow_api,
.flow_get = netdev_offload_dpdk_flow_get,
--
2.30.2
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
