| Message ID | 20210720092426.1998666-1-dqfext@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: dsa: mv88e6xxx: check for address type in port_db_load_purge | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 8 of 8 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Tue, Jul 20, 2021 at 05:24:26PM +0800, DENG Qingfang wrote: > The same state value of an ATU entry can mean different states, > depending on the entry's address type. > Check for its address type instead of state, to determine if its > portvec should be overridden. Please could you expand this description. It is not obvious to me this change correct. > > Fixes: f72f2fb8fb6b ("net: dsa: mv88e6xxx: override existent unicast portvec in port_fdb_add") > Signed-off-by: DENG Qingfang <dqfext@gmail.com> > --- > drivers/net/dsa/mv88e6xxx/chip.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c > index beb41572d04e..dd4d7fa0da8e 100644 > --- a/drivers/net/dsa/mv88e6xxx/chip.c > +++ b/drivers/net/dsa/mv88e6xxx/chip.c > @@ -1741,7 +1741,7 @@ static int mv88e6xxx_port_db_load_purge(struct mv88e6xxx_chip *chip, int port, > if (!entry.portvec) > entry.state = 0; > } else { > - if (state == MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC) > + if (is_unicast_ether_addr(addr)) > entry.portvec = BIT(port); > else > entry.portvec |= BIT(port); I agree that MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC should only be used with an address which is know to be unicast. If the address is multicast, it means it should be considered as a management frame, and given priority override. But what exactly are we interested in here? The old code looked like it wanted to match on static unicast entries. Your change will make it match on static and dynamic unicast? Do we want dynamic as well? Why is the fix not this? > - if (state == MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC) > + if (is_unicast_ether_addr(addr) && state == MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC) which fixes the problem you describe in the commit message. Thanks Andrew
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index beb41572d04e..dd4d7fa0da8e 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -1741,7 +1741,7 @@ static int mv88e6xxx_port_db_load_purge(struct mv88e6xxx_chip *chip, int port, if (!entry.portvec) entry.state = 0; } else { - if (state == MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC) + if (is_unicast_ether_addr(addr)) entry.portvec = BIT(port); else entry.portvec |= BIT(port);
The same state value of an ATU entry can mean different states, depending on the entry's address type. Check for its address type instead of state, to determine if its portvec should be overridden. Fixes: f72f2fb8fb6b ("net: dsa: mv88e6xxx: override existent unicast portvec in port_fdb_add") Signed-off-by: DENG Qingfang <dqfext@gmail.com> --- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)