From patchwork Sun Dec 25 11:39:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Blakey X-Patchwork-Id: 708710 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 3tmgcD2P28z9t17 for ; Sun, 25 Dec 2016 22:57:48 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 59FA3BE6; Sun, 25 Dec 2016 11:48:54 +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 70AECBAD for ; Sun, 25 Dec 2016 11:48:47 +0000 (UTC) X-Greylist: from 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 E989D13B for ; Sun, 25 Dec 2016 11:48:44 +0000 (UTC) Received: from Internal Mail-Server by MTLPINE1 (envelope-from paulb@mellanox.com) with ESMTPS (AES256-SHA encrypted); 25 Dec 2016 13:40:35 +0200 Received: from dev-r-vrt-176.mtr.labs.mlnx (dev-r-vrt-176.mtr.labs.mlnx [10.212.176.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id uBPBeXbA029898; Sun, 25 Dec 2016 13:40:35 +0200 From: Paul Blakey To: dev@openvswitch.org, Andy Gospodarek , Simon Horman , Jiri Pirko , John Fastabend , Lance Richardson , Marcelo Ricardo Leitner , Joe Stringer Date: Sun, 25 Dec 2016 13:39:38 +0200 Message-Id: <1482665989-791-11-git-send-email-paulb@mellanox.com> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1482665989-791-1-git-send-email-paulb@mellanox.com> References: <1482665989-791-1-git-send-email-paulb@mellanox.com> X-Spam-Status: No, score=-5.0 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 , Mark Bloch , Hadar Hen Zion , Rony Efraim , Or Gerlitz Subject: [ovs-dev] [PATCH ovs V2 10/21] netdev-tc-offloads: Add ufid to tc/netdev map 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 Flows offloaded to tc are identified by priority and handle pair while OVS flows are identified by ufid. Added a hash map to convert between the two for later retrieval and deleting of offloaded flows. Signed-off-by: Paul Blakey Reviewed-by: Roi Dayan --- lib/netdev-tc-offloads.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/lib/netdev-tc-offloads.c b/lib/netdev-tc-offloads.c index 4ba6086..f470aa3 100644 --- a/lib/netdev-tc-offloads.c +++ b/lib/netdev-tc-offloads.c @@ -75,6 +75,104 @@ VLOG_DEFINE_THIS_MODULE(netdev_tc_offloads); +static struct hmap ufid_to_tc = HMAP_INITIALIZER(&ufid_to_tc); +static struct ovs_mutex ufid_lock = OVS_MUTEX_INITIALIZER; + +struct ufid_to_tc_data { + struct hmap_node node; + ovs_u128 ufid; + uint16_t prio; + uint32_t handle; + struct netdev *netdev; +}; + +static bool +del_ufid_tc_mapping(ovs_u128 *ufid) +{ + size_t hash = hash_bytes(ufid, sizeof *ufid, 0); + struct ufid_to_tc_data *data; + + ovs_mutex_lock(&ufid_lock); + HMAP_FOR_EACH_WITH_HASH(data, node, hash, &ufid_to_tc) { + if (ovs_u128_equals(*ufid, data->ufid)) { + break; + } + } + if (data) { + hmap_remove(&ufid_to_tc, &data->node); + ovs_mutex_unlock(&ufid_lock); + netdev_close(data->netdev); + free(data); + return true; + } + ovs_mutex_unlock(&ufid_lock); + return false; +} + +static ovs_u128 * +find_ufid(int prio, int handle, struct netdev *netdev) +{ + int ifindex = netdev_get_ifindex(netdev); + struct ufid_to_tc_data *data; + + ovs_mutex_lock(&ufid_lock); + HMAP_FOR_EACH(data, node, &ufid_to_tc) { + if (data->prio == prio && data->handle == handle + && netdev_get_ifindex(data->netdev) == ifindex) { + break; + } + } + ovs_mutex_unlock(&ufid_lock); + if (data) { + return &data->ufid; + } + return NULL; +} + +static int +get_ufid_tc_mapping(ovs_u128 *ufid, int *prio, struct netdev **netdev) +{ + size_t hash = hash_bytes(ufid, sizeof *ufid, 0); + struct ufid_to_tc_data *data; + + ovs_mutex_lock(&ufid_lock); + HMAP_FOR_EACH_WITH_HASH(data, node, hash, &ufid_to_tc) { + if (ovs_u128_equals(*ufid, data->ufid)) { + break; + } + } + ovs_mutex_unlock(&ufid_lock); + if (data) { + if (prio) { + *prio = data->prio; + } + if (netdev) { + *netdev = netdev_ref(data->netdev); + } + return data->handle; + } + return 0; +} + +static bool +add_ufid_tc_mapping(ovs_u128 *ufid, int prio, int handle, struct netdev *netdev) +{ + size_t hash = hash_bytes(ufid, sizeof *ufid, 0); + bool replace = del_ufid_tc_mapping(ufid); + struct ufid_to_tc_data *new_data = xzalloc(sizeof *new_data); + + new_data->ufid = *ufid; + new_data->prio = prio; + new_data->handle = handle; + new_data->netdev = netdev_ref(netdev); + + ovs_mutex_lock(&ufid_lock); + hmap_insert(&ufid_to_tc, &new_data->node, hash); + ovs_mutex_unlock(&ufid_lock); + + return replace; +} + int netdev_tc_flow_flush(struct netdev *netdev) {