ovs-vswitchd: Fix high cpu utilization when acquire idl lock fails.

[cascardo/ovs.git] / lib / bfd.c

diff --git a/lib/bfd.c b/lib/bfd.c
index 4cbe999..5c26ae0 100644 (file)
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -169,8 +169,10 @@ struct bfd {
 
     uint32_t rmt_disc;            /* bfd.RemoteDiscr. */
 
-    uint8_t eth_dst[ETH_ADDR_LEN];/* Ethernet destination address. */
-    bool eth_dst_set;             /* 'eth_dst' set through database. */
+    uint8_t local_eth_src[ETH_ADDR_LEN]; /* Local eth src address. */
+    uint8_t local_eth_dst[ETH_ADDR_LEN]; /* Local eth dst address. */
+
+    uint8_t rmt_eth_dst[ETH_ADDR_LEN];   /* Remote eth dst address. */
 
     ovs_be32 ip_src;              /* IPv4 source address. */
     ovs_be32 ip_dst;              /* IPv4 destination address. */
@@ -388,8 +390,6 @@ bfd_configure(struct bfd *bfd, const char *name, const struct smap *cfg,
 
         bfd_set_state(bfd, STATE_DOWN, DIAG_NONE);
 
-        memcpy(bfd->eth_dst, eth_addr_bfd, ETH_ADDR_LEN);
-
         bfd_status_changed(bfd);
     }
 
@@ -440,27 +440,39 @@ bfd_configure(struct bfd *bfd, const char *name, const struct smap *cfg,
         need_poll = true;
     }
 
-    hwaddr = smap_get(cfg, "bfd_dst_mac");
-    if (hwaddr && eth_addr_from_string(hwaddr, ea) && !eth_addr_is_zero(ea)) {
-        memcpy(bfd->eth_dst, ea, ETH_ADDR_LEN);
-        bfd->eth_dst_set = true;
-    } else if (bfd->eth_dst_set) {
-        memcpy(bfd->eth_dst, eth_addr_bfd, ETH_ADDR_LEN);
-        bfd->eth_dst_set = false;
+    hwaddr = smap_get(cfg, "bfd_local_src_mac");
+    if (hwaddr && eth_addr_from_string(hwaddr, ea)) {
+        memcpy(bfd->local_eth_src, ea, ETH_ADDR_LEN);
+    } else {
+        memset(bfd->local_eth_src, 0, ETH_ADDR_LEN);
+    }
+
+    hwaddr = smap_get(cfg, "bfd_local_dst_mac");
+    if (hwaddr && eth_addr_from_string(hwaddr, ea)) {
+        memcpy(bfd->local_eth_dst, ea, ETH_ADDR_LEN);
+    } else {
+        memset(bfd->local_eth_dst, 0, ETH_ADDR_LEN);
+    }
+
+    hwaddr = smap_get(cfg, "bfd_remote_dst_mac");
+    if (hwaddr && eth_addr_from_string(hwaddr, ea)) {
+        memcpy(bfd->rmt_eth_dst, ea, ETH_ADDR_LEN);
+    } else {
+        memset(bfd->rmt_eth_dst, 0, ETH_ADDR_LEN);
     }
 
     ip_src = smap_get(cfg, "bfd_src_ip");
     if (ip_src && bfd_lookup_ip(ip_src, &in_addr)) {
         memcpy(&bfd->ip_src, &in_addr, sizeof in_addr);
     } else {
-        bfd->ip_src = htonl(0xA9FE0100); /* 169.254.1.0. */
+        bfd->ip_src = htonl(0xA9FE0101); /* 169.254.1.1. */
     }
 
     ip_dst = smap_get(cfg, "bfd_dst_ip");
     if (ip_dst && bfd_lookup_ip(ip_dst, &in_addr)) {
         memcpy(&bfd->ip_dst, &in_addr, sizeof in_addr);
     } else {
-        bfd->ip_dst = htonl(0xA9FE0101); /* 169.254.1.1. */
+        bfd->ip_dst = htonl(0xA9FE0100); /* 169.254.1.0. */
     }
 
     forwarding_if_rx = smap_get_bool(cfg, "forwarding_if_rx", false);
@@ -600,8 +612,14 @@ bfd_put_packet(struct bfd *bfd, struct ofpbuf *p,
 
     ofpbuf_reserve(p, 2); /* Properly align after the ethernet header. */
     eth = ofpbuf_put_uninit(p, sizeof *eth);
-    memcpy(eth->eth_src, eth_src, ETH_ADDR_LEN);
-    memcpy(eth->eth_dst, bfd->eth_dst, ETH_ADDR_LEN);
+    memcpy(eth->eth_src,
+           eth_addr_is_zero(bfd->local_eth_src) ? eth_src
+                                                : bfd->local_eth_src,
+           ETH_ADDR_LEN);
+    memcpy(eth->eth_dst,
+           eth_addr_is_zero(bfd->local_eth_dst) ? eth_addr_bfd
+                                                : bfd->local_eth_dst,
+           ETH_ADDR_LEN);
     eth->eth_type = htons(ETH_TYPE_IP);
 
     ip = ofpbuf_put_zeros(p, sizeof *ip);
@@ -657,7 +675,8 @@ bfd_should_process_flow(const struct bfd *bfd_, const struct flow *flow,
     bool check_tnl_key;
 
     memset(&wc->masks.dl_dst, 0xff, sizeof wc->masks.dl_dst);
-    if (bfd->eth_dst_set && memcmp(bfd->eth_dst, flow->dl_dst, ETH_ADDR_LEN)) {
+    if (!eth_addr_is_zero(bfd->rmt_eth_dst)
+        && memcmp(bfd->rmt_eth_dst, flow->dl_dst, ETH_ADDR_LEN)) {
         return false;
     }