From: Paul Blakey <[email protected]> If a flow was offloaded to a netdev we delete it using netdev flow api.
Signed-off-by: Paul Blakey <[email protected]> Reviewed-by: Roi Dayan <[email protected]> Reviewed-by: Simon Horman <[email protected]> --- lib/dpif-netlink.c | 12 +++++++++++- lib/netdev.c | 15 +++++++++++++++ lib/netdev.h | 2 ++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c index 83b6c51..c9adc0e 100644 --- a/lib/dpif-netlink.c +++ b/lib/dpif-netlink.c @@ -2081,7 +2081,17 @@ try_send_to_netdev(struct dpif_netlink *dpif, struct dpif_op *op) (put->flags & DPIF_FP_MODIFY ? "PUT(MODIFY)" : "PUT")); return parse_flow_put(dpif, put); } - case DPIF_OP_FLOW_DEL: + case DPIF_OP_FLOW_DEL: { + struct dpif_flow_del *del = &op->u.flow_del; + + if (!del->ufid) { + break; + } + dbg_print_flow(del->key, del->key_len, NULL, 0, NULL, 0, + del->ufid, "DEL"); + return netdev_ports_flow_del(DPIF_HMAP_KEY(&dpif->dpif), del->ufid, + del->stats); + } case DPIF_OP_FLOW_GET: case DPIF_OP_EXECUTE: default: diff --git a/lib/netdev.c b/lib/netdev.c index 8093508..97e0959 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -2271,6 +2271,21 @@ netdev_ports_flow_dumps_create(const void *obj, int *ports) return dumps; } +int +netdev_ports_flow_del(const void *obj, const ovs_u128 *ufid, + struct dpif_flow_stats *stats) +{ + struct port_to_netdev_data *data; + + HMAP_FOR_EACH(data, node, &port_to_netdev) { + if (data->obj == obj && !netdev_flow_del(data->netdev, ufid, stats)) { + return 0; + } + } + + return ENOENT; +} + bool netdev_flow_api_enabled = false; #ifdef __linux__ diff --git a/lib/netdev.h b/lib/netdev.h index 869d9c4..ee8c401 100644 --- a/lib/netdev.h +++ b/lib/netdev.h @@ -188,6 +188,8 @@ int netdev_hmap_port_del(odp_port_t port, const void *obj); struct netdev_flow_dump **netdev_ports_flow_dumps_create(const void *obj, int *ports); void netdev_ports_flow_flush(const void *obj); +int netdev_ports_flow_del(const void *obj, const ovs_u128 *ufid, + struct dpif_flow_stats *stats); odp_port_t netdev_hmap_port_get_byifidx(int ifindex); /* native tunnel APIs */ -- 2.7.4 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
