From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Fastabend Subject: [net-next PATCH v1 11/11] net: rocker: implement delete flow routine Date: Wed, 31 Dec 2014 11:50:29 -0800 Message-ID: <20141231195027.31070.76995.stgit@nitbit.x32> References: <20141231194057.31070.5244.stgit@nitbit.x32> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, davem@davemloft.net, andy@greyhouse.net To: tgraf@suug.ch, sfeldma@gmail.com, jiri@resnulli.us, jhs@mojatatu.com, simon.horman@netronome.com Return-path: Received: from mail-ob0-f181.google.com ([209.85.214.181]:36804 "EHLO mail-ob0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751453AbaLaTuy (ORCPT ); Wed, 31 Dec 2014 14:50:54 -0500 Received: by mail-ob0-f181.google.com with SMTP id gq1so49297421obb.12 for ; Wed, 31 Dec 2014 11:50:53 -0800 (PST) In-Reply-To: <20141231194057.31070.5244.stgit@nitbit.x32> Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: John Fastabend --- drivers/net/ethernet/rocker/rocker.c | 39 +++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c index 4ca95da..fb1e3eb 100644 --- a/drivers/net/ethernet/rocker/rocker.c +++ b/drivers/net/ethernet/rocker/rocker.c @@ -4523,7 +4523,44 @@ static int rocker_set_flows(struct net_device *dev, static int rocker_del_flows(struct net_device *dev, struct net_flow_flow *flow) { - return -EOPNOTSUPP; + struct rocker_port *rocker_port = netdev_priv(dev); + struct rocker_flow_tbl_entry *entry; + struct rocker_group_tbl_entry *group; + struct hlist_node *tmp; + int bkt, err = -EEXIST; + unsigned long flags; + + spin_lock_irqsave(&rocker_port->rocker->flow_tbl_lock, flags); + hash_for_each_safe(rocker_port->rocker->flow_tbl, + bkt, tmp, entry, entry) { + if (rocker_goto_value(flow->table_id) != entry->key.tbl_id || + flow->uid != entry->cookie) + continue; + + hash_del(&entry->entry); + err = 0; + break; + } + spin_unlock_irqrestore(&rocker_port->rocker->flow_tbl_lock, flags); + + if (!err) + return err; + + spin_lock_irqsave(&rocker_port->rocker->group_tbl_lock, flags); + hash_for_each_safe(rocker_port->rocker->group_tbl, + bkt, tmp, group, entry) { + if (rocker_goto_value(flow->table_id) != + ROCKER_GROUP_TYPE_GET(group->group_id) || + flow->uid != group->cookie) + continue; + + hash_del(&group->entry); + err = 0; + break; + } + spin_unlock_irqrestore(&rocker_port->rocker->group_tbl_lock, flags); + + return err; } static int rocker_ig_port_to_flow(struct rocker_flow_tbl_key *key,