OVS meters are created in advance and openflow rules refer to them by
their unique ID. New tc_police API is used to offload them. By calling
the API, police actions are created and meters are mapped to them.
These actions then can be used in tc filter rules by the index.
Signed-off-by: Jianbo Liu <jian...@nvidia.com>
---
lib/dpif-netlink.c | 47 ++++++++++++++++++++++++++++++++++++++++------
1 file changed, 41 insertions(+), 6 deletions(-)
diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c
index 71e35ccdd..7c089b465 100644
--- a/lib/dpif-netlink.c
+++ b/lib/dpif-netlink.c
@@ -350,6 +350,16 @@ dpif_netlink_enumerate(struct sset *all_dps,
return nl_dump_done(&dump);
}
+static int
+dpif_netlink_initialize(void)
+{
+ if (netdev_is_flow_api_enabled()) {
+ meter_offload_init("tc_police");
+ }
+
+ return 0;
+}
+
static int
dpif_netlink_open(const struct dpif_class *class OVS_UNUSED, const char *name,
bool create, struct dpif **dpifp)
@@ -733,6 +743,10 @@ dpif_netlink_destroy(struct dpif *dpif_)
struct dpif_netlink *dpif = dpif_netlink_cast(dpif_);
struct dpif_netlink_dp dp;
+ if (netdev_is_flow_api_enabled()) {
+ meter_offload_destroy("tc_police");
+ }
+
dpif_netlink_dp_init(&dp);
dp.cmd = OVS_DP_CMD_DEL;
dp.dp_ifindex = dpif->dp_ifindex;
@@ -4163,11 +4177,18 @@ static int
dpif_netlink_meter_set(struct dpif *dpif_, ofproto_meter_id meter_id,
struct ofputil_meter_config *config)
{
+ int err;
+
if (probe_broken_meters(dpif_)) {
return ENOMEM;
}
- return dpif_netlink_meter_set__(dpif_, meter_id, config);
+ err = dpif_netlink_meter_set__(dpif_, meter_id, config);
+ if (!err && netdev_is_flow_api_enabled()) {
+ meter_offload_set("tc_police", meter_id, config);
+ }
+
+ return err;
}
/* Retrieve statistics and/or delete meter 'meter_id'. Statistics are
@@ -4258,16 +4279,30 @@ static int
dpif_netlink_meter_get(const struct dpif *dpif, ofproto_meter_id meter_id,
struct ofputil_meter_stats *stats, uint16_t max_bands)
{
- return dpif_netlink_meter_get_stats(dpif, meter_id, stats, max_bands,
- OVS_METER_CMD_GET);
+ int err;
+
+ err = dpif_netlink_meter_get_stats(dpif, meter_id, stats, max_bands,
+ OVS_METER_CMD_GET);
+ if (!err && netdev_is_flow_api_enabled()) {
+ meter_offload_get("tc_police", meter_id, stats, max_bands);
+ }
+
+ return err;
}
static int
dpif_netlink_meter_del(struct dpif *dpif, ofproto_meter_id meter_id,
struct ofputil_meter_stats *stats, uint16_t max_bands)
{
- return dpif_netlink_meter_get_stats(dpif, meter_id, stats, max_bands,
- OVS_METER_CMD_DEL);
+ int err;
+
+ err = dpif_netlink_meter_get_stats(dpif, meter_id, stats,
+ max_bands, OVS_METER_CMD_DEL);
+ if (!err && netdev_is_flow_api_enabled()) {
+ meter_offload_del("tc_police", meter_id, stats, max_bands);
+ }
+
+ return err;
}
static bool
@@ -4416,7 +4451,7 @@ dpif_netlink_cache_set_size(struct dpif *dpif_, uint32_t
level, uint32_t size)
const struct dpif_class dpif_netlink_class = {
"system",
false, /* cleanup_required */
- NULL, /* init */
+ dpif_netlink_initialize, /* init */
dpif_netlink_enumerate,
NULL,
dpif_netlink_open,
--
2.26.2
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
