From patchwork Mon Mar 13 13:37:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roi Dayan X-Patchwork-Id: 738140 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vhfDC43swz9s0Z for ; Tue, 14 Mar 2017 00:41:47 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 10074C12; Mon, 13 Mar 2017 13:37:36 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id BEB9DBBF for ; Mon, 13 Mar 2017 13:37:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id A8093235 for ; Mon, 13 Mar 2017 13:37:27 +0000 (UTC) Received: from Internal Mail-Server by MTLPINE1 (envelope-from roid@mellanox.com) with ESMTPS (AES256-SHA encrypted); 13 Mar 2017 15:37:22 +0200 Received: from r-vnc05.mtr.labs.mlnx (r-vnc05.mtr.labs.mlnx [10.208.0.115]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id v2DDbJZJ028197; Mon, 13 Mar 2017 15:37:22 +0200 From: Roi Dayan To: dev@openvswitch.org Date: Mon, 13 Mar 2017 15:37:04 +0200 Message-Id: <1489412234-30916-15-git-send-email-roid@mellanox.com> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1489412234-30916-1-git-send-email-roid@mellanox.com> References: <1489412234-30916-1-git-send-email-roid@mellanox.com> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Shahar Klein , Hadar Hen Zion , Rony Efraim , Jiri Pirko , Marcelo Ricardo Leitner , Simon Horman , Or Gerlitz , Andy Gospodarek Subject: [ovs-dev] [PATCH ovs V4 14/24] dpif-netlink: Use netdev flow del api to delete a flow X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Paul Blakey If a flow was offloaded to a netdev we delete it using netdev flow api. Signed-off-by: Paul Blakey Reviewed-by: Roi Dayan --- lib/dpif-netlink.c | 12 +++++++++++- lib/netdev.c | 15 +++++++++++++++ lib/netdev.h | 2 ++ 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c index 59b87ff..1964c42 100644 --- a/lib/dpif-netlink.c +++ b/lib/dpif-netlink.c @@ -2076,7 +2076,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 f26c962..5eb4dd0 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -2269,6 +2269,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 */