net, neigh: introduce interval_probe_time for periodic probe
Subsystems (3)
PATCH v2 1/1 net, neigh: introduce interval_probe_time for periodic probe
commit 7482e3841d52 ("net, neigh: Add NTF_MANAGED flag for managed neighbor entries") neighbor entries which with NTF_EXT_MANAGED flags will periodically call neigh_event_send() for performing the resolution. and the interval was set to DELAY_PROBE_TIME
DELAY_PROBE_TIME was configured as the first probe time delay, and it makes sense to set it to 0.
when DELAY_PROBE_TIME is 0, the queue_delayed_work of neighbor entries with NTF_EXT_MANAGED will be called recursively with no interval, and then threads of system_power_efficient_wq will consume 100% cpu.
as commit messages mentioned in the above commit, we should introduce a new option which means resolution interval.
---
v2:
- move NDTPA_INTERVAL_PROBE_TIME to the tail of uAPI enum
- add NDTPA_INTERVAL_PROBE_TIME to nl_ntbl_parm_policy
- add detail explain for the behevior when DELAY_PROBE_TIME is 0 in commit messaage
meanwhile, we should replace DELAY_PROBE_TIME with INTERVAL_PROBE_TIME in drivers/net/ethernet/mellanox after this patch was merged
and should we remove include/uapi/linux/sysctl.h seems it is no longer be used.
include/net/neighbour.h | 3 ++- include/net/netevent.h | 1 + include/uapi/linux/neighbour.h | 1 + include/uapi/linux/sysctl.h | 37 +++++++++++++++++----------------- net/core/neighbour.c | 15 ++++++++++++-- net/decnet/dn_neigh.c | 1 + net/ipv4/arp.c | 1 + net/ipv6/ndisc.c | 1 + 8 files changed, 39 insertions(+), 21 deletions(-)
include/net/neighbour.h +2 -1
@@ -48,6 +48,7 @@ enum {NEIGH_VAR_RETRANS_TIME ,NEIGH_VAR_BASE_REACHABLE_TIME ,NEIGH_VAR_DELAY_PROBE_TIME , +NEIGH_VAR_INTERVAL_PROBE_TIME ,NEIGH_VAR_GC_STALETIME ,NEIGH_VAR_QUEUE_LEN_BYTES , NEIGH_VAR_PROXY_QLEN,
@@ -64,7 +65,7 @@ enum {NEIGH_VAR_GC_THRESH1 ,NEIGH_VAR_GC_THRESH2 ,NEIGH_VAR_GC_THRESH3 , -NEIGH_VAR_MAX + NEIGH_VAR_MAX, }; struct neigh_parms {
include/net/netevent.h +1 -0
@@ -26,6 +26,7 @@ enum netevent_notif_type {NETEVENT_NEIGH_UPDATE =1 ,/* arg is struct neighbour ptr */ NETEVENT_REDIRECT ,/* arg is struct netevent_redirect ptr */ NETEVENT_DELAY_PROBE_TIME_UPDATE ,/* arg is struct neigh_parms ptr */ +NETEVENT_INTERVAL_PROBE_TIME_UPDATE ,/* arg is struct neigh_parms ptr */ NETEVENT_IPV4_MPATH_HASH_UPDATE ,/* arg is struct net ptr */ NETEVENT_IPV6_MPATH_HASH_UPDATE ,/* arg is struct net ptr */ NETEVENT_IPV4_FWD_UPDATE_PRIORITY_UPDATE, /* arg is struct net ptr */
include/uapi/linux/neighbour.h +1 -0
@@ -154,6 +154,7 @@ enum {NDTPA_QUEUE_LENBYTES ,/* u32 */ NDTPA_MCAST_REPROBES ,/* u32 */ NDTPA_PAD , +NDTPA_INTERVAL_PROBE_TIME ,/* u64, msecs */ __NDTPA_MAX };#define NDTPA_MAX (__NDTPA_MAX - 1)
include/uapi/linux/sysctl.h +19 -18
@@ -584,24 +584,25 @@ enum {/* /proc/sys/net/<protocol>/neigh/<dev> */ enum { -NET_NEIGH_MCAST_SOLICIT =1 , -NET_NEIGH_UCAST_SOLICIT =2 , -NET_NEIGH_APP_SOLICIT =3 , -NET_NEIGH_RETRANS_TIME =4 , -NET_NEIGH_REACHABLE_TIME =5 , -NET_NEIGH_DELAY_PROBE_TIME =6 , -NET_NEIGH_GC_STALE_TIME =7 , -NET_NEIGH_UNRES_QLEN =8 , -NET_NEIGH_PROXY_QLEN =9 , -NET_NEIGH_ANYCAST_DELAY =10 , -NET_NEIGH_PROXY_DELAY =11 , -NET_NEIGH_LOCKTIME =12 , -NET_NEIGH_GC_INTERVAL =13 , -NET_NEIGH_GC_THRESH1 =14 , -NET_NEIGH_GC_THRESH2 =15 , -NET_NEIGH_GC_THRESH3 =16 , -NET_NEIGH_RETRANS_TIME_MS =17 , -NET_NEIGH_REACHABLE_TIME_MS =18 , +NET_NEIGH_MCAST_SOLICIT =1 , +NET_NEIGH_UCAST_SOLICIT =2 , +NET_NEIGH_APP_SOLICIT =3 , +NET_NEIGH_RETRANS_TIME =4 , +NET_NEIGH_REACHABLE_TIME =5 , +NET_NEIGH_DELAY_PROBE_TIME =6 , +NET_NEIGH_GC_STALE_TIME =7 , +NET_NEIGH_UNRES_QLEN =8 , +NET_NEIGH_PROXY_QLEN =9 , +NET_NEIGH_ANYCAST_DELAY =10 , +NET_NEIGH_PROXY_DELAY =11 , +NET_NEIGH_LOCKTIME =12 , +NET_NEIGH_GC_INTERVAL =13 , +NET_NEIGH_GC_THRESH1 =14 , +NET_NEIGH_GC_THRESH2 =15 , +NET_NEIGH_GC_THRESH3 =16 , +NET_NEIGH_RETRANS_TIME_MS =17 , +NET_NEIGH_REACHABLE_TIME_MS =18 , +NET_NEIGH_INTERVAL_PROBE_TIME =19 , };/* /proc/sys/net/dccp */
net/core/neighbour.c +13 -2
@@ -1579,7 +1579,7 @@ static void neigh_managed_work(struct work_struct *work)list_for_each_entry (neigh, &tbl->managed_list, managed_list)neigh_event_send_probe (neigh,NULL , false);queue_delayed_work (system_power_efficient_wq, &tbl->managed_work, -NEIGH_VAR (&tbl->parms,DELAY_PROBE_TIME )); +NEIGH_VAR (&tbl->parms,INTERVAL_PROBE_TIME ));write_unlock_bh (&tbl->lock); }
@@ -2100,7 +2100,9 @@ static int neightbl_fill_parms(struct sk_buff *skb, struct neigh_parms *parms)nla_put_msecs (skb,NDTPA_PROXY_DELAY ,NEIGH_VAR (parms,PROXY_DELAY ),NDTPA_PAD ) ||nla_put_msecs (skb,NDTPA_LOCKTIME , - NEIGH_VAR(parms, LOCKTIME), NDTPA_PAD)) +NEIGH_VAR (parms,LOCKTIME ),NDTPA_PAD ) || +nla_put_msecs (skb,NDTPA_INTERVAL_PROBE_TIME , + NEIGH_VAR(parms, INTERVAL_PROBE_TIME), NDTPA_PAD)) goto nla_put_failure;return nla_nest_end (skb, nest);
@@ -2255,6 +2257,7 @@ static const struct nla_policy nl_ntbl_parm_policy[NDTPA_MAX+1] = { [NDTPA_ANYCAST_DELAY] = { .type = NLA_U64 }, [NDTPA_PROXY_DELAY] = { .type = NLA_U64 }, [NDTPA_LOCKTIME] = { .type = NLA_U64 }, + [NDTPA_INTERVAL_PROBE_TIME] = { .type = NLA_U64 }, }; static int neightbl_set(struct sk_buff *skb, struct nlmsghdr *nlh,
@@ -2373,6 +2376,11 @@ static int neightbl_set(struct sk_buff *skb, struct nlmsghdr *nlh, nla_get_msecs(tbp[i]));call_netevent_notifiers (NETEVENT_DELAY_PROBE_TIME_UPDATE , p);break ; +case NDTPA_INTERVAL_PROBE_TIME : +NEIGH_VAR_SET (p,INTERVAL_PROBE_TIME , +nla_get_msecs (tbp[i])); +call_netevent_notifiers (NETEVENT_INTERVAL_PROBE_TIME_UPDATE , p); +break ;case NDTPA_RETRANS_TIME :NEIGH_VAR_SET (p,RETRANS_TIME ,nla_get_msecs (tbp[i]));
@@ -3543,6 +3551,8 @@ static void neigh_proc_update(struct ctl_table *ctl, int write)set_bit (index, p->data_state);if (index ==NEIGH_VAR_DELAY_PROBE_TIME )call_netevent_notifiers (NETEVENT_DELAY_PROBE_TIME_UPDATE , p); +if (index ==NEIGH_VAR_INTERVAL_PROBE_TIME ) +call_netevent_notifiers (NETEVENT_INTERVAL_PROBE_TIME_UPDATE , p);if (!dev)/* NULL dev means this is default value */ neigh_copy_dflt_parms (net, p, index); }
@@ -3676,6 +3686,7 @@ static struct neigh_sysctl_table {NEIGH_SYSCTL_USERHZ_JIFFIES_ENTRY (RETRANS_TIME ,"retrans_time" ),NEIGH_SYSCTL_JIFFIES_ENTRY (BASE_REACHABLE_TIME ,"base_reachable_time" ),NEIGH_SYSCTL_JIFFIES_ENTRY (DELAY_PROBE_TIME ,"delay_first_probe_time" ), +NEIGH_SYSCTL_JIFFIES_ENTRY (INTERVAL_PROBE_TIME ,"interval_probe_time" ),NEIGH_SYSCTL_JIFFIES_ENTRY (GC_STALETIME ,"gc_stale_time" ),NEIGH_SYSCTL_ZERO_INTMAX_ENTRY (QUEUE_LEN_BYTES ,"unres_qlen_bytes" ), NEIGH_SYSCTL_ZERO_INTMAX_ENTRY(PROXY_QLEN, "proxy_qlen"),
net/decnet/dn_neigh.c +1 -0
@@ -94,6 +94,7 @@ struct neigh_table dn_neigh_table = { [NEIGH_VAR_RETRANS_TIME] = 1 * HZ, [NEIGH_VAR_BASE_REACHABLE_TIME] = 30 * HZ, [NEIGH_VAR_DELAY_PROBE_TIME] = 5 * HZ, + [NEIGH_VAR_INTERVAL_PROBE_TIME] = 5 * HZ, [NEIGH_VAR_GC_STALETIME] = 60 * HZ, [NEIGH_VAR_QUEUE_LEN_BYTES] = SK_WMEM_MAX, [NEIGH_VAR_PROXY_QLEN] = 0,
net/ipv4/arp.c +1 -0
@@ -168,6 +168,7 @@ struct neigh_table arp_tbl = { [NEIGH_VAR_RETRANS_TIME] = 1 * HZ, [NEIGH_VAR_BASE_REACHABLE_TIME] = 30 * HZ, [NEIGH_VAR_DELAY_PROBE_TIME] = 5 * HZ, + [NEIGH_VAR_INTERVAL_PROBE_TIME] = 5 * HZ, [NEIGH_VAR_GC_STALETIME] = 60 * HZ, [NEIGH_VAR_QUEUE_LEN_BYTES] = SK_WMEM_MAX, [NEIGH_VAR_PROXY_QLEN] = 64,
net/ipv6/ndisc.c +1 -0
@@ -128,6 +128,7 @@ struct neigh_table nd_tbl = { [NEIGH_VAR_RETRANS_TIME] = ND_RETRANS_TIMER, [NEIGH_VAR_BASE_REACHABLE_TIME] = ND_REACHABLE_TIME, [NEIGH_VAR_DELAY_PROBE_TIME] = 5 * HZ, + [NEIGH_VAR_INTERVAL_PROBE_TIME] = 5 * HZ, [NEIGH_VAR_GC_STALETIME] = 60 * HZ, [NEIGH_VAR_QUEUE_LEN_BYTES] = SK_WMEM_MAX, [NEIGH_VAR_PROXY_QLEN] = 64,
base-commit: aa5334b1f96801cd09775217a72ff252ef614d7a
Signature · 1 line
2.34.1
Paolo Abeni
maintainerQuoted 48 lines · Yuwei Wang
commit
7482e3841d52("net, neigh: AddNTF_MANAGEDflag for managed neighbor entries") neighbor entries which withNTF_EXT_MANAGEDflags will periodically callneigh_event_send()for performing the resolution. and the interval was set toDELAY_PROBE_TIME
DELAY_PROBE_TIMEwas configured as the first probe time delay, and it makes sense to set it to0.when
DELAY_PROBE_TIMEis0, thequeue_delayed_workof neighbor entries withNTF_EXT_MANAGEDwill be called recursively with no interval, and then threads ofsystem_power_efficient_wqwill consume 100% cpu.as commit messages mentioned in the above commit, we should introduce a new option which means resolution interval.
Signed-off-by Yuwei Wang <[email protected]>---
v2:
- moveNDTPA_INTERVAL_PROBE_TIMEto the tail of uAPI enum
- addNDTPA_INTERVAL_PROBE_TIMEtonl_ntbl_parm_policy
- add detail explain for the behevior whenDELAY_PROBE_TIMEis0in commit messaagemeanwhile, we should replace
DELAY_PROBE_TIMEwithINTERVAL_PROBE_TIMEindrivers/net/ethernet/mellanoxafter this patch was mergedand should we remove
include/uapi/linux/sysctl.hseems it is no longer be used.include/net/neighbour.h | 3 ++- include/net/netevent.h | 1 + include/uapi/linux/neighbour.h | 1 + include/uapi/linux/sysctl.h | 37 +++++++++++++++++----------------- net/core/neighbour.c | 15 ++++++++++++-- net/decnet/dn_neigh.c | 1 + net/ipv4/arp.c | 1 + net/ipv6/ndisc.c | 1 + 8 files changed, 39 insertions(+), 21 deletions(-)include/net/neighbour.h +1
-0@@ -48,6 +48,7 @@ enum {NEIGH_VAR_RETRANS_TIME ,NEIGH_VAR_BASE_REACHABLE_TIME ,NEIGH_VAR_DELAY_PROBE_TIME , +NEIGH_VAR_INTERVAL_PROBE_TIME ,NEIGH_VAR_GC_STALETIME ,NEIGH_VAR_QUEUE_LEN_BYTES , NEIGH_VAR_PROXY_QLEN,
include/net/neighbour.h enum { · line 68
Quoted 5 lines
include/net/neighbour.h +1
-1@@ -64,7 +65,7 @@ enum {NEIGH_VAR_GC_THRESH1 ,NEIGH_VAR_GC_THRESH2 ,NEIGH_VAR_GC_THRESH3 , -NEIGH_VAR_MAX + NEIGH_VAR_MAX,
You should avoid style-only changes in area not touched otherwise by this
include/net/netevent.h enum netevent_notif_type { · line 29
Quoted 12 lines
include/net/neighbour.h +0
-0};struct neigh_parms {include/net/netevent.h +1
-0@@ -26,6 +26,7 @@ enum netevent_notif_type {NETEVENT_NEIGH_UPDATE =1 ,/* arg is struct neighbour ptr */ NETEVENT_REDIRECT ,/* arg is struct netevent_redirect ptr */ NETEVENT_DELAY_PROBE_TIME_UPDATE ,/* arg is struct neigh_parms ptr */ + NETEVENT_INTERVAL_PROBE_TIME_UPDATE, /* arg is struct neigh_parms ptr */
Are you sure we need to notify the drivers about this parameter change? The host will periodically resolve the neighbours, and that should work regardless of the NIC offload. I think we don't need additional notifications.
Quoted 88 lines
include/net/netevent.h +0
-0NETEVENT_IPV4_MPATH_HASH_UPDATE ,/* arg is struct net ptr */ NETEVENT_IPV6_MPATH_HASH_UPDATE ,/* arg is struct net ptr */ NETEVENT_IPV4_FWD_UPDATE_PRIORITY_UPDATE, /* arg is struct net ptr */include/uapi/linux/neighbour.h +1
-0@@ -154,6 +154,7 @@ enum {NDTPA_QUEUE_LENBYTES ,/* u32 */ NDTPA_MCAST_REPROBES ,/* u32 */ NDTPA_PAD , +NDTPA_INTERVAL_PROBE_TIME ,/* u64, msecs */ __NDTPA_MAX };#define NDTPA_MAX (__NDTPA_MAX - 1)include/uapi/linux/sysctl.h +19
-18@@ -584,24 +584,25 @@ enum {/* /proc/sys/net/<protocol>/neigh/<dev> */ enum { -NET_NEIGH_MCAST_SOLICIT =1 , -NET_NEIGH_UCAST_SOLICIT =2 , -NET_NEIGH_APP_SOLICIT =3 , -NET_NEIGH_RETRANS_TIME =4 , -NET_NEIGH_REACHABLE_TIME =5 , -NET_NEIGH_DELAY_PROBE_TIME =6 , -NET_NEIGH_GC_STALE_TIME =7 , -NET_NEIGH_UNRES_QLEN =8 , -NET_NEIGH_PROXY_QLEN =9 , -NET_NEIGH_ANYCAST_DELAY =10 , -NET_NEIGH_PROXY_DELAY =11 , -NET_NEIGH_LOCKTIME =12 , -NET_NEIGH_GC_INTERVAL =13 , -NET_NEIGH_GC_THRESH1 =14 , -NET_NEIGH_GC_THRESH2 =15 , -NET_NEIGH_GC_THRESH3 =16 , -NET_NEIGH_RETRANS_TIME_MS =17 , -NET_NEIGH_REACHABLE_TIME_MS =18 , +NET_NEIGH_MCAST_SOLICIT =1 , +NET_NEIGH_UCAST_SOLICIT =2 , +NET_NEIGH_APP_SOLICIT =3 , +NET_NEIGH_RETRANS_TIME =4 , +NET_NEIGH_REACHABLE_TIME =5 , +NET_NEIGH_DELAY_PROBE_TIME =6 , +NET_NEIGH_GC_STALE_TIME =7 , +NET_NEIGH_UNRES_QLEN =8 , +NET_NEIGH_PROXY_QLEN =9 , +NET_NEIGH_ANYCAST_DELAY =10 , +NET_NEIGH_PROXY_DELAY =11 , +NET_NEIGH_LOCKTIME =12 , +NET_NEIGH_GC_INTERVAL =13 , +NET_NEIGH_GC_THRESH1 =14 , +NET_NEIGH_GC_THRESH2 =15 , +NET_NEIGH_GC_THRESH3 =16 , +NET_NEIGH_RETRANS_TIME_MS =17 , +NET_NEIGH_REACHABLE_TIME_MS =18 , +NET_NEIGH_INTERVAL_PROBE_TIME =19 , };/* /proc/sys/net/dccp */ net/core/neighbour.c +4
-2@@ -1579,7 +1579,7 @@ static void neigh_managed_work(struct work_struct *work)list_for_each_entry (neigh, &tbl->managed_list, managed_list)neigh_event_send_probe (neigh,NULL , false);queue_delayed_work (system_power_efficient_wq, &tbl->managed_work, -NEIGH_VAR (&tbl->parms,DELAY_PROBE_TIME )); +NEIGH_VAR (&tbl->parms,INTERVAL_PROBE_TIME ));write_unlock_bh (&tbl->lock); }@@ -2100,7 +2100,9 @@ static int neightbl_fill_parms(struct sk_buff *skb, struct neigh_parms *parms)nla_put_msecs (skb,NDTPA_PROXY_DELAY ,NEIGH_VAR (parms,PROXY_DELAY ),NDTPA_PAD ) ||nla_put_msecs (skb,NDTPA_LOCKTIME , - NEIGH_VAR(parms, LOCKTIME), NDTPA_PAD)) +NEIGH_VAR (parms,LOCKTIME ),NDTPA_PAD ) || +nla_put_msecs (skb,NDTPA_INTERVAL_PROBE_TIME , + NEIGH_VAR(parms, INTERVAL_PROBE_TIME), NDTPA_PAD)) goto nla_put_failure;return nla_nest_end (skb, nest);
net/core/neighbour.c static const struct nla_policy nl_ntbl_parm_policy[NDTPA_MAX+1] = { · line 2260
Quoted 4 lines
net/core/neighbour.c +1
-0@@ -2255,6 +2257,7 @@ static const struct nla_policy nl_ntbl_parm_policy[NDTPA_MAX+1] = { [NDTPA_ANYCAST_DELAY] = { .type = NLA_U64 }, [NDTPA_PROXY_DELAY] = { .type = NLA_U64 }, [NDTPA_LOCKTIME] = { .type = NLA_U64 }, + [NDTPA_INTERVAL_PROBE_TIME] = { .type = NLA_U64 },
since a 0 value would not make any sense here and will cause problems, what about adding '.min = 1' ?
Thanks!
Paolo
Quoted 50 lines · Paolo Abeni
Quoted 48 lines · Yuwei Wang
commit
7482e3841d52("net, neigh: AddNTF_MANAGEDflag for managed neighbor entries") neighbor entries which withNTF_EXT_MANAGEDflags will periodically callneigh_event_send()for performing the resolution. and the interval was set toDELAY_PROBE_TIME
DELAY_PROBE_TIMEwas configured as the first probe time delay, and it makes sense to set it to0.when
DELAY_PROBE_TIMEis0, thequeue_delayed_workof neighbor entries withNTF_EXT_MANAGEDwill be called recursively with no interval, and then threads ofsystem_power_efficient_wqwill consume 100% cpu.as commit messages mentioned in the above commit, we should introduce a new option which means resolution interval.
Signed-off-by Yuwei Wang <[email protected]>---
v2:
- moveNDTPA_INTERVAL_PROBE_TIMEto the tail of uAPI enum
- addNDTPA_INTERVAL_PROBE_TIMEtonl_ntbl_parm_policy
- add detail explain for the behevior whenDELAY_PROBE_TIMEis0in commit messaagemeanwhile, we should replace
DELAY_PROBE_TIMEwithINTERVAL_PROBE_TIMEindrivers/net/ethernet/mellanoxafter this patch was mergedand should we remove
include/uapi/linux/sysctl.hseems it is no longer be used.include/net/neighbour.h | 3 ++- include/net/netevent.h | 1 + include/uapi/linux/neighbour.h | 1 + include/uapi/linux/sysctl.h | 37 +++++++++++++++++----------------- net/core/neighbour.c | 15 ++++++++++++-- net/decnet/dn_neigh.c | 1 + net/ipv4/arp.c | 1 + net/ipv6/ndisc.c | 1 + 8 files changed, 39 insertions(+), 21 deletions(-)include/net/neighbour.h +1
-0@@ -48,6 +48,7 @@ enum {NEIGH_VAR_RETRANS_TIME ,NEIGH_VAR_BASE_REACHABLE_TIME ,NEIGH_VAR_DELAY_PROBE_TIME , +NEIGH_VAR_INTERVAL_PROBE_TIME ,NEIGH_VAR_GC_STALETIME ,NEIGH_VAR_QUEUE_LEN_BYTES , NEIGH_VAR_PROXY_QLEN,@@ -64,7 +65,7 @@ enum {
Quoted 8 lines
include/net/neighbour.h enum { · line 68
Quoted 5 lines
include/net/neighbour.h +1
-1NEIGH_VAR_GC_THRESH1 ,NEIGH_VAR_GC_THRESH2 ,NEIGH_VAR_GC_THRESH3 , -NEIGH_VAR_MAX + NEIGH_VAR_MAX,You should avoid style-only changes in area not touched otherwise by this
OK, I will redo this change in the next patch version.
Quoted 19 lines
include/net/netevent.h enum netevent_notif_type { · line 29
Quoted 13 lines
include/net/neighbour.h +0
-0};struct neigh_parms {include/net/netevent.h +1
-0@@ -26,6 +26,7 @@ enum netevent_notif_type {NETEVENT_NEIGH_UPDATE =1 ,/* arg is struct neighbour ptr */ NETEVENT_REDIRECT ,/* arg is struct netevent_redirect ptr */ NETEVENT_DELAY_PROBE_TIME_UPDATE ,/* arg is struct neigh_parms ptr */ + NETEVENT_INTERVAL_PROBE_TIME_UPDATE, /* arg is struct neigh_parms ptr */Are you sure we need to notify the drivers about this parameter change? The host will periodically resolve the neighbours, and that should work regardless of the NIC offload. I think we don't need additional notifications.
mlxsw_sp_router_netevent_event in drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c and mlx5e_rep_netevent_event in drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c still use NETEVENT_DELAY_PROBE_TIME_UPDATE to receive the update event of DELAY_PROBE_TIME as the probe interval.
I think we are supposed to replace NETEVENT_DELAY_PROBE_TIME_UPDATE with NETEVENT_INTERVAL_PROBE_TIME_UPDATE after this patch is merged.
Quoted 39 lines
Quoted 39 lines
include/net/netevent.h +0
-0NETEVENT_IPV4_MPATH_HASH_UPDATE ,/* arg is struct net ptr */ NETEVENT_IPV6_MPATH_HASH_UPDATE ,/* arg is struct net ptr */ NETEVENT_IPV4_FWD_UPDATE_PRIORITY_UPDATE, /* arg is struct net ptr */include/uapi/linux/neighbour.h +1
-0@@ -154,6 +154,7 @@ enum {NDTPA_QUEUE_LENBYTES ,/* u32 */ NDTPA_MCAST_REPROBES ,/* u32 */ NDTPA_PAD , +NDTPA_INTERVAL_PROBE_TIME ,/* u64, msecs */ __NDTPA_MAX };#define NDTPA_MAX (__NDTPA_MAX - 1)net/core/neighbour.c +4
-2@@ -1579,7 +1579,7 @@ static void neigh_managed_work(struct work_struct *work)list_for_each_entry (neigh, &tbl->managed_list, managed_list)neigh_event_send_probe (neigh,NULL , false);queue_delayed_work (system_power_efficient_wq, &tbl->managed_work, -NEIGH_VAR (&tbl->parms,DELAY_PROBE_TIME )); +NEIGH_VAR (&tbl->parms,INTERVAL_PROBE_TIME ));write_unlock_bh (&tbl->lock); }@@ -2100,7 +2100,9 @@ static int neightbl_fill_parms(struct sk_buff *skb, struct neigh_parms *parms)nla_put_msecs (skb,NDTPA_PROXY_DELAY ,NEIGH_VAR (parms,PROXY_DELAY ),NDTPA_PAD ) ||nla_put_msecs (skb,NDTPA_LOCKTIME , - NEIGH_VAR(parms, LOCKTIME), NDTPA_PAD)) +NEIGH_VAR (parms,LOCKTIME ),NDTPA_PAD ) || +nla_put_msecs (skb,NDTPA_INTERVAL_PROBE_TIME , + NEIGH_VAR(parms, INTERVAL_PROBE_TIME), NDTPA_PAD)) goto nla_put_failure;return nla_nest_end (skb, nest);
Quoted 8 lines
net/core/neighbour.c static const struct nla_policy nl_ntbl_parm_policy[NDTPA_MAX+1] = { · line 2260
Quoted 5 lines
net/core/neighbour.c +1
-0@@ -2255,6 +2257,7 @@ static const struct nla_policy nl_ntbl_parm_policy[NDTPA_MAX+1] = { [NDTPA_ANYCAST_DELAY] = { .type = NLA_U64 }, [NDTPA_PROXY_DELAY] = { .type = NLA_U64 }, [NDTPA_LOCKTIME] = { .type = NLA_U64 }, + [NDTPA_INTERVAL_PROBE_TIME] = { .type = NLA_U64 },since a 0 value would not make any sense here and will cause problems, what about adding '.min = 1' ?
Thanks, good point! I will update this in the next patch version.
Quoted 6 lines
Thanks!
Paolo
Thanks!
Yuwei Wang
Paolo Abeni
maintainerQuoted 27 lines · Yuwei Wang
Quoted 18 lines · Paolo Abeni
include/net/netevent.h enum netevent_notif_type { · line 29
Quoted 9 lines · Yuwei Wang
include/net/netevent.h +1
-0@@ -26,6 +26,7 @@ enum netevent_notif_type {NETEVENT_NEIGH_UPDATE =1 ,/* arg is struct neighbour ptr */ NETEVENT_REDIRECT ,/* arg is struct netevent_redirect ptr */ NETEVENT_DELAY_PROBE_TIME_UPDATE ,/* arg is struct neigh_parms ptr */ + NETEVENT_INTERVAL_PROBE_TIME_UPDATE, /* arg is struct neigh_parms ptr */Are you sure we need to notify the drivers about this parameter change? The host will periodically resolve the neighbours, and that should work regardless of the NIC offload. I think we don't need additional notifications.
mlxsw_sp_router_netevent_eventindrivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.candmlx5e_rep_netevent_eventindrivers/net/ethernet/mellanox/mlxsw/spectrum_router.cstill useNETEVENT_DELAY_PROBE_TIME_UPDATEto receive the update event ofDELAY_PROBE_TIMEas the probe interval.
Quoted 2 lines
I think we are supposed to replace
NETEVENT_DELAY_PROBE_TIME_UPDATEwithNETEVENT_INTERVAL_PROBE_TIME_UPDATEafter this patch is merged.
AFAICS the event notification is to let neigh_timer_handler() cope properly with NIC offloading the data plane.
In such scenario packets (forwarded by the NIC) don't reach the host, and neigh->confirmed can be untouched for a long time fooling neigh_timer_handler() into a timeout.
The event notification allows the NIC to perform the correct actions to avoid such timeout.
In case of MANAGED neighbour, the host is periodically sending probe request, and both req/replies should not be offloaded. AFAICS no action is expected from the NIC to cope with INTERVAL_PROBE_TIME changes.
Cheers,
Paolo
Quoted 39 lines · Paolo Abeni
Quoted 27 lines · Yuwei Wang
Quoted 18 lines · Paolo Abeni
include/net/netevent.h enum netevent_notif_type { · line 29
Quoted 9 lines · Yuwei Wang
include/net/netevent.h +1
-0@@ -26,6 +26,7 @@ enum netevent_notif_type {NETEVENT_NEIGH_UPDATE =1 ,/* arg is struct neighbour ptr */ NETEVENT_REDIRECT ,/* arg is struct netevent_redirect ptr */ NETEVENT_DELAY_PROBE_TIME_UPDATE ,/* arg is struct neigh_parms ptr */ + NETEVENT_INTERVAL_PROBE_TIME_UPDATE, /* arg is struct neigh_parms ptr */Are you sure we need to notify the drivers about this parameter change? The host will periodically resolve the neighbours, and that should work regardless of the NIC offload. I think we don't need additional notifications.
mlxsw_sp_router_netevent_eventindrivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.candmlx5e_rep_netevent_eventindrivers/net/ethernet/mellanox/mlxsw/spectrum_router.cstill useNETEVENT_DELAY_PROBE_TIME_UPDATEto receive the update event ofDELAY_PROBE_TIMEas the probe interval.Quoted 2 lines
I think we are supposed to replace
NETEVENT_DELAY_PROBE_TIME_UPDATEwithNETEVENT_INTERVAL_PROBE_TIME_UPDATEafter this patch is merged.AFAICS the event notification is to let
neigh_timer_handler()cope properly with NIC offloading the data plane.In such scenario packets (forwarded by the NIC) don't reach the host, and
neigh->confirmedcan be untouched for a long time foolingneigh_timer_handler()into a timeout.
Quoted 6 lines
The event notification allows the NIC to perform the correct actions to avoid such timeout.
In case of MANAGED neighbour, the host is periodically sending probe request, and both req/replies should not be offloaded. AFAICS no action is expected from the NIC to cope with
INTERVAL_PROBE_TIMEchanges.
I think INTERVAL_PROBE_TIME is not only for MANAGED neighbour, if the driver needs periodically poll the device for neighbours activity, we also should use INTERVAL_PROBE_TIME rather than DELAY_PROBE_TIME as the polling interval.
but as
Quoted 3 lines
mlxsw which has similar driver-internal infrastructure
c723c735fa6b("mlxsw:spectrum_router: Periodically update the kernel's neigh table"). In future, the latter could possibly reuse theNTF_MANAGEDneighbors as well.
It seems that the behavior probe periodically by the driver will be deprecated and replaced by setting the MANAGED flag.
or we can keep using DELAY_PROBE_TIME before it is replaced?
Look forward to your reply.
Yuwei Wang
Quoted 38 lines · Paolo Abeni
Quoted 27 lines · Yuwei Wang
Quoted 18 lines · Paolo Abeni
include/net/netevent.h enum netevent_notif_type { · line 29
Quoted 9 lines · Yuwei Wang
include/net/netevent.h +1
-0@@ -26,6 +26,7 @@ enum netevent_notif_type {NETEVENT_NEIGH_UPDATE =1 ,/* arg is struct neighbour ptr */ NETEVENT_REDIRECT ,/* arg is struct netevent_redirect ptr */ NETEVENT_DELAY_PROBE_TIME_UPDATE ,/* arg is struct neigh_parms ptr */ + NETEVENT_INTERVAL_PROBE_TIME_UPDATE, /* arg is struct neigh_parms ptr */Are you sure we need to notify the drivers about this parameter change? The host will periodically resolve the neighbours, and that should work regardless of the NIC offload. I think we don't need additional notifications.
mlxsw_sp_router_netevent_eventindrivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.candmlx5e_rep_netevent_eventindrivers/net/ethernet/mellanox/mlxsw/spectrum_router.cstill useNETEVENT_DELAY_PROBE_TIME_UPDATEto receive the update event ofDELAY_PROBE_TIMEas the probe interval.Quoted 2 lines
I think we are supposed to replace
NETEVENT_DELAY_PROBE_TIME_UPDATEwithNETEVENT_INTERVAL_PROBE_TIME_UPDATEafter this patch is merged.AFAICS the event notification is to let
neigh_timer_handler()cope properly with NIC offloading the data plane.In such scenario packets (forwarded by the NIC) don't reach the host, and
neigh->confirmedcan be untouched for a long time foolingneigh_timer_handler()into a timeout.
Quoted 6 lines
The event notification allows the NIC to perform the correct actions to avoid such timeout.
In case of MANAGED neighbour, the host is periodically sending probe request, and both req/replies should not be offloaded. AFAICS no action is expected from the NIC to cope with
INTERVAL_PROBE_TIMEchanges.
Right, maybe we could just split this into two: 1) prevent misconfig (see below), and 2) make the timeout configurable as what Yuwei has. Wdyt?
net/core/neighbour.c +1 -1
@@ -1579,7 +1579,7 @@ static void neigh_managed_work(struct work_struct *work)list_for_each_entry (neigh, &tbl->managed_list, managed_list)neigh_event_send_probe (neigh,NULL , false);queue_delayed_work (system_power_efficient_wq, &tbl->managed_work, -NEIGH_VAR (&tbl->parms,DELAY_PROBE_TIME )); +max (NEIGH_VAR (&tbl->parms,DELAY_PROBE_TIME ),HZ ));write_unlock_bh (&tbl->lock); }
Thanks,
Daniel
Jakub Kicinski
maintainerQuoted 8 lines · On Tue, 24 May 2022 17:32:57 +0200 Daniel Borkmann wrote:
Right, maybe we could just split this into two: 1) prevent misconfig (see below), and 2) make the timeout configurable as what Yuwei has. Wdyt?
net/core/neighbour.c +0
-0
net/core/neighbour.c static void neigh_managed_work(struct work_struct *work) · line 1584
Quoted 7 lines
net/core/neighbour.c +1
-1@@ -1579,7 +1579,7 @@ static void neigh_managed_work(struct work_struct *work)list_for_each_entry (neigh, &tbl->managed_list, managed_list)neigh_event_send_probe (neigh,NULL , false);queue_delayed_work (system_power_efficient_wq, &tbl->managed_work, -NEIGH_VAR (&tbl->parms,DELAY_PROBE_TIME )); +max (NEIGH_VAR (&tbl->parms,DELAY_PROBE_TIME ),HZ ));write_unlock_bh (&tbl->lock); }
FWIW that was my reaction as well. Let's do that unless someone disagrees.
Quoted 5 lines · Jakub Kicinski
Quoted 3 lines · On Tue, 24 May 2022 17:32:57 +0200 Daniel Borkmann wrote:
Right, maybe we could just split this into two: 1) prevent misconfig (see below), and 2) make the timeout configurable as what Yuwei has. Wdyt?
Quoted 15 lines
net/core/neighbour.c static void neigh_managed_work(struct work_struct *work) · line 1584
Quoted 12 lines
net/core/neighbour.c +1
-1@@ -1579,7 +1579,7 @@ static void neigh_managed_work(struct work_struct *work)list_for_each_entry (neigh, &tbl->managed_list, managed_list)neigh_event_send_probe (neigh,NULL , false);queue_delayed_work (system_power_efficient_wq, &tbl->managed_work, -NEIGH_VAR (&tbl->parms,DELAY_PROBE_TIME )); +max (NEIGH_VAR (&tbl->parms,DELAY_PROBE_TIME ),HZ ));write_unlock_bh (&tbl->lock); }FWIW that was my reaction as well. Let's do that unless someone disagrees.
I agree too, so there will be as following parts:
1) prevent misconfig by offering a minimum value
2) separate the params INTERVAL_PROBE_TIME as the probe interval for MANAGED neigh
3) notify the change of INTERVAL_PROBE_TIME and set the driver poll interval according to INTERVAL_PROBE_TIME instead of DELAY_PROBE_TIME
I still have doubt about whether we need part 3, or if exist this scenario:
- the NIC offloading the data plane.
- the driver needs periodically poll the device for neighbours activity
May I ask for further explanation?
Thanks,
Yuwei Wang
Quoted 21 lines · Yuwei Wang
Quoted 4 lines · Jakub Kicinski
Quoted 3 lines · On Tue, 24 May 2022 17:32:57 +0200 Daniel Borkmann wrote:
Right, maybe we could just split this into two: 1) prevent misconfig (see below), and 2) make the timeout configurable as what Yuwei has. Wdyt?
Quoted 15 lines
net/core/neighbour.c static void neigh_managed_work(struct work_struct *work) · line 1584
Quoted 12 lines
net/core/neighbour.c +1
-1@@ -1579,7 +1579,7 @@ static void neigh_managed_work(struct work_struct *work)list_for_each_entry (neigh, &tbl->managed_list, managed_list)neigh_event_send_probe (neigh,NULL , false);queue_delayed_work (system_power_efficient_wq, &tbl->managed_work, -NEIGH_VAR (&tbl->parms,DELAY_PROBE_TIME )); +max (NEIGH_VAR (&tbl->parms,DELAY_PROBE_TIME ),HZ ));write_unlock_bh (&tbl->lock); }FWIW that was my reaction as well. Let's do that unless someone disagrees.
Quoted 4 lines
I agree too, so there will be as following parts:
1) prevent misconfig by offering a minimum value
2) separate the paramsINTERVAL_PROBE_TIMEas the probe interval forMANAGEDneigh
Ok.
Quoted 8 lines
3) notify the change of
INTERVAL_PROBE_TIMEand set the driver poll interval according toINTERVAL_PROBE_TIMEinstead ofDELAY_PROBE_TIMEI still have doubt about whether we need part 3, or if exist this scenario:
- the NIC offloading the data plane.
- the driver needs periodically poll the device for neighbours activityMay I ask for further explanation?
Well, but for that case we would need some in-tree driver users of managed neigh first, and they can probably drive it according to their needs if they require a notifier message. Are you saying you are panning to convert the mlx one over to use managed neigh?
Thanks,
Daniel
Hey Yuwei,
On 5/24/22 9:13 PM, Yuwei Wang wrote:
[...]
Quoted 4 lines
I agree too, so there will be as following parts:
1) prevent misconfig by offering a minimum value
2) separate the paramsINTERVAL_PROBE_TIMEas the probe interval forMANAGEDneigh
Given net-next is open, could you rebase and send a v3 of your probe time knob?
Thanks,
Daniel