OpenSourceRouting / quagga-snap / 10f9bf3f202

Commits

Jorge Boncompte [DTI2] authored and David Lamparter committed 10f9bf3f202 07 May 2012

bgpd: optimize bgp_nexthop_self()

  This function scores 2nd, profiling a full internet table load. It's called
for every prefix received.
  Instead of looping in the interface lists comparing addresses use a hash
to mantain them.

* bgpd.c: Init the own address hash.
* bgp_nexthop.c: Introduce methods to maintain an own address hash.
  (bgp_connected_add) add addresses to the hash.
  (bgp_connected_delete) delete addresses from the hash.
  (bgp_nexthop_self) lookup addresses in the hash. Removed the unused afi_t
  parameter.
* bgp_route.c: (bgp_update_main) Micro-optimization, rearranged condition to
  not lookup the hash for bogus nexthops (0.0.0.0 or a class D/E address)

Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

bgpd/bgp_nexthop.c

Modified

-21
+#include <zebra.h>
-22
-23
+#include "command.h"
-24
+#include "thread.h"
-25
+#include "prefix.h"
-26
+#include "zclient.h"
-27
+#include "stream.h"
-28
+#include "network.h"
-29
+#include "log.h"
-30
+#include "memory.h"
-+
+#include "hash.h"
-+
+#include "jhash.h"
-33
-34
+#include "bgpd/bgpd.h"
-35
+#include "bgpd/bgp_table.h"
-36
+#include "bgpd/bgp_route.h"
-37
+#include "bgpd/bgp_attr.h"
-38
+#include "bgpd/bgp_nexthop.h"
-39
+#include "bgpd/bgp_debug.h"
-40
+#include "bgpd/bgp_damp.h"
-41
+#include "zebra/rib.h"
-42
+#include "zebra/zserv.h"	/* For ZEBRA_SERV_PATH. */
-519
+    zlog_debug ("Performing BGP general scanning");
-520
-521
+  bgp_scan (AFI_IP, SAFI_UNICAST);
-522
-523
+#ifdef HAVE_IPV6
-524
+  bgp_scan (AFI_IP6, SAFI_UNICAST);
-525
+#endif /* HAVE_IPV6 */
-526
-527
+  return 0;
-528
+}
-+
-+
+/* BGP own address structure */
-+
+struct bgp_addr
-+
+{
-+
+  struct in_addr addr;
-+
+  int refcnt;
-+
+};
-+
-+
+static struct hash *bgp_address_hash;
-+
-+
+static void *
-+
+bgp_address_hash_alloc (void *p)
-+
+{
-+
+  struct in_addr *val = p;
-+
+  struct bgp_addr *addr;
-+
-+
+  addr = XMALLOC (MTYPE_BGP_ADDR, sizeof (struct bgp_addr));
-+
+  addr->refcnt = 0;
-+
+  addr->addr.s_addr = val->s_addr;
-+
-+
+  return addr;
-+
+}
-+
-+
+static unsigned int
-+
+bgp_address_hash_key_make (void *p)
-+
+{
-+
+  const struct bgp_addr *addr = p;
-+
-+
+  return jhash_1word(addr->addr.s_addr, 0);
-+
+}
-+
-+
+static int
-+
+bgp_address_hash_cmp (const void *p1, const void *p2)
-+
+{
-+
+  const struct bgp_addr *addr1 = p1;
-+
+  const struct bgp_addr *addr2 = p2;
-+
-+
+  return addr1->addr.s_addr == addr2->addr.s_addr;
-+
+}
-+
-+
+void
-+
+bgp_address_init (void)
-+
+{
-+
+  bgp_address_hash = hash_create (bgp_address_hash_key_make,
-+
+                                  bgp_address_hash_cmp);
-+
+}
-+
-+
+static void
-+
+bgp_address_add (struct prefix *p)
-+
+{
-+
+  struct bgp_addr tmp;
-+
+  struct bgp_addr *addr;
-+
-+
+  tmp.addr = p->u.prefix4;
-+
-+
+  addr = hash_get (bgp_address_hash, &tmp, bgp_address_hash_alloc);
-+
+  addr->refcnt++;
-+
+}
-+
-+
+static void
-+
+bgp_address_del (struct prefix *p)
-+
+{
-+
+  struct bgp_addr tmp;
-+
+  struct bgp_addr *addr;
-+
-+
+  tmp.addr = p->u.prefix4;
-+
-+
+  addr = hash_lookup (bgp_address_hash, &tmp);
-+
+  addr->refcnt--;
-+
-+
+  if (addr->refcnt == 0)
-+
+    {
-+
+      hash_release (bgp_address_hash, addr);
-+
+      XFREE (MTYPE_BGP_ADDR, addr);
-+
+    }
-+
+}
-+
-606
-607
+struct bgp_connected_ref
-608
+{
-609
+  unsigned int refcnt;
-610
+};
-611
-612
+void
-613
+bgp_connected_add (struct connected *ifc)
-614
+{
-615
+  struct prefix p;
-629
+  addr = ifc->address;
-630
-631
+  if (addr->family == AF_INET)
-632
+    {
-633
+      PREFIX_COPY_IPV4(&p, CONNECTED_PREFIX(ifc));
-634
+      apply_mask_ipv4 ((struct prefix_ipv4 *) &p);
-635
-636
+      if (prefix_ipv4_any ((struct prefix_ipv4 *) &p))
-637
+	return;
-638
-+
+      bgp_address_add (addr);
-+
-641
+      rn = bgp_node_get (bgp_connected_table[AFI_IP], (struct prefix *) &p);
-642
+      if (rn->info)
-643
+	{
-644
+	  bc = rn->info;
-645
+	  bc->refcnt++;
-646
+	}
-647
+      else
-648
+	{
-649
+	  bc = XCALLOC (MTYPE_BGP_CONN, sizeof (struct bgp_connected_ref));
-650
+	  bc->refcnt = 1;
-696
+  addr = ifc->address;
-697
-698
+  if (addr->family == AF_INET)
-699
+    {
-700
+      PREFIX_COPY_IPV4(&p, CONNECTED_PREFIX(ifc));
-701
+      apply_mask_ipv4 ((struct prefix_ipv4 *) &p);
-702
-703
+      if (prefix_ipv4_any ((struct prefix_ipv4 *) &p))
-704
+	return;
-705
-+
+      bgp_address_del (addr);
-+
-708
+      rn = bgp_node_lookup (bgp_connected_table[AFI_IP], &p);
-709
+      if (! rn)
-710
+	return;
-711
-712
+      bc = rn->info;
-713
+      bc->refcnt--;
-714
+      if (bc->refcnt == 0)
-715
+	{
-716
+	  XFREE (MTYPE_BGP_CONN, bc);
-717
+	  rn->info = NULL;
-742
+	  XFREE (MTYPE_BGP_CONN, bc);
-743
+	  rn->info = NULL;
-744
+	}
-745
+      bgp_unlock_node (rn);
-746
+      bgp_unlock_node (rn);
-747
+    }
-748
+#endif /* HAVE_IPV6 */
-749
+}
-750
-751
+int
--
+bgp_nexthop_self (afi_t afi, struct attr *attr)
-+
+bgp_nexthop_self (struct attr *attr)
-753
+{
--
+  struct listnode *node;
--
+  struct listnode *node2;
--
+  struct interface *ifp;
--
+  struct connected *ifc;
--
+  struct prefix *p;
-+
+  struct bgp_addr tmp, *addr;
-755
--
+  for (ALL_LIST_ELEMENTS_RO (iflist, node, ifp))
--
+    {
--
+      for (ALL_LIST_ELEMENTS_RO (ifp->connected, node2, ifc))
--
+	{
--
+	  p = ifc->address;
-+
+  tmp.addr = attr->nexthop;
-+
-+
+  addr = hash_lookup (bgp_address_hash, &tmp);
-+
+  if (addr)
-+
+    return 1;
-761
--
+	  if (p && p->family == AF_INET
--
+	      && IPV4_ADDR_SAME (&p->u.prefix4, &attr->nexthop))
--
+	    return 1;
--
+	}
--
+    }
-762
+  return 0;
-763
+}
-764
-765
+static struct bgp_nexthop_cache *
-766
+zlookup_read (void)
-767
+{
-768
+  struct stream *s;
-769
+  uint16_t length;
-770
+  u_char marker;
-771
+  u_char version;

quagga-snap

Commits

Jira Issues

Add shortcut