From patchwork Mon Mar 13 13:36:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roi Dayan X-Patchwork-Id: 738160 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 3vhfMH5wwSz9s0Z for ; Tue, 14 Mar 2017 00:47:55 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 2CA0BC4D; Mon, 13 Mar 2017 13:38:25 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp2.linuxfoundation.org (smtp2.linux-foundation.org [172.17.192.36]) by mail.linuxfoundation.org (Postfix) with ESMTPS id E32F2C4D for ; Mon, 13 Mar 2017 13:38:23 +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 smtp2.linuxfoundation.org (Postfix) with ESMTP id B68241DDD9 for ; Mon, 13 Mar 2017 13:38:22 +0000 (UTC) Received: from Internal Mail-Server by MTLPINE1 (envelope-from roid@mellanox.com) with ESMTPS (AES256-SHA encrypted); 13 Mar 2017 15:38:20 +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 v2DDbJZA028197; Mon, 13 Mar 2017 15:37:20 +0200 From: Roi Dayan To: dev@openvswitch.org Date: Mon, 13 Mar 2017 15:36:55 +0200 Message-Id: <1489412234-30916-6-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 smtp2.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 05/24] dpif: Save added ports in a port map for netdev flow api use 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 To use netdev flow offloading api, dpifs needs to iterate over added ports. This addition inserts the added dpif ports in a hash map, The map will also be used to translate dpif ports to netdevs. Signed-off-by: Paul Blakey Reviewed-by: Roi Dayan --- lib/dpif.c | 25 ++++++++++++ lib/dpif.h | 2 + lib/netdev.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/netdev.h | 8 ++++ 4 files changed, 156 insertions(+), 0 deletions(-) diff --git a/lib/dpif.c b/lib/dpif.c index 57aa3c6..d4e4c0a 100644 --- a/lib/dpif.c +++ b/lib/dpif.c @@ -352,7 +352,22 @@ do_open(const char *name, const char *type, bool create, struct dpif **dpifp) error = registered_class->dpif_class->open(registered_class->dpif_class, name, create, &dpif); if (!error) { + struct dpif_port_dump port_dump; + struct dpif_port dpif_port; + ovs_assert(dpif->dpif_class == registered_class->dpif_class); + + DPIF_PORT_FOR_EACH(&dpif_port, &port_dump, dpif) { + struct netdev *netdev; + int err = netdev_open(dpif_port.name, dpif_port.type, &netdev); + + if (!err) { + netdev_hmap_port_add(netdev, DPIF_HMAP_KEY(dpif), &dpif_port); + netdev_close(netdev); + } else { + VLOG_WARN("could not open netdev %s type %s", name, type); + } + } } else { dp_class_unref(registered_class); } @@ -545,6 +560,14 @@ dpif_port_add(struct dpif *dpif, struct netdev *netdev, odp_port_t *port_nop) if (!error) { VLOG_DBG_RL(&dpmsg_rl, "%s: added %s as port %"PRIu32, dpif_name(dpif), netdev_name, port_no); + + /* temp dpif_port, will be cloned in netdev_hmap_port_add */ + struct dpif_port dpif_port; + + dpif_port.type = CONST_CAST(char *, netdev_get_type(netdev)); + dpif_port.name = CONST_CAST(char *, netdev_name); + dpif_port.port_no = port_no; + netdev_hmap_port_add(netdev, DPIF_HMAP_KEY(dpif), &dpif_port); } else { VLOG_WARN_RL(&error_rl, "%s: failed to add %s as port: %s", dpif_name(dpif), netdev_name, ovs_strerror(error)); @@ -569,6 +592,8 @@ dpif_port_del(struct dpif *dpif, odp_port_t port_no) if (!error) { VLOG_DBG_RL(&dpmsg_rl, "%s: port_del(%"PRIu32")", dpif_name(dpif), port_no); + + netdev_hmap_port_del(port_no, DPIF_HMAP_KEY(dpif)); } else { log_operation(dpif, "port_del", error); } diff --git a/lib/dpif.h b/lib/dpif.h index d5b4b58..44cbe95 100644 --- a/lib/dpif.h +++ b/lib/dpif.h @@ -400,6 +400,8 @@ extern "C" { #endif +#define DPIF_HMAP_KEY(x) ((x)->dpif_class) + struct dpif; struct dpif_class; struct dpif_flow; diff --git a/lib/netdev.c b/lib/netdev.c index 6bde14b..e2016bd 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -2104,6 +2104,127 @@ netdev_init_flow_api(struct netdev *netdev) : EOPNOTSUPP); } +/* Protects below port hashmaps. */ +static struct ovs_mutex netdev_hmap_mutex = OVS_MUTEX_INITIALIZER; + +static struct hmap port_to_netdev OVS_GUARDED_BY(netdev_hmap_mutex) + = HMAP_INITIALIZER(&port_to_netdev); +static struct hmap ifindex_to_port OVS_GUARDED_BY(netdev_hmap_mutex) + = HMAP_INITIALIZER(&ifindex_to_port); + +struct port_to_netdev_data { + struct hmap_node node; + struct netdev *netdev; + struct dpif_port dpif_port; + const void *obj; +}; + +struct ifindex_to_port_data { + struct hmap_node node; + int ifindex; + odp_port_t port; +}; + +static int +netdev_hmap_port_del_locked(odp_port_t port_no, const void *obj) +{ + size_t hash = hash_int(odp_to_u32(port_no), hash_pointer(obj, 0)); + struct port_to_netdev_data *data; + + HMAP_FOR_EACH_WITH_HASH(data, node, hash, &port_to_netdev) { + if (data->obj == obj && data->dpif_port.port_no == port_no) { + break; + } + } + + if (data) { + dpif_port_destroy(&data->dpif_port); + netdev_close(data->netdev); /* unref and possibly close */ + hmap_remove(&port_to_netdev, &data->node); + free(data); + return 0; + } + + return ENOENT; +} + +int +netdev_hmap_port_add(struct netdev *netdev, const void *obj, + struct dpif_port *dpif_port) +{ + size_t hash = hash_int(odp_to_u32(dpif_port->port_no), + hash_pointer(obj, 0)); + struct port_to_netdev_data *data = xzalloc(sizeof *data); + struct ifindex_to_port_data *ifidx = xzalloc(sizeof *ifidx); + + ovs_mutex_lock(&netdev_hmap_mutex); + netdev_hmap_port_del_locked(dpif_port->port_no, obj); + + data->netdev = netdev_ref(netdev); + data->obj = obj; + dpif_port_clone(&data->dpif_port, dpif_port); + + ifidx->ifindex = netdev_get_ifindex(netdev); + ifidx->port = dpif_port->port_no; + + hmap_insert(&port_to_netdev, &data->node, hash); + hmap_insert(&ifindex_to_port, &ifidx->node, ifidx->ifindex); + ovs_mutex_unlock(&netdev_hmap_mutex); + + netdev_init_flow_api(netdev); + + return 0; +} + +struct netdev * +netdev_hmap_port_get(odp_port_t port_no, const void *obj) +{ + size_t hash = hash_int(odp_to_u32(port_no), hash_pointer(obj, 0)); + struct port_to_netdev_data *data; + struct netdev *ret = NULL; + + ovs_mutex_lock(&netdev_hmap_mutex); + HMAP_FOR_EACH_WITH_HASH(data, node, hash, &port_to_netdev) { + if (data->obj == obj && data->dpif_port.port_no == port_no) { + ret = netdev_ref(data->netdev); + break; + } + } + ovs_mutex_unlock(&netdev_hmap_mutex); + + return ret; +} + +odp_port_t +netdev_hmap_port_get_byifidx(int ifindex) +{ + struct ifindex_to_port_data *data; + odp_port_t ret = 0; + + ovs_mutex_lock(&netdev_hmap_mutex); + HMAP_FOR_EACH_WITH_HASH(data, node, ifindex, &ifindex_to_port) { + if (data->ifindex == ifindex) { + ret = data->port; + break; + } + } + ovs_mutex_unlock(&netdev_hmap_mutex); + + return ret; +} + +int +netdev_hmap_port_del(odp_port_t port_no, const void *obj) +{ + int ret; + + ovs_mutex_lock(&netdev_hmap_mutex); + ret = netdev_hmap_port_del_locked(port_no, obj); + ovs_mutex_unlock(&netdev_hmap_mutex); + + return ret; +} + bool netdev_flow_api_enabled = false; #ifdef __linux__ diff --git a/lib/netdev.h b/lib/netdev.h index e2d1799..f494ea3 100644 --- a/lib/netdev.h +++ b/lib/netdev.h @@ -181,6 +181,14 @@ int netdev_init_flow_api(struct netdev *); extern bool netdev_flow_api_enabled; void netdev_set_flow_api_enabled(const struct smap *ovs_other_config); +struct dpif_port; +int netdev_hmap_port_add(struct netdev *, const void *obj, struct dpif_port *); +struct netdev *netdev_hmap_port_get(odp_port_t port, const void *obj); +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); +odp_port_t netdev_hmap_port_get_byifidx(int ifindex); + /* native tunnel APIs */ /* Structure to pass parameters required to build a tunnel header. */ struct netdev_tnl_build_header_params {