From patchwork Thu Oct 29 11:23:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Mi X-Patchwork-Id: 1390075 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CMNPl6gKZz9sSC for ; Thu, 29 Oct 2020 22:24:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 07E762E1AF; Thu, 29 Oct 2020 11:24:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Df8f2g9cNbNG; Thu, 29 Oct 2020 11:24:19 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id A013A2281C; Thu, 29 Oct 2020 11:24:06 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7F7A7C1AE1; Thu, 29 Oct 2020 11:24:06 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 8F1A9C1ADC for ; Thu, 29 Oct 2020 11:24:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8A5AE86C4F for ; Thu, 29 Oct 2020 11:24:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G9umO7VShhhz for ; Thu, 29 Oct 2020 11:24:03 +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 fraxinus.osuosl.org (Postfix) with ESMTP id 6A8B486C20 for ; Thu, 29 Oct 2020 11:24:02 +0000 (UTC) Received: from Internal Mail-Server by MTLPINE1 (envelope-from cmi@nvidia.com) with SMTP; 29 Oct 2020 13:23:57 +0200 Received: from dev-r630-04.mtbc.labs.mlnx (dev-r630-04.mtbc.labs.mlnx [10.75.205.14]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 09TBNg0i022472; Thu, 29 Oct 2020 13:23:55 +0200 From: Chris Mi To: dev@openvswitch.org Date: Thu, 29 Oct 2020 19:23:35 +0800 Message-Id: <20201029112340.14167-8-cmi@nvidia.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20201029112340.14167-1-cmi@nvidia.com> References: <20201029112340.14167-1-cmi@nvidia.com> MIME-Version: 1.0 Cc: elibr@nvidia.com, Chris Mi , roniba@nvidia.com, i.maximets@ovn.org Subject: [ovs-dev] [PATCH v5 07/12] dpif-netlink: Implement register sFlow upcall callback API X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Implement dpif netlink register sFlow upcall callback API. Signed-off-by: Chris Mi Reviewed-by: Eli Britstein --- lib/dpif-netlink.c | 28 +++++++++++++++++++++++++++- lib/netdev-offload.c | 18 ++++++++++++++++++ lib/netdev-offload.h | 1 + 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c index 3fb992def..380c1b129 100644 --- a/lib/dpif-netlink.c +++ b/lib/dpif-netlink.c @@ -236,6 +236,8 @@ static unsigned int ovs_vport_mcgroup; * to using the compat interface. */ static bool ovs_tunnels_out_of_tree = true; +static sflow_upcall_callback *sflow_upcall_cb; + static int dpif_netlink_init(void); static int open_dpif(const struct dpif_netlink_dp *, struct dpif **); static uint32_t dpif_netlink_port_get_pid(const struct dpif *, @@ -2820,6 +2822,30 @@ dpif_netlink_recv_purge(struct dpif *dpif_) fat_rwlock_unlock(&dpif->upcall_lock); } +static int +dpif_netlink_sflow_upcall_cb(struct dpif_upcall_sflow *dupcall) +{ + return sflow_upcall_cb(dupcall); +} + +static void +dpif_netlink_register_sflow_upcall_cb(struct dpif *dpif, + sflow_upcall_callback *cb) +{ + const char *dpif_type_str = dpif_normalize_type(dpif_type(dpif)); + struct netdev *dev; + + sflow_upcall_cb = cb; + dev = netdev_get(dpif_type_str); + if (!dev) { + VLOG_ERR("%s: Can't find any netdev for dpif type: %s", __func__, + dpif_type_str); + return; + } + netdev_regsiter_nl_sflow_upcall_cb(dev, dpif_netlink_sflow_upcall_cb); + netdev_close(dev); +} + static char * dpif_netlink_get_datapath_version(void) { @@ -3978,7 +4004,7 @@ const struct dpif_class dpif_netlink_class = { NULL, /* register_upcall_cb */ NULL, /* enable_upcall */ NULL, /* disable_upcall */ - NULL, /* register_sflow_upcall_cb */ + dpif_netlink_register_sflow_upcall_cb, dpif_netlink_get_datapath_version, /* get_datapath_version */ dpif_netlink_ct_dump_start, dpif_netlink_ct_dump_next, diff --git a/lib/netdev-offload.c b/lib/netdev-offload.c index f8d397d08..17f1592b5 100644 --- a/lib/netdev-offload.c +++ b/lib/netdev-offload.c @@ -581,6 +581,24 @@ netdev_ports_get(odp_port_t port_no, const char *dpif_type) return ret; } +struct netdev * +netdev_get(const char *dpif_type) +{ + struct port_to_netdev_data *data; + struct netdev *dev = NULL; + + ovs_rwlock_rdlock(&netdev_hmap_rwlock); + HMAP_FOR_EACH (data, portno_node, &port_to_netdev) { + if (netdev_get_dpif_type(data->netdev) == dpif_type) { + dev = netdev_ref(data->netdev); + break; + } + } + ovs_rwlock_unlock(&netdev_hmap_rwlock); + + return dev; +} + int netdev_ports_remove(odp_port_t port_no, const char *dpif_type) { diff --git a/lib/netdev-offload.h b/lib/netdev-offload.h index f74419dee..dd465dd05 100644 --- a/lib/netdev-offload.h +++ b/lib/netdev-offload.h @@ -109,6 +109,7 @@ struct dpif_port; int netdev_ports_insert(struct netdev *, const char *dpif_type, struct dpif_port *); struct netdev *netdev_ports_get(odp_port_t port, const char *dpif_type); +struct netdev *netdev_get(const char *dpif_type); int netdev_ports_remove(odp_port_t port, const char *dpif_type); odp_port_t netdev_ifindex_to_odp_port(int ifindex);