From patchwork Fri Dec 8 12:04:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Bodireddy, Bhanuprakash" X-Patchwork-Id: 846198 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) 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 3ytWbm1JMZz9s82 for ; Fri, 8 Dec 2017 23:18:44 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 84429CFA; Fri, 8 Dec 2017 12:15:50 +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 6B6FECF8 for ; Fri, 8 Dec 2017 12:15:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 0C9D5189 for ; Fri, 8 Dec 2017 12:15:47 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Dec 2017 04:15:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,377,1508828400"; d="scan'208";a="185249752" Received: from silpixa00393942.ir.intel.com (HELO silpixa00393942.ger.corp.intel.com) ([10.237.223.42]) by fmsmga006.fm.intel.com with ESMTP; 08 Dec 2017 04:15:46 -0800 From: Bhanuprakash Bodireddy To: dev@openvswitch.org Date: Fri, 8 Dec 2017 12:04:24 +0000 Message-Id: <1512734667-23202-6-git-send-email-bhanuprakash.bodireddy@intel.com> X-Mailer: git-send-email 2.4.11 In-Reply-To: <1512734667-23202-1-git-send-email-bhanuprakash.bodireddy@intel.com> References: <1512734667-23202-1-git-send-email-bhanuprakash.bodireddy@intel.com> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v6 5/8] bridge: Update keepalive status in OVSDB. 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 This commit allows vswitchd thread to update the OVSDB with the status of all registered PMD threads. The status can be monitored using ovsdb-client and the sample output is below. $ ovsdb-client monitor Open_vSwitch Open_vSwitch keepalive row action keepalive 7b746190-ee71-4dcc-becf-f8cb9c7cb909 old { "pmd62"="ALIVE,0,9226457935188922" "pmd63"="ALIVE,1,1503333678618" "pmd64"="ALIVE,2,1503333678618" "pmd65"="ALIVE,3,1503333678618"} new { "pmd62"="ALIVE,0,9226460230167364" "pmd63"="ALIVE,1,1503333679619" "pmd64"="ALIVE,2,1503333679619" "pmd65"="ALIVE,3,1503333679619""} Signed-off-by: Bhanuprakash Bodireddy Tested-by: Antonio Fischetti Acked-by: Antonio Fischetti --- lib/keepalive.c | 15 +++++++++++++++ lib/keepalive.h | 1 + vswitchd/bridge.c | 26 ++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/lib/keepalive.c b/lib/keepalive.c index 7d3dbad..14ac093 100644 --- a/lib/keepalive.c +++ b/lib/keepalive.c @@ -347,6 +347,21 @@ get_ka_stats(void) ovs_mutex_unlock(&mutex); } +struct smap * +ka_stats_run(void) +{ + struct smap *ka_stats = NULL; + + ovs_mutex_lock(&mutex); + if (keepalive_stats) { + ka_stats = keepalive_stats; + keepalive_stats = NULL; + } + ovs_mutex_unlock(&mutex); + + return ka_stats; +} + /* Dispatch heartbeats from 'ovs_keepalive' thread. */ void dispatch_heartbeats(void) diff --git a/lib/keepalive.h b/lib/keepalive.h index 2bae8f1..e84646a 100644 --- a/lib/keepalive.h +++ b/lib/keepalive.h @@ -101,6 +101,7 @@ void ka_cache_registered_threads(void); void ka_mark_pmd_thread_alive(int); void ka_mark_pmd_thread_sleep(int); void get_ka_stats(void); +struct smap *ka_stats_run(void); void dispatch_heartbeats(void); void ka_init(const struct smap *); void ka_destroy(void); diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index f70407f..55c925e 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -286,6 +286,7 @@ static bool port_is_synthetic(const struct port *); static void reconfigure_system_stats(const struct ovsrec_open_vswitch *); static void run_system_stats(void); +static void run_keepalive_stats(void); static void bridge_configure_mirrors(struct bridge *); static struct mirror *mirror_create(struct bridge *, @@ -403,6 +404,7 @@ bridge_init(const char *remote) ovsdb_idl_omit_alert(idl, &ovsrec_open_vswitch_col_cur_cfg); ovsdb_idl_omit_alert(idl, &ovsrec_open_vswitch_col_statistics); + ovsdb_idl_omit_alert(idl, &ovsrec_open_vswitch_col_keepalive); ovsdb_idl_omit_alert(idl, &ovsrec_open_vswitch_col_datapath_types); ovsdb_idl_omit_alert(idl, &ovsrec_open_vswitch_col_iface_types); ovsdb_idl_omit(idl, &ovsrec_open_vswitch_col_external_ids); @@ -2686,6 +2688,29 @@ run_system_stats(void) } } +void +run_keepalive_stats(void) +{ + struct smap *ka_stats; + const struct ovsrec_open_vswitch *cfg = ovsrec_open_vswitch_first(idl); + + ka_stats = ka_stats_run(); + if (ka_stats && cfg) { + struct ovsdb_idl_txn *txn; + struct ovsdb_datum datum; + + txn = ovsdb_idl_txn_create(idl); + ovsdb_datum_from_smap(&datum, ka_stats); + smap_destroy(ka_stats); + ovsdb_idl_txn_write(&cfg->header_, &ovsrec_open_vswitch_col_keepalive, + &datum); + ovsdb_idl_txn_commit(txn); + ovsdb_idl_txn_destroy(txn); + + free(ka_stats); + } +} + static const char * ofp12_controller_role_to_str(enum ofp12_controller_role role) { @@ -3039,6 +3064,7 @@ bridge_run(void) run_stats_update(); run_status_update(); run_system_stats(); + run_keepalive_stats(); } void