aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorErik Hugne <erik.hugne@ericsson.com>2015-01-22 11:10:31 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-26 19:58:08 -0500
commit3fa9cacd697eb26d99c59a8479d8a1b3d6311182 (patch)
tree4f71b87ea4c4a3b0744f87327c9f8284aeff9708 /net/tipc
parent9c5d94bc18782ab3c48aa2df4ad6c451286a7bb3 (diff)
tipc: fix excessive network event logging
If a large number of namespaces is spawned on a node and TIPC is enabled in each of these, the excessive printk tracing of network events will cause the system to grind down to a near halt. The traces are still of debug value, so instead of removing them completely we fix it by changing the link state and node availability logging debug traces. Signed-off-by: Erik Hugne <erik.hugne@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/link.c20
-rw-r--r--net/tipc/node.c22
2 files changed, 21 insertions, 21 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 193bc1560677..2846ad802e43 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -538,8 +538,8 @@ static void link_state_event(struct tipc_link *l_ptr, unsigned int event)
538 link_set_timer(l_ptr, cont_intv / 4); 538 link_set_timer(l_ptr, cont_intv / 4);
539 break; 539 break;
540 case RESET_MSG: 540 case RESET_MSG:
541 pr_info("%s<%s>, requested by peer\n", link_rst_msg, 541 pr_debug("%s<%s>, requested by peer\n",
542 l_ptr->name); 542 link_rst_msg, l_ptr->name);
543 tipc_link_reset(l_ptr); 543 tipc_link_reset(l_ptr);
544 l_ptr->state = RESET_RESET; 544 l_ptr->state = RESET_RESET;
545 l_ptr->fsm_msg_cnt = 0; 545 l_ptr->fsm_msg_cnt = 0;
@@ -549,7 +549,7 @@ static void link_state_event(struct tipc_link *l_ptr, unsigned int event)
549 link_set_timer(l_ptr, cont_intv); 549 link_set_timer(l_ptr, cont_intv);
550 break; 550 break;
551 default: 551 default:
552 pr_err("%s%u in WW state\n", link_unk_evt, event); 552 pr_debug("%s%u in WW state\n", link_unk_evt, event);
553 } 553 }
554 break; 554 break;
555 case WORKING_UNKNOWN: 555 case WORKING_UNKNOWN:
@@ -561,8 +561,8 @@ static void link_state_event(struct tipc_link *l_ptr, unsigned int event)
561 link_set_timer(l_ptr, cont_intv); 561 link_set_timer(l_ptr, cont_intv);
562 break; 562 break;
563 case RESET_MSG: 563 case RESET_MSG:
564 pr_info("%s<%s>, requested by peer while probing\n", 564 pr_debug("%s<%s>, requested by peer while probing\n",
565 link_rst_msg, l_ptr->name); 565 link_rst_msg, l_ptr->name);
566 tipc_link_reset(l_ptr); 566 tipc_link_reset(l_ptr);
567 l_ptr->state = RESET_RESET; 567 l_ptr->state = RESET_RESET;
568 l_ptr->fsm_msg_cnt = 0; 568 l_ptr->fsm_msg_cnt = 0;
@@ -588,8 +588,8 @@ static void link_state_event(struct tipc_link *l_ptr, unsigned int event)
588 l_ptr->fsm_msg_cnt++; 588 l_ptr->fsm_msg_cnt++;
589 link_set_timer(l_ptr, cont_intv / 4); 589 link_set_timer(l_ptr, cont_intv / 4);
590 } else { /* Link has failed */ 590 } else { /* Link has failed */
591 pr_warn("%s<%s>, peer not responding\n", 591 pr_debug("%s<%s>, peer not responding\n",
592 link_rst_msg, l_ptr->name); 592 link_rst_msg, l_ptr->name);
593 tipc_link_reset(l_ptr); 593 tipc_link_reset(l_ptr);
594 l_ptr->state = RESET_UNKNOWN; 594 l_ptr->state = RESET_UNKNOWN;
595 l_ptr->fsm_msg_cnt = 0; 595 l_ptr->fsm_msg_cnt = 0;
@@ -1568,9 +1568,9 @@ static void tipc_link_proto_rcv(struct net *net, struct tipc_link *l_ptr,
1568 1568
1569 if (msg_linkprio(msg) && 1569 if (msg_linkprio(msg) &&
1570 (msg_linkprio(msg) != l_ptr->priority)) { 1570 (msg_linkprio(msg) != l_ptr->priority)) {
1571 pr_warn("%s<%s>, priority change %u->%u\n", 1571 pr_debug("%s<%s>, priority change %u->%u\n",
1572 link_rst_msg, l_ptr->name, l_ptr->priority, 1572 link_rst_msg, l_ptr->name,
1573 msg_linkprio(msg)); 1573 l_ptr->priority, msg_linkprio(msg));
1574 l_ptr->priority = msg_linkprio(msg); 1574 l_ptr->priority = msg_linkprio(msg);
1575 tipc_link_reset(l_ptr); /* Enforce change to take effect */ 1575 tipc_link_reset(l_ptr); /* Enforce change to take effect */
1576 break; 1576 break;
diff --git a/net/tipc/node.c b/net/tipc/node.c
index b1eb0927bac8..ee5d33cfcf80 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -230,8 +230,8 @@ void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
230 n_ptr->action_flags |= TIPC_NOTIFY_LINK_UP; 230 n_ptr->action_flags |= TIPC_NOTIFY_LINK_UP;
231 n_ptr->link_id = l_ptr->peer_bearer_id << 16 | l_ptr->bearer_id; 231 n_ptr->link_id = l_ptr->peer_bearer_id << 16 | l_ptr->bearer_id;
232 232
233 pr_info("Established link <%s> on network plane %c\n", 233 pr_debug("Established link <%s> on network plane %c\n",
234 l_ptr->name, l_ptr->net_plane); 234 l_ptr->name, l_ptr->net_plane);
235 235
236 if (!active[0]) { 236 if (!active[0]) {
237 active[0] = active[1] = l_ptr; 237 active[0] = active[1] = l_ptr;
@@ -239,7 +239,7 @@ void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
239 goto exit; 239 goto exit;
240 } 240 }
241 if (l_ptr->priority < active[0]->priority) { 241 if (l_ptr->priority < active[0]->priority) {
242 pr_info("New link <%s> becomes standby\n", l_ptr->name); 242 pr_debug("New link <%s> becomes standby\n", l_ptr->name);
243 goto exit; 243 goto exit;
244 } 244 }
245 tipc_link_dup_queue_xmit(active[0], l_ptr); 245 tipc_link_dup_queue_xmit(active[0], l_ptr);
@@ -247,9 +247,9 @@ void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
247 active[0] = l_ptr; 247 active[0] = l_ptr;
248 goto exit; 248 goto exit;
249 } 249 }
250 pr_info("Old link <%s> becomes standby\n", active[0]->name); 250 pr_debug("Old link <%s> becomes standby\n", active[0]->name);
251 if (active[1] != active[0]) 251 if (active[1] != active[0])
252 pr_info("Old link <%s> becomes standby\n", active[1]->name); 252 pr_debug("Old link <%s> becomes standby\n", active[1]->name);
253 active[0] = active[1] = l_ptr; 253 active[0] = active[1] = l_ptr;
254exit: 254exit:
255 /* Leave room for changeover header when returning 'mtu' to users: */ 255 /* Leave room for changeover header when returning 'mtu' to users: */
@@ -297,12 +297,12 @@ void tipc_node_link_down(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
297 n_ptr->link_id = l_ptr->peer_bearer_id << 16 | l_ptr->bearer_id; 297 n_ptr->link_id = l_ptr->peer_bearer_id << 16 | l_ptr->bearer_id;
298 298
299 if (!tipc_link_is_active(l_ptr)) { 299 if (!tipc_link_is_active(l_ptr)) {
300 pr_info("Lost standby link <%s> on network plane %c\n", 300 pr_debug("Lost standby link <%s> on network plane %c\n",
301 l_ptr->name, l_ptr->net_plane); 301 l_ptr->name, l_ptr->net_plane);
302 return; 302 return;
303 } 303 }
304 pr_info("Lost link <%s> on network plane %c\n", 304 pr_debug("Lost link <%s> on network plane %c\n",
305 l_ptr->name, l_ptr->net_plane); 305 l_ptr->name, l_ptr->net_plane);
306 306
307 active = &n_ptr->active_links[0]; 307 active = &n_ptr->active_links[0];
308 if (active[0] == l_ptr) 308 if (active[0] == l_ptr)
@@ -380,8 +380,8 @@ static void node_lost_contact(struct tipc_node *n_ptr)
380 char addr_string[16]; 380 char addr_string[16];
381 u32 i; 381 u32 i;
382 382
383 pr_info("Lost contact with %s\n", 383 pr_debug("Lost contact with %s\n",
384 tipc_addr_string_fill(addr_string, n_ptr->addr)); 384 tipc_addr_string_fill(addr_string, n_ptr->addr));
385 385
386 /* Flush broadcast link info associated with lost node */ 386 /* Flush broadcast link info associated with lost node */
387 if (n_ptr->bclink.recv_permitted) { 387 if (n_ptr->bclink.recv_permitted) {