Commit 211da42e authored by Yuwei Wang's avatar Yuwei Wang Committed by Paolo Abeni
Browse files

net, neigh: introduce interval_probe_time_ms for periodic probe 



commit ed6cd6a1 ("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

Signed-off-by: default avatarYuwei Wang <wangyuweihx@gmail.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent c381d02b

Documentation/networking/ip-sysctl.rst

+6 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -602,6 +602,7 @@ enum { 
	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
Original line number Diff line number Diff line
@@ -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"),