niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

nfp: flower: fixup ipv6/ipv4 route lookup for neigh events

Browse source 
When a callback is received to invalidate a neighbour entry
there is no need to try and populate any other flow information.
Only the flowX->daddr information is needed as lookup key to delete
an entry from the NFP neighbour table. Fix this by only doing the
lookup if the callback is for a new entry.

As part of this cleanup remove the setting of flow6.flowi6_proto, as
this is not needed either, it looks to be a possible leftover from a
previous implementation.

Signed-off-by: Louis Peens <louis.peens@corigine.com>
Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Louis Peens 2022-05-05 14:43:43 +09:00 • committed by David S. Miller
parent 38fc158e17
commit 9d5447ed44
1 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
View file

@ -494,7 +494,7 @@ nfp_tun_neigh_event_handler(struct notifier_block *nb, unsigned long event,
struct flowi6 flow6 = {}; struct flowi6 flow6 = {};
struct neighbour *n; struct neighbour *n;
struct nfp_app *app; struct nfp_app *app;
struct rtable *rt; bool neigh_invalid;
bool ipv6 = false; bool ipv6 = false;
int err; int err;
@ -513,6 +513,8 @@ nfp_tun_neigh_event_handler(struct notifier_block *nb, unsigned long event,
if (n->tbl->family == AF_INET6) if (n->tbl->family == AF_INET6)
ipv6 = true; ipv6 = true;
neigh_invalid = !(n->nud_state & NUD_VALID) || n->dead;
if (ipv6) if (ipv6)
flow6.daddr = *(struct in6_addr *)n->primary_key; flow6.daddr = *(struct in6_addr *)n->primary_key;
else else
@ -533,29 +535,41 @@ nfp_tun_neigh_event_handler(struct notifier_block *nb, unsigned long event,
#if IS_ENABLED(CONFIG_INET) #if IS_ENABLED(CONFIG_INET)
if (ipv6) { if (ipv6) {
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
if (!neigh_invalid) {
struct dst_entry *dst; struct dst_entry *dst;
/* Use ipv6_dst_lookup_flow to populate flow6->saddr
dst = ipv6_stub->ipv6_dst_lookup_flow(dev_net(n->dev), NULL, * and other fields. This information is only needed
* for new entries, lookup can be skipped when an entry
* gets invalidated - as only the daddr is needed for
* deleting.
*/
dst = ip6_dst_lookup_flow(dev_net(n->dev), NULL,
&flow6, NULL); &flow6, NULL);
if (IS_ERR(dst)) if (IS_ERR(dst))
return NOTIFY_DONE; return NOTIFY_DONE;
dst_release(dst); dst_release(dst);
flow6.flowi6_proto = IPPROTO_UDP; }
nfp_tun_write_neigh_v6(n->dev, app, &flow6, n, GFP_ATOMIC); nfp_tun_write_neigh_v6(n->dev, app, &flow6, n, GFP_ATOMIC);
#else #else
return NOTIFY_DONE; return NOTIFY_DONE;
#endif /* CONFIG_IPV6 */ #endif /* CONFIG_IPV6 */
} else { } else {
/* Do a route lookup to populate flow data. */ if (!neigh_invalid) {
struct rtable *rt;
/* Use ip_route_output_key to populate flow4->saddr and
* other fields. This information is only needed for
* new entries, lookup can be skipped when an entry
* gets invalidated - as only the daddr is needed for
* deleting.
*/
rt = ip_route_output_key(dev_net(n->dev), &flow4); rt = ip_route_output_key(dev_net(n->dev), &flow4);
err = PTR_ERR_OR_ZERO(rt); err = PTR_ERR_OR_ZERO(rt);
if (err) if (err)
return NOTIFY_DONE; return NOTIFY_DONE;
ip_rt_put(rt); ip_rt_put(rt);
}
flow4.flowi4_proto = IPPROTO_UDP;
nfp_tun_write_neigh_v4(n->dev, app, &flow4, n, GFP_ATOMIC); nfp_tun_write_neigh_v4(n->dev, app, &flow4, n, GFP_ATOMIC);
} }
#else #else