Re: [PATCH net] bonding: show NS IPv6 targets in proc master info

[Jay Vosburgh <jay.vosburgh@canonical.com>]

Jonathan Toppins <jtoppins@redhat.com> wrote:

>On 5/27/22 02:44, Hangbin Liu wrote:
>> When adding bond new parameter ns_targets. I forgot to print this
>> in bond master proc info. After updating, the bond master info will looks
>                                                               look ---^
>> like:
>> ARP IP target/s (n.n.n.n form): 192.168.1.254
>> NS IPv6 target/s (XX::XX form): 2022::1, 2022::2
>> Fixes: 4e24be018eb9 ("bonding: add new parameter ns_targets")
>> Reported-by: Li Liang <liali@redhat.com>
>> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
>> ---
>>   drivers/net/bonding/bond_procfs.c | 13 +++++++++++++
>>   1 file changed, 13 insertions(+)
>> diff --git a/drivers/net/bonding/bond_procfs.c
>> b/drivers/net/bonding/bond_procfs.c
>> index cfe37be42be4..b6c012270e2e 100644
>> --- a/drivers/net/bonding/bond_procfs.c
>> +++ b/drivers/net/bonding/bond_procfs.c
>> @@ -129,6 +129,19 @@ static void bond_info_show_master(struct seq_file *seq)
>>   			printed = 1;
>>   		}
>>   		seq_printf(seq, "\n");
>
>Does this need to be guarded by "#if IS_ENABLED(CONFIG_IPV6)"?

	On looking at it, the definition of ns_targets in struct
bond_params isn't gated by CONFIG_IPV6, either (and is 256 bytes for
just ns_targets).

	I suspect this will all compile even if CONFIG_IPV6 isn't
enabled, since functions like ipv6_addr_any are defined regardless of
the CONFIG_IPV6 setting, but it's dead code that shouldn't be built if
CONFIG_IPV6 isn't set.

	The options code for ns_targets depends on CONFIG_IPV6, so
making this conditional as well would be consistent.

	-J

>> +
>> +		printed = 0;
>> +		seq_printf(seq, "NS IPv6 target/s (xx::xx form):");
>> +
>> +		for (i = 0; (i < BOND_MAX_NS_TARGETS); i++) {
>> +			if (ipv6_addr_any(&bond->params.ns_targets[i]))
>> +				break;
>> +			if (printed)
>> +				seq_printf(seq, ",");
>> +			seq_printf(seq, " %pI6c", &bond->params.ns_targets[i]);
>> +			printed = 1;
>> +		}
>> +		seq_printf(seq, "\n");
>>   	}
>>     	if (BOND_MODE(bond) == BOND_MODE_8023AD) {
>

---
	-Jay Vosburgh, jay.vosburgh@canonical.com