diff mbox

[net-next] bridge: add address and vlan to fdb warning messages

Message ID 1476221632-18488-1-git-send-email-roopa@cumulusnetworks.com
State Superseded, archived
Delegated to: David Miller
Headers show

Commit Message

Roopa Prabhu Oct. 11, 2016, 9:33 p.m. UTC
From: Roopa Prabhu <roopa@cumulusnetworks.com>

This patch adds vlan and address to warning messages printed
in the bridge fdb code for debuggability.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
---
 net/bridge/br_fdb.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Comments

Stephen Hemminger Oct. 11, 2016, 10:17 p.m. UTC | #1
On Tue, 11 Oct 2016 14:33:51 -0700
Roopa Prabhu <roopa@cumulusnetworks.com> wrote:

> From: Roopa Prabhu <roopa@cumulusnetworks.com>
> 
> This patch adds vlan and address to warning messages printed
> in the bridge fdb code for debuggability.
> 
> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
> ---
>  net/bridge/br_fdb.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
> index 6b43c8c..1257a88 100644
> --- a/net/bridge/br_fdb.c
> +++ b/net/bridge/br_fdb.c
> @@ -536,8 +536,8 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
>  		if (fdb->is_local)
>  			return 0;
>  		br_warn(br, "adding interface %s with same address "
> -		       "as a received packet\n",
> -		       source ? source->dev->name : br->dev->name);
> +		       "as a received packet (addr:%pM, vlan:%d)\n",
> +		       source ? source->dev->name : br->dev->name, addr, vid);
>  		fdb_delete(br, fdb);
>  	}
>  
> @@ -583,9 +583,10 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
>  		/* attempt to update an entry for a local interface */
>  		if (unlikely(fdb->is_local)) {
>  			if (net_ratelimit())
> -				br_warn(br, "received packet on %s with "
> -					"own address as source address\n",
> -					source->dev->name);
> +				br_warn(br, "received packet on %s with own "
> +					"address as source address "
> +					"(addr:%pM, vlan:%d)\n",
> +					source->dev->name, addr, vid);
>  		} else {

Isn't vlan unsigned here so print with %u
Also it would be good to make string format on one line to allow for easy search of source.
				br_warn(br,
					"received packet on %s with own address %pM vlan %u",
					source->dev->name, addr, vid);
Roopa Prabhu Oct. 11, 2016, 10:30 p.m. UTC | #2
On 10/11/16, 3:17 PM, Stephen Hemminger wrote:
> On Tue, 11 Oct 2016 14:33:51 -0700
> Roopa Prabhu <roopa@cumulusnetworks.com> wrote:
>
>> From: Roopa Prabhu <roopa@cumulusnetworks.com>
>>
>> This patch adds vlan and address to warning messages printed
>> in the bridge fdb code for debuggability.
>>
>> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
>> ---
>>  net/bridge/br_fdb.c | 11 ++++++-----
>>  1 file changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
>> index 6b43c8c..1257a88 100644
>> --- a/net/bridge/br_fdb.c
>> +++ b/net/bridge/br_fdb.c
>> @@ -536,8 +536,8 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
>>  		if (fdb->is_local)
>>  			return 0;
>>  		br_warn(br, "adding interface %s with same address "
>> -		       "as a received packet\n",
>> -		       source ? source->dev->name : br->dev->name);
>> +		       "as a received packet (addr:%pM, vlan:%d)\n",
>> +		       source ? source->dev->name : br->dev->name, addr, vid);
>>  		fdb_delete(br, fdb);
>>  	}
>>  
>> @@ -583,9 +583,10 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
>>  		/* attempt to update an entry for a local interface */
>>  		if (unlikely(fdb->is_local)) {
>>  			if (net_ratelimit())
>> -				br_warn(br, "received packet on %s with "
>> -					"own address as source address\n",
>> -					source->dev->name);
>> +				br_warn(br, "received packet on %s with own "
>> +					"address as source address "
>> +					"(addr:%pM, vlan:%d)\n",
>> +					source->dev->name, addr, vid);
>>  		} else {
> Isn't vlan unsigned here so print with %u
you are right. will fix it
> Also it would be good to make string format on one line to allow for easy search of source.
> 				br_warn(br,
> 					"received packet on %s with own address %pM vlan %u",
> 					source->dev->name, addr, vid);

ack, was debating abt this.

v2 coming..thanks
diff mbox

Patch

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 6b43c8c..1257a88 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -536,8 +536,8 @@  static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
 		if (fdb->is_local)
 			return 0;
 		br_warn(br, "adding interface %s with same address "
-		       "as a received packet\n",
-		       source ? source->dev->name : br->dev->name);
+		       "as a received packet (addr:%pM, vlan:%d)\n",
+		       source ? source->dev->name : br->dev->name, addr, vid);
 		fdb_delete(br, fdb);
 	}
 
@@ -583,9 +583,10 @@  void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
 		/* attempt to update an entry for a local interface */
 		if (unlikely(fdb->is_local)) {
 			if (net_ratelimit())
-				br_warn(br, "received packet on %s with "
-					"own address as source address\n",
-					source->dev->name);
+				br_warn(br, "received packet on %s with own "
+					"address as source address "
+					"(addr:%pM, vlan:%d)\n",
+					source->dev->name, addr, vid);
 		} else {
 			/* fastpath: update of existing entry */
 			if (unlikely(source != fdb->dst)) {