net, neigh: introduce interval_probe_time for periodic probe
Subsystems (5)
v4 cover net, neigh: introduce interval_probe_time for periodic probe
This series adds a new option interval_probe_time_ms in net, neigh for periodic probe, and add a limitation to prevent it set to 0
Yuwei Wang (2):
sysctl: add proc_dointvec_ms_jiffies_minmax
net, neigh: introduce interval_probe_time_ms for periodic probe
Documentation/networking/ip-sysctl.rst | 6 ++++ include/linux/sysctl.h | 2 ++ include/net/neighbour.h | 1 + include/uapi/linux/neighbour.h | 1 + include/uapi/linux/sysctl.h | 37 ++++++++++++----------- kernel/sysctl.c | 41 ++++++++++++++++++++++++++ net/core/neighbour.c | 32 ++++++++++++++++++-- net/decnet/dn_neigh.c | 1 + net/ipv4/arp.c | 1 + net/ipv6/ndisc.c | 1 + 10 files changed, 103 insertions(+), 20 deletions(-)
base-commit: da6e113ff010815fdd21ee1e9af2e8d179a2680f
Signature · 1 line
2.34.1
PATCH v4 1/2 sysctl: add proc_dointvec_ms_jiffies_minmax
add proc_dointvec_ms_jiffies_minmax to fit read msecs value to jiffies with a limited range of values
--- include/linux/sysctl.h | 2 ++ kernel/sysctl.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+)
include/linux/sysctl.h +2 -0
@@ -75,6 +75,8 @@ int proc_douintvec_minmax(struct ctl_table *table, int write, void *buffer,int proc_dou8vec_minmax (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos);int proc_dointvec_jiffies (struct ctl_table *,int ,void *,size_t *,loff_t *); +int proc_dointvec_ms_jiffies_minmax (struct ctl_table *table,int write, +void *buffer,size_t *lenp,loff_t *ppos);int proc_dointvec_userhz_jiffies (struct ctl_table *,int ,void *,size_t *,loff_t *); int proc_dointvec_ms_jiffies(struct ctl_table *, int, void *, size_t *,
kernel/sysctl.c +41 -0
59 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v4 2/2 net, neigh: introduce interval_probe_time_ms for periodic probe
In reply to Yuwei Wangcommit ed6cd6a17896 ("net, neigh: Set lower cap for neigh_managed_work rearming") fixed a case when DELAY_PROBE_TIME is configured to 0, the processing of the system work queue hog CPU to 100%, and further more we should introduce a new option used by periodic probe
---
v4:
- make this option configured as ms, and rename it to interval_probe_time_ms
- add documentation to Documentation/networking/ip-sysctl
- fix damaged whitespace
- fix missing proc_*_jiffies_minmax on CONFIG_PROC_SYSCTL is not defined v3:
- add limitation to prevent INTERVAL_PROBE_TIME to 0
- remove NETEVENT_INTERVAL_PROBE_TIME_UPDATE
- add .min to NDTPA_INTERVAL_PROBE_TIME
Documentation/networking/ip-sysctl.rst | 6 +++++ include/net/neighbour.h | 1 + include/uapi/linux/neighbour.h | 1 + include/uapi/linux/sysctl.h | 37 +++++++++++++------------- net/core/neighbour.c | 32 ++++++++++++++++++++-- net/decnet/dn_neigh.c | 1 + net/ipv4/arp.c | 1 + net/ipv6/ndisc.c | 1 + 8 files changed, 60 insertions(+), 20 deletions(-)
Documentation/networking/ip-sysctl.rst +6 -0
@@ -202,6 +202,12 @@ neigh/default/unres_qlen - INTEGER Default: 101 +neigh/default/interval_probe_time_ms - INTEGER + The probe interval for neighbor entries with NTF_MANAGED flag, + the min value is 1. + + Default: 5000 + mtu_expires - INTEGER Time, in seconds, that cached PMTU information is kept.
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_MS ,NEIGH_VAR_GC_STALETIME ,NEIGH_VAR_QUEUE_LEN_BYTES , NEIGH_VAR_PROXY_QLEN,
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_MS ,/* 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_MS =19 , };/* /proc/sys/net/dccp */
net/core/neighbour.c +30 -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, -max (NEIGH_VAR (&tbl->parms,DELAY_PROBE_TIME ),HZ )); +NEIGH_VAR (&tbl->parms,INTERVAL_PROBE_TIME_MS ));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_MS , + NEIGH_VAR(parms, INTERVAL_PROBE_TIME_MS), 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_MS] = { .type = NLA_U64, .min = 1 }, }; static int neightbl_set(struct sk_buff *skb, struct nlmsghdr *nlh,
@@ -2373,6 +2376,10 @@ 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_MS : +NEIGH_VAR_SET (p,INTERVAL_PROBE_TIME_MS , +nla_get_msecs (tbp[i])); +break ;case NDTPA_RETRANS_TIME :NEIGH_VAR_SET (p,RETRANS_TIME ,nla_get_msecs (tbp[i]));
@@ -3562,6 +3569,22 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,return ret; } +static int neigh_proc_dointvec_ms_jiffies_positive (struct ctl_table *ctl,int write, +void *buffer,size_t *lenp,loff_t *ppos) +{ +struct ctl_table tmp = *ctl; +int ret; + +int min =msecs_to_jiffies (1 ); + + tmp.extra1 = &min; + tmp.extra2 =NULL ; + + ret =proc_dointvec_ms_jiffies_minmax (&tmp, write, buffer, lenp, ppos); +neigh_proc_update (ctl, write); +return ret; +} +int neigh_proc_dointvec (struct ctl_table *ctl,int write,void *buffer,size_t *lenp,loff_t *ppos) {
@@ -3658,6 +3681,9 @@ static int neigh_proc_base_reachable_time(struct ctl_table *ctl, int write,#define NEIGH_SYSCTL_USERHZ_JIFFIES_ENTRY (attr, name) \ NEIGH_SYSCTL_ENTRY(attr, attr, name, 0644, neigh_proc_dointvec_userhz_jiffies) +#define NEIGH_SYSCTL_MS_JIFFIES_POSITIVE_ENTRY (attr, name) \ + NEIGH_SYSCTL_ENTRY(attr, attr, name, 0644, neigh_proc_dointvec_ms_jiffies_positive) +#define NEIGH_SYSCTL_MS_JIFFIES_REUSED_ENTRY (attr, data_attr, name) \ NEIGH_SYSCTL_ENTRY(attr, data_attr, name, 0644, neigh_proc_dointvec_ms_jiffies)
@@ -3676,6 +3702,8 @@ 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_MS_JIFFIES_POSITIVE_ENTRY (INTERVAL_PROBE_TIME_MS , +"interval_probe_time_ms" ),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_MS] = 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_MS] = 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_MS] = 5 * HZ, [NEIGH_VAR_GC_STALETIME] = 60 * HZ, [NEIGH_VAR_QUEUE_LEN_BYTES] = SK_WMEM_MAX, [NEIGH_VAR_PROXY_QLEN] = 64,
Signature · 1 line
2.34.1
This series was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Quoted 8 lines · On Wed, 29 Jun 2022 08:48:30 +0000 you wrote:
This series adds a new option
interval_probe_time_msin net, neigh for periodic probe, and add a limitation to prevent it set to 0Yuwei Wang (2):
sysctl: addproc_dointvec_ms_jiffies_minmax
net, neigh: introduceinterval_probe_time_msfor periodic probe[...]
Here is the summary with links:
- [net-next,v4,1/2] sysctl: add proc_dointvec_ms_jiffies_minmax
https://git.kernel.org/netdev/net-next/c/c381d02b2fd5 - [net-next,v4,2/2] net, neigh: introduce interval_probe_time_ms for periodic probe https://git.kernel.org/netdev/net-next/c/211da42eaa45
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html