Commit 18ac597a authored by James Prestwood's avatar James Prestwood Committed by Jakub Kicinski
Browse files

net: ndisc: introduce ndisc_evict_nocarrier sysctl parameter 



In most situations the neighbor discovery cache should be cleared on a
NOCARRIER event which is currently done unconditionally. But for wireless
roams the neighbor discovery cache can and should remain intact since
the underlying network has not changed.

This patch introduces a sysctl option ndisc_evict_nocarrier which can
be disabled by a wireless supplicant during a roam. This allows packets
to be sent after a roam immediately without having to wait for
neighbor discovery.

A user reported roughly a 1 second delay after a roam before packets
could be sent out (note, on IPv4). This delay was due to the ARP
cache being cleared. During testing of this same scenario using IPv6
no delay was noticed, but regardless there is no reason to clear
the ndisc cache for wireless roams.

Signed-off-by: default avatarJames Prestwood <prestwoj@gmail.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fcdb44d0

Documentation/networking/ip-sysctl.rst

+9 −0
Original line number Diff line number Diff line
@@ -2350,6 +2350,15 @@ ndisc_tclass - INTEGER 


	* 0 - (default)



ndisc_evict_nocarrier - BOOLEAN

	Clears the neighbor discovery table on NOCARRIER events. This option is

	important for wireless devices where the neighbor discovery cache should

	not be cleared when roaming between access points on the same network.

	In most cases this should remain as the default (1).



	- 1 - (default): Clear neighbor discover cache on NOCARRIER events.

	- 0 - Do not clear neighbor discovery cache on NOCARRIER events.



mldv1_unsolicited_report_interval - INTEGER

	The interval in milliseconds in which the next unsolicited

	MLDv1 report retransmit will take place.

include/linux/ipv6.h

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ struct ipv6_devconf { 
	__u32		ioam6_id;

	__u32		ioam6_id_wide;

	__u8		ioam6_enabled;

	__u8		ndisc_evict_nocarrier;



	struct ctl_table_header *sysctl_header;

};

include/uapi/linux/ipv6.h

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ enum { 
	DEVCONF_IOAM6_ENABLED,

	DEVCONF_IOAM6_ID,

	DEVCONF_IOAM6_ID_WIDE,

	DEVCONF_NDISC_EVICT_NOCARRIER,

	DEVCONF_MAX

};

net/ipv6/addrconf.c

+12 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = { 
	.ioam6_enabled		= 0,

	.ioam6_id               = IOAM6_DEFAULT_IF_ID,

	.ioam6_id_wide		= IOAM6_DEFAULT_IF_ID_WIDE,

	.ndisc_evict_nocarrier	= 1,

};



static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
@@ -300,6 +301,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = { 
	.ioam6_enabled		= 0,

	.ioam6_id               = IOAM6_DEFAULT_IF_ID,

	.ioam6_id_wide		= IOAM6_DEFAULT_IF_ID_WIDE,

	.ndisc_evict_nocarrier	= 1,

};



/* Check if link is ready: is it up and is a valid qdisc available */
@@ -5545,6 +5547,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, 
	array[DEVCONF_IOAM6_ENABLED] = cnf->ioam6_enabled;

	array[DEVCONF_IOAM6_ID] = cnf->ioam6_id;

	array[DEVCONF_IOAM6_ID_WIDE] = cnf->ioam6_id_wide;

	array[DEVCONF_NDISC_EVICT_NOCARRIER] = cnf->ndisc_evict_nocarrier;

}



static inline size_t inet6_ifla6_size(void)
@@ -6986,6 +6989,15 @@ static const struct ctl_table addrconf_sysctl[] = { 
		.mode		= 0644,

		.proc_handler	= proc_douintvec,

	},

	{

		.procname	= "ndisc_evict_nocarrier",

		.data		= &ipv6_devconf.ndisc_evict_nocarrier,

		.maxlen		= sizeof(u8),

		.mode		= 0644,

		.proc_handler	= proc_dou8vec_minmax,

		.extra1		= (void *)SYSCTL_ZERO,

		.extra2		= (void *)SYSCTL_ONE,

	},

	{

		/* sentinel */

	}

net/ipv6/ndisc.c

+11 −1
Original line number Diff line number Diff line
@@ -1794,6 +1794,7 @@ static int ndisc_netdev_event(struct notifier_block *this, unsigned long event, 
	struct netdev_notifier_change_info *change_info;

	struct net *net = dev_net(dev);

	struct inet6_dev *idev;

	bool evict_nocarrier;



	switch (event) {

	case NETDEV_CHANGEADDR:
@@ -1810,10 +1811,19 @@ static int ndisc_netdev_event(struct notifier_block *this, unsigned long event, 
		in6_dev_put(idev);

		break;

	case NETDEV_CHANGE:

		idev = in6_dev_get(dev);

		if (!idev)

			evict_nocarrier = true;

		else {

			evict_nocarrier = idev->cnf.ndisc_evict_nocarrier &&

					  net->ipv6.devconf_all->ndisc_evict_nocarrier;

			in6_dev_put(idev);

		}



		change_info = ptr;

		if (change_info->flags_changed & IFF_NOARP)

			neigh_changeaddr(&nd_tbl, dev);

		if (!netif_carrier_ok(dev))

		if (evict_nocarrier && !netif_carrier_ok(dev))

			neigh_carrier_down(&nd_tbl, dev);

		break;

	case NETDEV_DOWN: