| From 73c1a2dea4b209e6dbe081dbae0e947ee92a6430 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 13 Dec 2021 11:17:09 +0530 |
| Subject: net: bonding: debug: avoid printing debug logs when bond is not |
| notifying peers |
| |
| From: Suresh Kumar <surkumar@redhat.com> |
| |
| [ Upstream commit fee32de284ac277ba434a2d59f8ce46528ff3946 ] |
| |
| Currently "bond_should_notify_peers: slave ..." messages are printed whenever |
| "bond_should_notify_peers" function is called. |
| |
| +++ |
| Dec 12 12:33:26 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 |
| Dec 12 12:33:26 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 |
| Dec 12 12:33:26 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 |
| Dec 12 12:33:26 node1 kernel: bond0: (slave enp0s25): Received LACPDU on port 1 |
| Dec 12 12:33:26 node1 kernel: bond0: (slave enp0s25): Rx Machine: Port=1, Last State=6, Curr State=6 |
| Dec 12 12:33:26 node1 kernel: bond0: (slave enp0s25): partner sync=1 |
| Dec 12 12:33:26 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 |
| Dec 12 12:33:26 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 |
| Dec 12 12:33:26 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 |
| ... |
| Dec 12 12:33:30 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 |
| Dec 12 12:33:30 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 |
| Dec 12 12:33:30 node1 kernel: bond0: (slave enp4s3): Received LACPDU on port 2 |
| Dec 12 12:33:30 node1 kernel: bond0: (slave enp4s3): Rx Machine: Port=2, Last State=6, Curr State=6 |
| Dec 12 12:33:30 node1 kernel: bond0: (slave enp4s3): partner sync=1 |
| Dec 12 12:33:30 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 |
| Dec 12 12:33:30 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 |
| Dec 12 12:33:30 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 |
| +++ |
| |
| This is confusing and can also clutter up debug logs. |
| Print logs only when the peer notification happens. |
| |
| Signed-off-by: Suresh Kumar <suresh2514@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/bonding/bond_main.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c |
| index a7eaf80f500c0..ff50ccc7dceb1 100644 |
| --- a/drivers/net/bonding/bond_main.c |
| +++ b/drivers/net/bonding/bond_main.c |
| @@ -792,9 +792,6 @@ static bool bond_should_notify_peers(struct bonding *bond) |
| slave = rcu_dereference(bond->curr_active_slave); |
| rcu_read_unlock(); |
| |
| - netdev_dbg(bond->dev, "bond_should_notify_peers: slave %s\n", |
| - slave ? slave->dev->name : "NULL"); |
| - |
| if (!slave || !bond->send_peer_notif || |
| bond->send_peer_notif % |
| max(1, bond->params.peer_notif_delay) != 0 || |
| @@ -802,6 +799,9 @@ static bool bond_should_notify_peers(struct bonding *bond) |
| test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state)) |
| return false; |
| |
| + netdev_dbg(bond->dev, "bond_should_notify_peers: slave %s\n", |
| + slave ? slave->dev->name : "NULL"); |
| + |
| return true; |
| } |
| |
| -- |
| 2.34.1 |
| |
