From: "Maciej Żenczykowski" <zenczykowski@gmail•com>
To: "Maciej Żenczykowski" <maze@google•com>,
"David S . Miller" <davem@davemloft•net>
Cc: netdev@vger•kernel.org, Erik Kline <ek@google•com>,
Lorenzo Colitti <lorenzo@google•com>
Subject: [PATCH v4 4/7] ipv6 addrconf: add new sysctl 'router_solicitation_max_interval'
Date: Sun, 25 Sep 2016 04:03:07 -0700 [thread overview]
Message-ID: <1474801390-6891-5-git-send-email-zenczykowski@gmail.com> (raw)
In-Reply-To: <1474801390-6891-1-git-send-email-zenczykowski@gmail.com>
From: Maciej Żenczykowski <maze@google•com>
Accessible via:
/proc/sys/net/ipv6/conf/*/router_solicitation_max_interval
For now we default it to the same value as the normal interval.
Signed-off-by: Maciej Żenczykowski <maze@google•com>
---
include/linux/ipv6.h | 1 +
include/net/addrconf.h | 1 +
include/uapi/linux/ipv6.h | 1 +
net/ipv6/addrconf.c | 11 +++++++++++
4 files changed, 14 insertions(+)
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index c6dbcd84a2c7..7e9a789be5e0 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -18,6 +18,7 @@ struct ipv6_devconf {
__s32 dad_transmits;
__s32 rtr_solicits;
__s32 rtr_solicit_interval;
+ __s32 rtr_solicit_max_interval;
__s32 rtr_solicit_delay;
__s32 force_mld_version;
__s32 mldv1_unsolicited_report_interval;
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 9826d3a9464c..275e5af4c2f4 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -3,6 +3,7 @@
#define MAX_RTR_SOLICITATIONS 3
#define RTR_SOLICITATION_INTERVAL (4*HZ)
+#define RTR_SOLICITATION_MAX_INTERVAL (4*HZ)
#define MIN_VALID_LIFETIME (2*3600) /* 2 hours */
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index 395876060f50..8c2772340c3f 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -177,6 +177,7 @@ enum {
DEVCONF_DROP_UNICAST_IN_L2_MULTICAST,
DEVCONF_DROP_UNSOLICITED_NA,
DEVCONF_KEEP_ADDR_ON_DOWN,
+ DEVCONF_RTR_SOLICIT_MAX_INTERVAL,
DEVCONF_MAX
};
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 6c63bf06fbcf..255be34cdbce 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -187,6 +187,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
.dad_transmits = 1,
.rtr_solicits = MAX_RTR_SOLICITATIONS,
.rtr_solicit_interval = RTR_SOLICITATION_INTERVAL,
+ .rtr_solicit_max_interval = RTR_SOLICITATION_MAX_INTERVAL,
.rtr_solicit_delay = MAX_RTR_SOLICITATION_DELAY,
.use_tempaddr = 0,
.temp_valid_lft = TEMP_VALID_LIFETIME,
@@ -232,6 +233,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
.dad_transmits = 1,
.rtr_solicits = MAX_RTR_SOLICITATIONS,
.rtr_solicit_interval = RTR_SOLICITATION_INTERVAL,
+ .rtr_solicit_max_interval = RTR_SOLICITATION_MAX_INTERVAL,
.rtr_solicit_delay = MAX_RTR_SOLICITATION_DELAY,
.use_tempaddr = 0,
.temp_valid_lft = TEMP_VALID_LIFETIME,
@@ -4891,6 +4893,8 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
array[DEVCONF_RTR_SOLICITS] = cnf->rtr_solicits;
array[DEVCONF_RTR_SOLICIT_INTERVAL] =
jiffies_to_msecs(cnf->rtr_solicit_interval);
+ array[DEVCONF_RTR_SOLICIT_MAX_INTERVAL] =
+ jiffies_to_msecs(cnf->rtr_solicit_max_interval);
array[DEVCONF_RTR_SOLICIT_DELAY] =
jiffies_to_msecs(cnf->rtr_solicit_delay);
array[DEVCONF_FORCE_MLD_VERSION] = cnf->force_mld_version;
@@ -5771,6 +5775,13 @@ static const struct ctl_table addrconf_sysctl[] = {
.proc_handler = proc_dointvec_jiffies,
},
{
+ .procname = "router_solicitation_max_interval",
+ .data = &ipv6_devconf.rtr_solicit_max_interval,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec_jiffies,
+ },
+ {
.procname = "router_solicitation_delay",
.data = &ipv6_devconf.rtr_solicit_delay,
.maxlen = sizeof(int),
--
2.8.0.rc3.226.g39d4020
next prev parent reply other threads:[~2016-09-25 11:03 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-24 16:01 Implement rfc7559 ipv6 router solicitation backoff Maciej Żenczykowski
2016-09-24 16:05 ` [PATCH 1/7] ipv6 addrconf: enable use of proc_dointvec_minmax in addrconf_sysctl Maciej Żenczykowski
2016-09-24 16:05 ` [PATCH 2/7] ipv6 addrconf: remove addrconf_sysctl_hop_limit() Maciej Żenczykowski
2016-09-24 16:05 ` [PATCH 3/7] ipv6 addrconf: rtr_solicits == -1 means unlimited Maciej Żenczykowski
2016-09-24 16:05 ` [PATCH 4/7] ipv6 addrconf: add new sysctl 'router_solicitation_max_interval' Maciej Żenczykowski
2016-09-24 16:05 ` [PATCH 5/7] ipv6 addrconf: implement RFC7559 router solicitation backoff Maciej Żenczykowski
2016-09-25 2:14 ` Maciej Żenczykowski
2016-09-25 2:14 ` [PATCH] " Maciej Żenczykowski
2016-09-25 9:33 ` David Miller
2016-09-25 9:59 ` [PATCH v2 1/7] ipv6 addrconf: enable use of proc_dointvec_minmax in addrconf_sysctl Maciej Żenczykowski
2016-09-25 9:59 ` [PATCH v2 2/7] ipv6 addrconf: remove addrconf_sysctl_hop_limit() Maciej Żenczykowski
2016-09-25 9:59 ` [PATCH v2 3/7] ipv6 addrconf: rtr_solicits == -1 means unlimited Maciej Żenczykowski
2016-09-26 15:34 ` Lorenzo Colitti
2016-09-27 2:23 ` Maciej Żenczykowski
2016-09-27 2:25 ` Erik Kline
2016-09-25 9:59 ` [PATCH v2 4/7] ipv6 addrconf: add new sysctl 'router_solicitation_max_interval' Maciej Żenczykowski
2016-09-25 9:59 ` [PATCH v2 5/7] ipv6 addrconf: implement RFC7559 router solicitation backoff Maciej Żenczykowski
2016-09-25 9:59 ` [PATCH v2 6/7] ipv6 addrconf: change default RTR_SOLICITATION_MAX_INTERVAL from 4s to 1h Maciej Żenczykowski
2016-09-25 9:59 ` [PATCH v2 7/7] ipv6 addrconf: change default MAX_RTR_SOLICITATIONS from 3 to -1 (unlimited) Maciej Żenczykowski
2016-09-25 10:04 ` [PATCH v2 1/7] ipv6 addrconf: enable use of proc_dointvec_minmax in addrconf_sysctl David Miller
2016-09-25 10:52 ` (unknown), Maciej Żenczykowski
2016-09-25 10:52 ` [PATCH v3 1/7] ipv6 addrconf: enable use of proc_dointvec_minmax in addrconf_sysctl Maciej Żenczykowski
2016-09-25 10:52 ` [PATCH v3 2/7] ipv6 addrconf: remove addrconf_sysctl_hop_limit() Maciej Żenczykowski
2016-09-25 10:52 ` [PATCH v3 3/7] ipv6 addrconf: rtr_solicits == -1 means unlimited Maciej Żenczykowski
2016-09-25 10:52 ` [PATCH v3 4/7] ipv6 addrconf: add new sysctl 'router_solicitation_max_interval' Maciej Żenczykowski
2016-09-25 10:52 ` [PATCH v3 5/7] ipv6 addrconf: implement RFC7559 router solicitation backoff Maciej Żenczykowski
2016-09-25 10:52 ` [PATCH v3 6/7] ipv6 addrconf: change default RTR_SOLICITATION_MAX_INTERVAL from 4s to 1h Maciej Żenczykowski
2016-09-25 10:52 ` [PATCH v3 7/7] ipv6 addrconf: change default MAX_RTR_SOLICITATIONS from 3 to -1 (unlimited) Maciej Żenczykowski
2016-09-25 12:51 ` (unknown) David Miller
2016-09-25 11:03 ` [PATCH v4 0/7] implement rfc7559 ipv6 router solicitation backoff Maciej Żenczykowski
2016-09-25 11:03 ` [PATCH v4 1/7] ipv6 addrconf: enable use of proc_dointvec_minmax in addrconf_sysctl Maciej Żenczykowski
2016-09-26 9:13 ` Erik Kline
2016-09-25 11:03 ` [PATCH v4 2/7] ipv6 addrconf: remove addrconf_sysctl_hop_limit() Maciej Żenczykowski
2016-09-26 9:14 ` Erik Kline
2016-09-26 9:37 ` Maciej Żenczykowski
2016-09-25 11:03 ` [PATCH v4 3/7] ipv6 addrconf: rtr_solicits == -1 means unlimited Maciej Żenczykowski
2016-09-26 9:23 ` Erik Kline
2016-09-25 11:03 ` Maciej Żenczykowski [this message]
2016-09-26 9:29 ` [PATCH v4 4/7] ipv6 addrconf: add new sysctl 'router_solicitation_max_interval' Erik Kline
2016-09-26 13:59 ` Hannes Frederic Sowa
2016-09-27 2:30 ` Maciej Żenczykowski
2016-09-27 9:49 ` Hannes Frederic Sowa
2016-09-27 10:08 ` Maciej Żenczykowski
2016-09-25 11:03 ` [PATCH v4 5/7] ipv6 addrconf: implement RFC7559 router solicitation backoff Maciej Żenczykowski
2016-09-26 13:53 ` Hannes Frederic Sowa
2016-09-27 9:42 ` Maciej Żenczykowski
2016-09-27 9:52 ` [PATCH v5 0/7] implement rfc7559 ipv6 " Maciej Żenczykowski
2016-09-27 9:52 ` [PATCH v5 1/7] ipv6 addrconf: enable use of proc_dointvec_minmax in addrconf_sysctl Maciej Żenczykowski
2016-09-27 10:16 ` YOSHIFUJI Hideaki
2016-09-27 9:52 ` [PATCH v5 2/7] ipv6 addrconf: remove addrconf_sysctl_hop_limit() Maciej Żenczykowski
2016-09-27 10:18 ` YOSHIFUJI Hideaki
2016-09-27 9:52 ` [PATCH v5 3/7] ipv6 addrconf: rtr_solicits == -1 means unlimited Maciej Żenczykowski
2016-09-27 10:20 ` YOSHIFUJI Hideaki
2016-09-27 10:39 ` Maciej Żenczykowski
2016-09-27 9:52 ` [PATCH v5 4/7] ipv6 addrconf: add new sysctl 'router_solicitation_max_interval' Maciej Żenczykowski
2016-09-27 9:52 ` [PATCH v5 5/7] ipv6 addrconf: implement RFC7559 router solicitation backoff Maciej Żenczykowski
2016-09-27 9:52 ` [PATCH v5 6/7] ipv6 addrconf: change default RTR_SOLICITATION_MAX_INTERVAL from 4s to 1h Maciej Żenczykowski
2016-09-27 9:52 ` [PATCH v5 7/7] ipv6 addrconf: change default MAX_RTR_SOLICITATIONS from 3 to -1 (unlimited) Maciej Żenczykowski
2016-09-27 9:58 ` [PATCH v4 5/7] ipv6 addrconf: implement RFC7559 router solicitation backoff Hannes Frederic Sowa
2016-09-27 10:20 ` Hannes Frederic Sowa
2016-09-25 11:03 ` [PATCH v4 6/7] ipv6 addrconf: change default RTR_SOLICITATION_MAX_INTERVAL from 4s to 1h Maciej Żenczykowski
2016-09-25 11:03 ` [PATCH v4 7/7] ipv6 addrconf: change default MAX_RTR_SOLICITATIONS from 3 to -1 (unlimited) Maciej Żenczykowski
2016-09-24 16:05 ` [PATCH 6/7] ipv6 addrconf: change default RTR_SOLICITATION_MAX_INTERVAL from 4s to 1h Maciej Żenczykowski
2016-09-24 16:05 ` [PATCH 7/7] ipv6 addrconf: change default MAX_RTR_SOLICITATIONS from 3 to -1 (unlimited) Maciej Żenczykowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1474801390-6891-5-git-send-email-zenczykowski@gmail.com \
--to=zenczykowski@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=ek@google$(echo .)com \
--cc=lorenzo@google$(echo .)com \
--cc=maze@google$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox