]> git.proxmox.com Git - mirror_frr.git/blobdiff - bgpd/bgp_keepalives.c
Merge pull request #3394 from karamalla0406/frr3360
[mirror_frr.git] / bgpd / bgp_keepalives.c
index dada5c3c265a10cc5cc772101c8db25cadddacc8..50aad70ddc56fd70eb5ea32d4292e8b13cd29d33 100644 (file)
@@ -1,8 +1,5 @@
-/*
- * BGP Keepalives.
- *
+/* BGP Keepalives.
  * Implements a producer thread to generate BGP keepalives for peers.
- * ----------------------------------------
  * Copyright (C) 2017 Cumulus Networks, Inc.
  * Quentin Young
  *
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License along with
- * FRRouting; see the file COPYING.  If not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+/* clang-format off */
 #include <zebra.h>
-#include <signal.h>
-#include <sys/time.h>
+#include <pthread.h>           // for pthread_mutex_lock, pthread_mutex_unlock
 
-#include "thread.h"
-#include "log.h"
-#include "vty.h"
-#include "monotime.h"
-#include "hash.h"
+#include "frr_pthread.h"        // for frr_pthread
+#include "hash.h"              // for hash, hash_clean, hash_create_size...
+#include "log.h"               // for zlog_debug
+#include "memory.h"            // for MTYPE_TMP, XFREE, XCALLOC, XMALLOC
+#include "monotime.h"          // for monotime, monotime_since
 
-#include "bgpd/bgpd.h"
+#include "bgpd/bgpd.h"          // for peer, PEER_THREAD_KEEPALIVES_ON, peer...
+#include "bgpd/bgp_debug.h"    // for bgp_debug_neighbor_events
+#include "bgpd/bgp_packet.h"   // for bgp_keepalive_send
 #include "bgpd/bgp_keepalives.h"
-#include "bgpd/bgp_debug.h"
-#include "bgpd/bgp_attr.h"
-#include "bgpd/bgp_packet.h"
+/* clang-format on */
 
-/**
+/*
  * Peer KeepAlive Timer.
  * Associates a peer with the time of its last keepalive.
  */
 struct pkat {
-       // the peer to send keepalives to
+       /* the peer to send keepalives to */
        struct peer *peer;
-       // absolute time of last keepalive sent
+       /* absolute time of last keepalive sent */
        struct timeval last;
 };
 
@@ -54,9 +52,6 @@ static pthread_mutex_t *peerhash_mtx;
 static pthread_cond_t *peerhash_cond;
 static struct hash *peerhash;
 
-/* Thread control flag. */
-bool bgp_keepalives_thread_run = false;
-
 static struct pkat *pkat_new(struct peer *peer)
 {
        struct pkat *pkat = XMALLOC(MTYPE_TMP, sizeof(struct pkat));
@@ -72,7 +67,8 @@ static void pkat_del(void *pkat)
 
 
 /*
- * Walks the list of peers, sending keepalives to those that are due for them.
+ * Callback for hash_iterate. Determines if a peer needs a keepalive and if so,
+ * generates and sends it.
  *
  * For any given peer, if the elapsed time since its last keepalive exceeds its
  * configured keepalive timer, a keepalive is sent to the peer and its
@@ -101,10 +97,10 @@ static void peer_process(struct hash_backet *hb, void *arg)
 
        static struct timeval tolerance = {0, 100000};
 
-       // calculate elapsed time since last keepalive
+       /* calculate elapsed time since last keepalive */
        monotime_since(&pkat->last, &elapsed);
 
-       // calculate difference between elapsed time and configured time
+       /* calculate difference between elapsed time and configured time */
        ka.tv_sec = pkat->peer->v_keepalive;
        timersub(&ka, &elapsed, &diff);
 
@@ -119,18 +115,19 @@ static void peer_process(struct hash_backet *hb, void *arg)
                bgp_keepalive_send(pkat->peer);
                monotime(&pkat->last);
                memset(&elapsed, 0x00, sizeof(struct timeval));
-               diff = ka; // time until next keepalive == peer keepalive time
+               diff = ka;
        }
 
-       // if calculated next update for this peer < current delay, use it
-       if (next_update->tv_sec <= 0 || timercmp(&diff, next_update, <))
+       /* if calculated next update for this peer < current delay, use it */
+       if (next_update->tv_sec < 0 || timercmp(&diff, next_update, <))
                *next_update = diff;
 }
 
-static int peer_hash_cmp(const void *f, const void *s)
+static bool peer_hash_cmp(const void *f, const void *s)
 {
        const struct pkat *p1 = f;
        const struct pkat *p2 = s;
+
        return p1->peer == p2->peer;
 }
 
@@ -140,29 +137,9 @@ static unsigned int peer_hash_key(void *arg)
        return (uintptr_t)pkat->peer;
 }
 
-void peer_keepalives_init()
-{
-       peerhash_mtx = XCALLOC(MTYPE_PTHREAD, sizeof(pthread_mutex_t));
-       peerhash_cond = XCALLOC(MTYPE_PTHREAD, sizeof(pthread_cond_t));
-
-       // initialize mutex
-       pthread_mutex_init(peerhash_mtx, NULL);
-
-       // use monotonic clock with condition variable
-       pthread_condattr_t attrs;
-       pthread_condattr_init(&attrs);
-       pthread_condattr_setclock(&attrs, CLOCK_MONOTONIC);
-       pthread_cond_init(peerhash_cond, &attrs);
-       pthread_condattr_destroy(&attrs);
-
-       // initialize peer hashtable
-       peerhash = hash_create_size(2048, peer_hash_key, peer_hash_cmp);
-}
-
-static void peer_keepalives_finish(void *arg)
+/* Cleanup handler / deinitializer. */
+static void bgp_keepalives_finish(void *arg)
 {
-       bgp_keepalives_thread_run = false;
-
        if (peerhash) {
                hash_clean(peerhash, pkat_del);
                hash_free(peerhash);
@@ -174,36 +151,56 @@ static void peer_keepalives_finish(void *arg)
        pthread_mutex_destroy(peerhash_mtx);
        pthread_cond_destroy(peerhash_cond);
 
-       XFREE(MTYPE_PTHREAD, peerhash_mtx);
-       XFREE(MTYPE_PTHREAD, peerhash_cond);
+       XFREE(MTYPE_TMP, peerhash_mtx);
+       XFREE(MTYPE_TMP, peerhash_cond);
 }
 
-/**
+/*
  * Entry function for peer keepalive generation pthread.
- *
- * peer_keepalives_init() must be called prior to this.
  */
-void *peer_keepalives_start(void *arg)
+void *bgp_keepalives_start(void *arg)
 {
+       struct frr_pthread *fpt = arg;
+       fpt->master->owner = pthread_self();
+
        struct timeval currtime = {0, 0};
        struct timeval aftertime = {0, 0};
        struct timeval next_update = {0, 0};
        struct timespec next_update_ts = {0, 0};
 
+       peerhash_mtx = XCALLOC(MTYPE_TMP, sizeof(pthread_mutex_t));
+       peerhash_cond = XCALLOC(MTYPE_TMP, sizeof(pthread_cond_t));
+
+       /* initialize mutex */
+       pthread_mutex_init(peerhash_mtx, NULL);
+
+       /* use monotonic clock with condition variable */
+       pthread_condattr_t attrs;
+       pthread_condattr_init(&attrs);
+       pthread_condattr_setclock(&attrs, CLOCK_MONOTONIC);
+       pthread_cond_init(peerhash_cond, &attrs);
+       pthread_condattr_destroy(&attrs);
+
+       frr_pthread_set_name(fpt, NULL, "bgpd_ka");
+
+       /* initialize peer hashtable */
+       peerhash = hash_create_size(2048, peer_hash_key, peer_hash_cmp, NULL);
        pthread_mutex_lock(peerhash_mtx);
 
-       // register cleanup handler
-       pthread_cleanup_push(&peer_keepalives_finish, NULL);
+       /* register cleanup handler */
+       pthread_cleanup_push(&bgp_keepalives_finish, NULL);
 
-       bgp_keepalives_thread_run = true;
+       /* notify anybody waiting on us that we are done starting up */
+       frr_pthread_notify_running(fpt);
 
-       while (bgp_keepalives_thread_run) {
+       while (atomic_load_explicit(&fpt->running, memory_order_relaxed)) {
                if (peerhash->count > 0)
                        pthread_cond_timedwait(peerhash_cond, peerhash_mtx,
                                               &next_update_ts);
                else
                        while (peerhash->count == 0
-                              && bgp_keepalives_thread_run)
+                              && atomic_load_explicit(&fpt->running,
+                                                      memory_order_relaxed))
                                pthread_cond_wait(peerhash_cond, peerhash_mtx);
 
                monotime(&currtime);
@@ -220,7 +217,7 @@ void *peer_keepalives_start(void *arg)
                TIMEVAL_TO_TIMESPEC(&next_update, &next_update_ts);
        }
 
-       // clean up
+       /* clean up */
        pthread_cleanup_pop(1);
 
        return NULL;
@@ -228,11 +225,22 @@ void *peer_keepalives_start(void *arg)
 
 /* --- thread external functions ------------------------------------------- */
 
-void peer_keepalives_on(struct peer *peer)
+void bgp_keepalives_on(struct peer *peer)
 {
+       if (CHECK_FLAG(peer->thread_flags, PEER_THREAD_KEEPALIVES_ON))
+               return;
+
+       struct frr_pthread *fpt = bgp_pth_ka;
+       assert(fpt->running);
+
        /* placeholder bucket data to use for fast key lookups */
        static struct pkat holder = {0};
 
+       /*
+        * We need to ensure that bgp_keepalives_init was called first
+        */
+       assert(peerhash_mtx);
+
        pthread_mutex_lock(peerhash_mtx);
        {
                holder.peer = peer;
@@ -244,14 +252,25 @@ void peer_keepalives_on(struct peer *peer)
                SET_FLAG(peer->thread_flags, PEER_THREAD_KEEPALIVES_ON);
        }
        pthread_mutex_unlock(peerhash_mtx);
-       peer_keepalives_wake();
+       bgp_keepalives_wake();
 }
 
-void peer_keepalives_off(struct peer *peer)
+void bgp_keepalives_off(struct peer *peer)
 {
+       if (!CHECK_FLAG(peer->thread_flags, PEER_THREAD_KEEPALIVES_ON))
+               return;
+
+       struct frr_pthread *fpt = bgp_pth_ka;
+       assert(fpt->running);
+
        /* placeholder bucket data to use for fast key lookups */
        static struct pkat holder = {0};
 
+       /*
+        * We need to ensure that bgp_keepalives_init was called first
+        */
+       assert(peerhash_mtx);
+
        pthread_mutex_lock(peerhash_mtx);
        {
                holder.peer = peer;
@@ -265,7 +284,7 @@ void peer_keepalives_off(struct peer *peer)
        pthread_mutex_unlock(peerhash_mtx);
 }
 
-void peer_keepalives_wake()
+void bgp_keepalives_wake()
 {
        pthread_mutex_lock(peerhash_mtx);
        {
@@ -273,3 +292,14 @@ void peer_keepalives_wake()
        }
        pthread_mutex_unlock(peerhash_mtx);
 }
+
+int bgp_keepalives_stop(struct frr_pthread *fpt, void **result)
+{
+       assert(fpt->running);
+
+       atomic_store_explicit(&fpt->running, false, memory_order_relaxed);
+       bgp_keepalives_wake();
+
+       pthread_join(fpt->thread, result);
+       return 0;
+}