d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert to if_foreach_llmaddr() KPI.

Browse Source 
Reviewed by:	hselasky
This commit is contained in:
Gleb Smirnoff 2019-10-14 20:23:16 +00:00
parent f95dbf26d3
commit 20b26072b8
2 changed files with 72 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c
View File

@ -617,31 +617,30 @@ static void mlx4_en_clear_uclist(struct net_device *dev)
} }
} }
static void mlx4_en_cache_uclist(struct net_device *dev) static u_int mlx4_copy_addr(void *arg, struct sockaddr_dl *sdl, u_int cnt)
{ {
struct mlx4_en_priv *priv = netdev_priv(dev); struct mlx4_en_priv *priv = arg;
struct mlx4_en_addr_list *tmp; struct mlx4_en_addr_list *tmp;
struct ifaddr *ifa;
mlx4_en_clear_uclist(dev); if (sdl->sdl_alen != ETHER_ADDR_LEN) /* XXXGL: can that happen? */
return (0);
if_addr_rlock(dev);
CK_STAILQ_FOREACH(ifa, &dev->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_LINK)
continue;
if (((struct sockaddr_dl *)ifa->ifa_addr)->sdl_alen !=
ETHER_ADDR_LEN)
continue;
tmp = kzalloc(sizeof(struct mlx4_en_addr_list), GFP_ATOMIC); tmp = kzalloc(sizeof(struct mlx4_en_addr_list), GFP_ATOMIC);
if (tmp == NULL) { if (tmp == NULL) {
en_err(priv, "Failed to allocate address list\n"); en_err(priv, "Failed to allocate address list\n");
break; return (0);
} }
memcpy(tmp->addr, memcpy(tmp->addr, LLADDR(sdl), ETH_ALEN);
LLADDR((struct sockaddr_dl *)ifa->ifa_addr), ETH_ALEN);
list_add_tail(&tmp->list, &priv->uc_list); list_add_tail(&tmp->list, &priv->uc_list);
}
if_addr_runlock(dev); return (1);
}
static void mlx4_en_cache_uclist(struct net_device *dev)
{
struct mlx4_en_priv *priv = netdev_priv(dev);
mlx4_en_clear_uclist(dev);
if_foreach_lladdr(dev, mlx4_copy_addr, priv);
} }
static void mlx4_en_clear_mclist(struct net_device *dev) static void mlx4_en_clear_mclist(struct net_device *dev)
@ -655,31 +654,29 @@ static void mlx4_en_clear_mclist(struct net_device *dev)
} }
} }
static void mlx4_en_cache_mclist(struct net_device *dev) static u_int mlx4_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int count)
{ {
struct mlx4_en_priv *priv = netdev_priv(dev); struct mlx4_en_priv *priv = arg;
struct mlx4_en_addr_list *tmp; struct mlx4_en_addr_list *tmp;
struct ifmultiaddr *ifma;
mlx4_en_clear_mclist(dev); if (sdl->sdl_alen != ETHER_ADDR_LEN) /* XXXGL: can that happen? */
return (0);
if_maddr_rlock(dev);
CK_STAILQ_FOREACH(ifma, &dev->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
if (((struct sockaddr_dl *)ifma->ifma_addr)->sdl_alen !=
ETHER_ADDR_LEN)
continue;
tmp = kzalloc(sizeof(struct mlx4_en_addr_list), GFP_ATOMIC); tmp = kzalloc(sizeof(struct mlx4_en_addr_list), GFP_ATOMIC);
if (tmp == NULL) { if (tmp == NULL) {
en_err(priv, "Failed to allocate address list\n"); en_err(priv, "Failed to allocate address list\n");
break; return (0);
} }
memcpy(tmp->addr, memcpy(tmp->addr, LLADDR(sdl), ETH_ALEN);
LLADDR((struct sockaddr_dl *)ifma->ifma_addr), ETH_ALEN);
list_add_tail(&tmp->list, &priv->mc_list); list_add_tail(&tmp->list, &priv->mc_list);
} return (1);
if_maddr_runlock(dev); }
static void mlx4_en_cache_mclist(struct net_device *dev)
{
struct mlx4_en_priv *priv = netdev_priv(dev);
mlx4_en_clear_mclist(dev);
if_foreach_llmaddr(dev, mlx4_copy_maddr, priv);
} }
static void update_addr_list_flags(struct mlx4_en_priv *priv, static void update_addr_list_flags(struct mlx4_en_priv *priv,

85
sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c
View File

@ -787,43 +787,47 @@ mlx5e_remove_hn(struct mlx5e_eth_addr_hash_head *fh)
return (hn); return (hn);
} }
struct mlx5e_copy_addr_ctx {
struct mlx5e_eth_addr_hash_head *free;
struct mlx5e_eth_addr_hash_head *fill;
bool success;
};
static u_int
mlx5e_copy_addr(void *arg, struct sockaddr_dl *sdl, u_int cnt)
{
struct mlx5e_copy_addr_ctx *ctx = arg;
struct mlx5e_eth_addr_hash_node *hn;
hn = mlx5e_move_hn(ctx->free, ctx->fill);
if (hn == NULL) {
ctx->success = false;
return (0);
}
ether_addr_copy(hn->ai.addr, LLADDR(sdl));
return (1);
}
static void static void
mlx5e_sync_ifp_addr(struct mlx5e_priv *priv) mlx5e_sync_ifp_addr(struct mlx5e_priv *priv)
{ {
struct mlx5e_copy_addr_ctx ctx;
struct mlx5e_eth_addr_hash_head head_free; struct mlx5e_eth_addr_hash_head head_free;
struct mlx5e_eth_addr_hash_head head_uc; struct mlx5e_eth_addr_hash_head head_uc;
struct mlx5e_eth_addr_hash_head head_mc; struct mlx5e_eth_addr_hash_head head_mc;
struct mlx5e_eth_addr_hash_node *hn; struct mlx5e_eth_addr_hash_node *hn;
struct ifnet *ifp = priv->ifp; struct ifnet *ifp = priv->ifp;
struct ifaddr *ifa;
struct ifmultiaddr *ifma;
bool success = false;
size_t x; size_t x;
size_t num; size_t num;
PRIV_ASSERT_LOCKED(priv); PRIV_ASSERT_LOCKED(priv);
retry:
LIST_INIT(&head_free); LIST_INIT(&head_free);
LIST_INIT(&head_uc); LIST_INIT(&head_uc);
LIST_INIT(&head_mc); LIST_INIT(&head_mc);
retry: num = 1 + if_lladdr_count(ifp) + if_llmaddr_count(ifp);
num = 1;
if_addr_rlock(ifp);
CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_LINK)
continue;
num++;
}
if_addr_runlock(ifp);
if_maddr_rlock(ifp);
CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
num++;
}
if_maddr_runlock(ifp);
/* allocate place holders */ /* allocate place holders */
for (x = 0; x != num; x++) { for (x = 0; x != num; x++) {
@ -834,38 +838,21 @@ mlx5e_sync_ifp_addr(struct mlx5e_priv *priv)
} }
hn = mlx5e_move_hn(&head_free, &head_uc); hn = mlx5e_move_hn(&head_free, &head_uc);
if (hn == NULL) MPASS(hn != NULL);
goto cleanup;
ether_addr_copy(hn->ai.addr, ether_addr_copy(hn->ai.addr,
LLADDR((struct sockaddr_dl *)(ifp->if_addr->ifa_addr))); LLADDR((struct sockaddr_dl *)(ifp->if_addr->ifa_addr)));
if_addr_rlock(ifp); ctx.free = &head_free;
CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { ctx.fill = &head_uc;
if (ifa->ifa_addr->sa_family != AF_LINK) ctx.success = true;
continue; if_foreach_lladdr(ifp, mlx5e_copy_addr, &ctx);
hn = mlx5e_move_hn(&head_free, &head_uc); if (ctx.success == false)
if (hn == NULL)
break;
ether_addr_copy(hn->ai.addr,
LLADDR((struct sockaddr_dl *)ifa->ifa_addr));
}
if_addr_runlock(ifp);
if (ifa != NULL)
goto cleanup; goto cleanup;
if_maddr_rlock(ifp); ctx.fill = &head_mc;
CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if_foreach_llmaddr(ifp, mlx5e_copy_addr, &ctx);
if (ifma->ifma_addr->sa_family != AF_LINK) if (ctx.success == false)
continue;
hn = mlx5e_move_hn(&head_free, &head_mc);
if (hn == NULL)
break;
ether_addr_copy(hn->ai.addr,
LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
}
if_maddr_runlock(ifp);
if (ifma != NULL)
goto cleanup; goto cleanup;
/* insert L2 unicast addresses into hash list */ /* insert L2 unicast addresses into hash list */
@ -884,8 +871,6 @@ mlx5e_sync_ifp_addr(struct mlx5e_priv *priv)
continue; continue;
} }
success = true;
cleanup: cleanup:
while ((hn = mlx5e_remove_hn(&head_uc)) != NULL) while ((hn = mlx5e_remove_hn(&head_uc)) != NULL)
free(hn, M_MLX5EN); free(hn, M_MLX5EN);
@ -894,7 +879,7 @@ mlx5e_sync_ifp_addr(struct mlx5e_priv *priv)
while ((hn = mlx5e_remove_hn(&head_free)) != NULL) while ((hn = mlx5e_remove_hn(&head_free)) != NULL)
free(hn, M_MLX5EN); free(hn, M_MLX5EN);
if (success == false) if (ctx.success == false)
goto retry; goto retry;
} }