net: xilinx: axienet: Multicast fixes and improvements
v3 cover net: xilinx: axienet: Multicast fixes and improvements
This series has a few small patches improving the handling of multicast addresses. In particular, it makes the driver a whole lot less spammy, and adjusts things so we aren't in promiscuous mode when we have more than four multicast addresses (a common occurance on modern systems).
As the hardware has a 4-entry CAM, the ideal method would be to "pack" multiple addresses into one CAM entry. Something like:
entry.address = address[0] | address[1];
entry.mask = ~(address[0] ^ address[1]);
Which would make the entry match both addresses (along with some others that would need to be filtered in software).
Mapping addresses to entries in an efficient way is a bit tricky. If anyone knows of an in-tree example of something like this, I'd be glad to hear about it.
Changes in v3:
- Rebase onto net-next/main
Changes in v2:
- Split off IFF_PROMISC change from printing changes
Sean Anderson (5):
net: xilinx: axienet: Always disable promiscuous mode
net: xilinx: axienet: Fix dangling multicast addresses
net: xilinx: axienet: Don't print if we go into promiscuous mode
net: xilinx: axienet: Don't set IFF_PROMISC in ndev->flags
net: xilinx: axienet: Support IFF_ALLMULTI
drivers/net/ethernet/xilinx/xilinx_axienet.h | 3 ++ .../net/ethernet/xilinx/xilinx_axienet_main.c | 52 +++++++++---------- 2 files changed, 29 insertions(+), 26 deletions(-)
Signature · 1 line
2.35.1.1320.gc452695387.dirty
PATCH v3 1/5 net: xilinx: axienet: Always disable promiscuous mode
If promiscuous mode is disabled when there are fewer than four multicast addresses, then it will not be reflected in the hardware. Fix this by always clearing the promiscuous mode flag even when we program multicast addresses.
---
(no changes since v1)
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +4 -0
@@ -451,6 +451,10 @@ static void axienet_set_multicast_list(struct net_device *ndev) }else if (!netdev_mc_empty (ndev)) {struct netdev_hw_addr *ha; + reg =axienet_ior (lp,XAE_FMI_OFFSET ); + reg &= ~XAE_FMI_PM_MASK ; +axienet_iow (lp,XAE_FMI_OFFSET , reg); + i =0 ;netdev_for_each_mc_addr (ha, ndev) {if (i >=XAE_MULTICAST_CAM_TABLE_NUM )
Signature · 1 line
2.35.1.1320.gc452695387.dirty
PATCH v3 2/5 net: xilinx: axienet: Fix dangling multicast addresses
In reply to Sean AndersonIf a multicast address is removed but there are still some multicast addresses, that address would remain programmed into the frame filter. Fix this by explicitly setting the enable bit for each filter.
---
(no changes since v1)
drivers/net/ethernet/xilinx/xilinx_axienet.h | 1 + .../net/ethernet/xilinx/xilinx_axienet_main.c | 21 ++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-)
drivers/net/ethernet/xilinx/xilinx_axienet.h +1 -0
@@ -172,6 +172,7 @@#define XAE_UAW0_OFFSET 0x00000700/* Unicast address word 0 */ #define XAE_UAW1_OFFSET 0x00000704/* Unicast address word 1 */ #define XAE_FMI_OFFSET 0x00000708/* Frame Filter Control */ +#define XAE_FFE_OFFSET 0x0000070C/* Frame Filter Enable */ #define XAE_AF0_OFFSET 0x00000710/* Address Filter 0 */ #define XAE_AF1_OFFSET 0x00000714/* Address Filter 1 */
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +9 -12
@@ -433,7 +433,7 @@ static int netdev_set_mac_address(struct net_device *ndev, void *p)*/ static void axienet_set_multicast_list (struct net_device *ndev) { -int i; +int i =0 ;u32 reg, af0reg, af1reg;struct axienet_local *lp =netdev_priv (ndev);
@@ -455,7 +455,6 @@ static void axienet_set_multicast_list(struct net_device *ndev) reg &= ~XAE_FMI_PM_MASK ;axienet_iow (lp,XAE_FMI_OFFSET , reg); - i =0 ;netdev_for_each_mc_addr (ha, ndev) {if (i >=XAE_MULTICAST_CAM_TABLE_NUM )break ;
@@ -474,6 +473,7 @@ static void axienet_set_multicast_list(struct net_device *ndev)axienet_iow (lp,XAE_FMI_OFFSET , reg);axienet_iow (lp,XAE_AF0_OFFSET , af0reg);axienet_iow (lp,XAE_AF1_OFFSET , af1reg); +axienet_iow (lp,XAE_FFE_OFFSET ,1 ); i++; } }else {
@@ -481,18 +481,15 @@ static void axienet_set_multicast_list(struct net_device *ndev) reg &= ~XAE_FMI_PM_MASK ;axienet_iow (lp,XAE_FMI_OFFSET , reg); - -for (i =0 ; i <XAE_MULTICAST_CAM_TABLE_NUM ; i++) { - reg =axienet_ior (lp,XAE_FMI_OFFSET ) &0xFFFFFF00 ; - reg |= i; - -axienet_iow (lp,XAE_FMI_OFFSET , reg); -axienet_iow (lp,XAE_AF0_OFFSET ,0 ); -axienet_iow (lp,XAE_AF1_OFFSET ,0 ); - } -dev_info (&ndev->dev,"Promiscuous mode disabled.\n" ); } + +for (; i <XAE_MULTICAST_CAM_TABLE_NUM ; i++) { + reg =axienet_ior (lp,XAE_FMI_OFFSET ) &0xFFFFFF00 ; + reg |= i; +axienet_iow (lp,XAE_FMI_OFFSET , reg); +axienet_iow (lp,XAE_FFE_OFFSET ,0 ); + } }/**
Signature · 1 line
2.35.1.1320.gc452695387.dirty
PATCH v3 3/5 net: xilinx: axienet: Don't print if we go into promiscuous mode
In reply to Sean AndersonA message about being in promiscuous mode is printed every time each additional multicast address beyond four is added. Suppress this message like is done in other drivers.
---
(no changes since v2)
Changes in v2:
- Split off IFF_PROMISC change
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +0 -2
@@ -447,7 +447,6 @@ static void axienet_set_multicast_list(struct net_device *ndev) reg =axienet_ior (lp,XAE_FMI_OFFSET ); reg |=XAE_FMI_PM_MASK ;axienet_iow (lp,XAE_FMI_OFFSET , reg); -dev_info (&ndev->dev,"Promiscuous mode enabled.\n" ); }else if (!netdev_mc_empty (ndev)) {struct netdev_hw_addr *ha;
@@ -481,7 +480,6 @@ static void axienet_set_multicast_list(struct net_device *ndev) reg &= ~XAE_FMI_PM_MASK ;axienet_iow (lp,XAE_FMI_OFFSET , reg); -dev_info (&ndev->dev,"Promiscuous mode disabled.\n" ); }for (; i <XAE_MULTICAST_CAM_TABLE_NUM ; i++) {
Signature · 1 line
2.35.1.1320.gc452695387.dirty
PATCH v3 4/5 net: xilinx: axienet: Don't set IFF_PROMISC in ndev->flags
In reply to Sean AndersonContrary to the comment, we don't have to inform the net subsystem.
---
(no changes since v2)
Changes in v2:
- Split off from printing changes
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +0 -5
@@ -439,11 +439,6 @@ static void axienet_set_multicast_list(struct net_device *ndev)if (ndev->flags & (IFF_ALLMULTI |IFF_PROMISC ) ||netdev_mc_count (ndev) >XAE_MULTICAST_CAM_TABLE_NUM ) { -/* We must make the kernel realize we had to move into -* promiscuous mode. If it was a promiscuous mode request -* the flag is already set. If not we set it. -*/ - ndev->flags |=IFF_PROMISC ; reg =axienet_ior (lp,XAE_FMI_OFFSET ); reg |=XAE_FMI_PM_MASK ;axienet_iow (lp,XAE_FMI_OFFSET , reg);
Signature · 1 line
2.35.1.1320.gc452695387.dirty
PATCH v3 5/5 net: xilinx: axienet: Support IFF_ALLMULTI
In reply to Sean AndersonAdd support for IFF_ALLMULTI by configuring a single filter to match the multicast address bit. This allows us to keep promiscuous mode disabled, even when we have more than four multicast addresses. An even better solution would be to "pack" addresses into the available CAM registers, but that can wait for a future series.
---
(no changes since v1)
drivers/net/ethernet/xilinx/xilinx_axienet.h | 2 ++ .../net/ethernet/xilinx/xilinx_axienet_main.c | 34 +++++++++++-------- 2 files changed, 22 insertions(+), 14 deletions(-)
drivers/net/ethernet/xilinx/xilinx_axienet.h +2 -0
@@ -175,6 +175,8 @@#define XAE_FFE_OFFSET 0x0000070C/* Frame Filter Enable */ #define XAE_AF0_OFFSET 0x00000710/* Address Filter 0 */ #define XAE_AF1_OFFSET 0x00000714/* Address Filter 1 */ +#define XAE_AM0_OFFSET 0x00000750/* Frame Filter Mask Value Bytes 3-0 */ +#define XAE_AM1_OFFSET 0x00000754/* Frame Filter Mask Value Bytes 7-4 */ #define XAE_TX_VLAN_DATA_OFFSET 0x00004000/* TX VLAN data table address */ #define XAE_RX_VLAN_DATA_OFFSET 0x00008000/* RX VLAN data table address */
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +20 -14
@@ -437,18 +437,27 @@ static void axienet_set_multicast_list(struct net_device *ndev)u32 reg, af0reg, af1reg;struct axienet_local *lp =netdev_priv (ndev); -if (ndev->flags & (IFF_ALLMULTI |IFF_PROMISC ) || -netdev_mc_count (ndev) >XAE_MULTICAST_CAM_TABLE_NUM ) { - reg =axienet_ior (lp,XAE_FMI_OFFSET ); + reg =axienet_ior (lp,XAE_FMI_OFFSET ); + reg &= ~XAE_FMI_PM_MASK ; +if (ndev->flags &IFF_PROMISC ) reg |=XAE_FMI_PM_MASK ; +else + reg &= ~XAE_FMI_PM_MASK ; +axienet_iow (lp,XAE_FMI_OFFSET , reg); + +if (ndev->flags &IFF_ALLMULTI || +netdev_mc_count (ndev) >XAE_MULTICAST_CAM_TABLE_NUM ) { + reg &=0xFFFFFF00 ;axienet_iow (lp,XAE_FMI_OFFSET , reg); +axienet_iow (lp,XAE_AF0_OFFSET ,1 );/* Multicast bit */ +axienet_iow (lp,XAE_AF1_OFFSET ,0 ); +axienet_iow (lp,XAE_AM0_OFFSET ,1 );/* ditto */ +axienet_iow (lp,XAE_AM1_OFFSET ,0 ); +axienet_iow (lp,XAE_FFE_OFFSET ,1 ); + i =1 ; }else if (!netdev_mc_empty (ndev)) {struct netdev_hw_addr *ha; - reg =axienet_ior (lp,XAE_FMI_OFFSET ); - reg &= ~XAE_FMI_PM_MASK ; -axienet_iow (lp,XAE_FMI_OFFSET , reg); -netdev_for_each_mc_addr (ha, ndev) {if (i >=XAE_MULTICAST_CAM_TABLE_NUM )break ;
@@ -461,24 +470,21 @@ static void axienet_set_multicast_list(struct net_device *ndev) af1reg = (ha->addr[4 ]); af1reg |= (ha->addr[5 ] <<8 ); - reg =axienet_ior (lp,XAE_FMI_OFFSET ) &0xFFFFFF00 ; + reg &=0xFFFFFF00 ; reg |= i;axienet_iow (lp,XAE_FMI_OFFSET , reg);axienet_iow (lp,XAE_AF0_OFFSET , af0reg);axienet_iow (lp,XAE_AF1_OFFSET , af1reg); +axienet_iow (lp,XAE_AM0_OFFSET ,0xffffffff ); +axienet_iow (lp,XAE_AM1_OFFSET ,0x0000ffff );axienet_iow (lp,XAE_FFE_OFFSET ,1 ); i++; } - }else { - reg =axienet_ior (lp,XAE_FMI_OFFSET ); - reg &= ~XAE_FMI_PM_MASK ; - -axienet_iow (lp,XAE_FMI_OFFSET , reg); }for (; i <XAE_MULTICAST_CAM_TABLE_NUM ; i++) { - reg =axienet_ior (lp,XAE_FMI_OFFSET ) &0xFFFFFF00 ; + reg &=0xFFFFFF00 ; reg |= i;axienet_iow (lp,XAE_FMI_OFFSET , reg);axienet_iow (lp,XAE_FFE_OFFSET ,0 );
Signature · 1 line
2.35.1.1320.gc452695387.dirty
This series was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 22 Aug 2024 11:40:54 -0400 you wrote:
This series has a few small patches improving the handling of multicast addresses. In particular, it makes the driver a whole lot less spammy, and adjusts things so we aren't in promiscuous mode when we have more than four multicast addresses (a common occurance on modern systems).
As the hardware has a 4-entry CAM, the ideal method would be to "pack" multiple addresses into one CAM entry. Something like:
[...]
Here is the summary with links:
- [net-next,v3,1/5] net: xilinx: axienet: Always disable promiscuous mode
https://git.kernel.org/netdev/net/c/4ae738dfef2c - [net-next,v3,2/5] net: xilinx: axienet: Fix dangling multicast addresses https://git.kernel.org/netdev/net/c/797a68c9de0f
- [net-next,v3,3/5] net: xilinx: axienet: Don't print if we go into promiscuous mode (no matching commit)
- [net-next,v3,4/5] net: xilinx: axienet: Don't set IFF_PROMISC in ndev->flags (no matching commit)
- [net-next,v3,5/5] net: xilinx: axienet: Support IFF_ALLMULTI
(no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 22 Aug 2024 11:40:54 -0400 you wrote:
This series has a few small patches improving the handling of multicast addresses. In particular, it makes the driver a whole lot less spammy, and adjusts things so we aren't in promiscuous mode when we have more than four multicast addresses (a common occurance on modern systems).
As the hardware has a 4-entry CAM, the ideal method would be to "pack" multiple addresses into one CAM entry. Something like:
[...]
Here is the summary with links:
- [net-next,v3,1/5] net: xilinx: axienet: Always disable promiscuous mode (no matching commit)
- [net-next,v3,2/5] net: xilinx: axienet: Fix dangling multicast addresses (no matching commit)
- [net-next,v3,3/5] net: xilinx: axienet: Don't print if we go into promiscuous mode
https://git.kernel.org/netdev/net-next/c/cd039e6787ff - [net-next,v3,4/5] net: xilinx: axienet: Don't set IFF_PROMISC in ndev->flags https://git.kernel.org/netdev/net-next/c/7a826fb3e4c6 - [net-next,v3,5/5] net: xilinx: axienet: Support IFF_ALLMULTI https://git.kernel.org/netdev/net-next/c/749e67d5b297
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html